From d4a61a414a3928f9e343e0622ecbf303e4a35a87 Mon Sep 17 00:00:00 2001 From: suyuan <175338101@qq.com> Date: Thu, 24 Dec 2020 22:51:25 +0800 Subject: [PATCH] 1 --- CLA-entity.md | 82 - CLA-individual.md | 83 -- CODE_OF_CONDUCT.md | 74 - CONTRIBUTING.md | 5 - LICENSE | 674 --------- README.md | 51 - build.sh | 372 ----- config | 235 --- config-bpi-r64 | 10 - config-cm520-79f | 12 - config-espressobin | 9 - config-nanopi_neo | 70 - config-p2w_r619ac | 12 - config-r2s | 6 - config-rpi2 | 8 - config-rpi3 | 7 - config-rpi4 | 9 - config-x86_64 | 12 - contributors/example.md | 9 - deploy_rsa.enc | Bin 3248 -> 0 bytes patches/bbr2.patch | 27 - patches/check-rsync.patch | 14 - patches/download-ipv4.patch | 13 - patches/gtime.patch | 10 - patches/images.patch | 42 - patches/ipt-nat6.patch | 14 - patches/luci-occitan.patch | 10 - patches/nanqinlang.patch | 28 - patches/nocheck.patch | 10 - patches/package-too-long.patch | 11 - patches/smsc75xx.patch | 26 - patches/uefi.patch | 1323 ----------------- .../base-files/files/bin/config_generate | 512 ------- root/package/base-files/files/etc/banner | 39 - .../files/etc/board.d/99-default_network | 17 - root/package/base-files/files/etc/shadow | 5 - root/package/firmware/ipq-wifi/Makefile | 135 -- .../ipq-wifi/board-p2w_r619ac.qca4019 | Bin 24300 -> 0 bytes .../ipq-wifi/board-pangu_l1000.qca4019 | Bin 631600 -> 0 bytes .../wireless-regdb/patches/501-CN-regd.patch | 24 - .../mac80211/files/lib/wifi/mac80211.sh | 127 -- .../config/firewall/patches/fullconenat.patch | 40 - root/package/network/ipv6/6in4/Makefile | 45 - root/package/network/ipv6/6in4/files/6in4.sh | 149 -- .../services/dnsmasq/files/dnsmasq.init | 1134 -------------- root/package/network/utils/iperf3/Makefile | 84 -- .../patches/100-disable-lazy-init.patch | 13 - root/package/utils/wmt/Makefile | 51 - root/package/utils/wmt/files/wmt.defaults | 11 - root/package/utils/wmt/files/wmt.init | 119 -- root/rules.mk | 430 ------ ...xhci-quirks-add-link-TRB-quirk-VL805.patch | 67 - .../ipq40xx/base-files/etc/board.d/01_leds | 90 -- .../ipq40xx/base-files/etc/board.d/02_network | 190 --- .../base-files/etc/board.d/03_gpio_switches | 26 - .../etc/hotplug.d/firmware/11-ath10k-caldata | 276 ---- .../etc/hotplug.d/net/21_adjust_network | 7 - .../base-files/etc/init.d/adjust_network | 205 --- .../ipq40xx/base-files/etc/init.d/bootcount | 16 - .../linux/ipq40xx/base-files/etc/inittab | 5 - .../etc/uci-defaults/04_led_migration | 19 - .../ipq40xx/base-files/lib/adjust_network.sh | 89 -- .../lib/preinit/05_set_iface_mac_ipq40xx.sh | 35 - .../preinit/06_set_preinit_iface_ipq40xx.sh | 22 - .../ipq40xx/base-files/lib/upgrade/linksys.sh | 122 -- .../base-files/lib/upgrade/openmesh.sh | 106 -- .../base-files/lib/upgrade/platform.sh | 128 -- .../arch/arm/boot/dts/qcom-ipq4019-l1000.dts | 394 ----- .../arm/boot/dts/qcom-ipq4019-r619ac-128m.dts | 18 - .../arch/arm/boot/dts/qcom-ipq4019-r619ac.dts | 12 - .../arm/boot/dts/qcom-ipq4019-r619ac.dtsi | 322 ---- root/target/linux/ipq40xx/image/Makefile | 867 ----------- .../901-arm-boot-add-dts-files.patch | 73 - root/target/linux/mediatek/mt7623/config-4.19 | 555 ------- sign.sh | 8 - 75 files changed, 9855 deletions(-) delete mode 100644 CLA-entity.md delete mode 100644 CLA-individual.md delete mode 100644 CODE_OF_CONDUCT.md delete mode 100644 CONTRIBUTING.md delete mode 100644 LICENSE delete mode 100644 README.md delete mode 100755 build.sh delete mode 100644 config delete mode 100644 config-bpi-r64 delete mode 100644 config-cm520-79f delete mode 100644 config-espressobin delete mode 100644 config-nanopi_neo delete mode 100644 config-p2w_r619ac delete mode 100644 config-r2s delete mode 100644 config-rpi2 delete mode 100644 config-rpi3 delete mode 100644 config-rpi4 delete mode 100644 config-x86_64 delete mode 100644 contributors/example.md delete mode 100644 deploy_rsa.enc delete mode 100644 patches/bbr2.patch delete mode 100644 patches/check-rsync.patch delete mode 100644 patches/download-ipv4.patch delete mode 100644 patches/gtime.patch delete mode 100644 patches/images.patch delete mode 100644 patches/ipt-nat6.patch delete mode 100644 patches/luci-occitan.patch delete mode 100644 patches/nanqinlang.patch delete mode 100644 patches/nocheck.patch delete mode 100644 patches/package-too-long.patch delete mode 100644 patches/smsc75xx.patch delete mode 100644 patches/uefi.patch delete mode 100755 root/package/base-files/files/bin/config_generate delete mode 100644 root/package/base-files/files/etc/banner delete mode 100755 root/package/base-files/files/etc/board.d/99-default_network delete mode 100644 root/package/base-files/files/etc/shadow delete mode 100644 root/package/firmware/ipq-wifi/Makefile delete mode 100644 root/package/firmware/ipq-wifi/board-p2w_r619ac.qca4019 delete mode 100755 root/package/firmware/ipq-wifi/board-pangu_l1000.qca4019 delete mode 100644 root/package/firmware/wireless-regdb/patches/501-CN-regd.patch delete mode 100644 root/package/kernel/mac80211/files/lib/wifi/mac80211.sh delete mode 100644 root/package/network/config/firewall/patches/fullconenat.patch delete mode 100644 root/package/network/ipv6/6in4/Makefile delete mode 100755 root/package/network/ipv6/6in4/files/6in4.sh delete mode 100644 root/package/network/services/dnsmasq/files/dnsmasq.init delete mode 100644 root/package/network/utils/iperf3/Makefile delete mode 100644 root/package/system/fstools/patches/100-disable-lazy-init.patch delete mode 100644 root/package/utils/wmt/Makefile delete mode 100644 root/package/utils/wmt/files/wmt.defaults delete mode 100644 root/package/utils/wmt/files/wmt.init delete mode 100644 root/rules.mk delete mode 100644 root/target/linux/bcm27xx/patches-5.4/990-xhci-quirks-add-link-TRB-quirk-VL805.patch delete mode 100755 root/target/linux/ipq40xx/base-files/etc/board.d/01_leds delete mode 100755 root/target/linux/ipq40xx/base-files/etc/board.d/02_network delete mode 100755 root/target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches delete mode 100644 root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata delete mode 100755 root/target/linux/ipq40xx/base-files/etc/hotplug.d/net/21_adjust_network delete mode 100755 root/target/linux/ipq40xx/base-files/etc/init.d/adjust_network delete mode 100755 root/target/linux/ipq40xx/base-files/etc/init.d/bootcount delete mode 100755 root/target/linux/ipq40xx/base-files/etc/inittab delete mode 100755 root/target/linux/ipq40xx/base-files/etc/uci-defaults/04_led_migration delete mode 100755 root/target/linux/ipq40xx/base-files/lib/adjust_network.sh delete mode 100755 root/target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh delete mode 100755 root/target/linux/ipq40xx/base-files/lib/preinit/06_set_preinit_iface_ipq40xx.sh delete mode 100755 root/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh delete mode 100755 root/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh delete mode 100644 root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh delete mode 100644 root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-l1000.dts delete mode 100644 root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac-128m.dts delete mode 100644 root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dts delete mode 100644 root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi delete mode 100644 root/target/linux/ipq40xx/image/Makefile delete mode 100644 root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch delete mode 100644 root/target/linux/mediatek/mt7623/config-4.19 delete mode 100755 sign.sh diff --git a/CLA-entity.md b/CLA-entity.md deleted file mode 100644 index 43eb3cfe..00000000 --- a/CLA-entity.md +++ /dev/null @@ -1,82 +0,0 @@ -OpenMPTCProuter Entity Contributor License Agreement -================================================== - -Thank you for your interest in contributing to OpenMPTCProuter ("We" or "Us"). - -This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please submit a pull request with a file under the `/contributors` directory indicating your acceptance of this agreement. - -This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us. - -## 1. Definitions - -"You" means any Legal Entity on behalf of whom a Contribution has been received by Us. "Legal Entity" means an entity which is not a natural person. "Affiliates" means other Legal Entities that control, are controlled by, or under common control with that Legal Entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such Legal Entity, whether by contract or otherwise, (ii) ownership of fifty percent (50%) or more of the outstanding shares or securities which vote to elect the management or other persons who direct such Legal Entity or (iii) beneficial ownership of such entity. - -"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in . - -"Copyright" means all rights protecting works of authorship owned or controlled by You or Your Affiliates, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You. - -"Material" means the work of authorship which is made available by Us to third parties. When this Agreement covers more than one software project, the Material means the work of authorship to which the Contribution was Submitted. After You Submit the Contribution, it may be included in the Material. - -"Submit" means any form of electronic, verbal, or written communication sent to Us or our representatives, including but not limited to electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Us for the purpose of discussing and improving the Material, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution." - -"Submission Date" means the date on which You Submit a Contribution to Us. - -"Effective Date" means the date You execute this Agreement or the date You first Submit a Contribution to Us, whichever is earlier. - -## 2. Grant of Rights - -2.1 Copyright License - -(a) You retain ownership of the Copyright in Your Contribution and have the same rights to use or license the Contribution which You would have had without entering into the Agreement. - -(b) To the maximum extent permitted by the relevant law, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license under the Copyright covering the Contribution, with the right to sublicense such rights through multiple tiers of sublicensees, to reproduce, modify, display, perform and distribute the Contribution as part of the Material; provided that this license is conditioned upon compliance with Section 2.3. - -2.2 Patent License - -For patent claims including, without limitation, method, process, and apparatus claims which You or Your Affiliates own, control or have the right to grant, now or in the future, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable patent license, with the right to sublicense these rights to multiple tiers of sublicensees, to make, have made, use, sell, offer for sale, import and otherwise transfer the Contribution and the Contribution in combination with the Material (and portions of such combination). This license is granted only to the extent that the exercise of the licensed rights infringes such patent claims; and provided that this license is conditioned upon compliance with Section 2.3. - -2.3 Outbound License - -Based on the grant of rights in Sections 2.1 and 2.2, if We include Your Contribution in a Material, We may license the Contribution under any license, including copyleft, permissive, commercial, or proprietary licenses. As a condition on the exercise of this right, We agree to also license the Contribution under the terms of the license or licenses which We are using for the Material on the Submission Date. - -2.4 Moral Rights. If moral rights apply to the Contribution, to the maximum extent permitted by law, You waive and agree not to assert such moral rights against Us or our successors in interest, or any of our licensees, either direct or indirect. - -2.5 Our Rights. You acknowledge that We are not obligated to use Your Contribution as part of the Material and may decide to include any Contribution We consider appropriate. - -2.6 Reservation of Rights. Any rights not expressly licensed under this section are expressly reserved by You. - -## 3. Agreement - -You confirm that: - -(a) You have the legal authority to enter into this Agreement. - -(b) You or Your Affiliates own the Copyright and patent claims covering the Contribution which are required to grant the rights under Section 2. - -(c) The grant of rights under Section 2 does not violate any grant of rights which You or Your Affiliates have made to third parties. - -(d) You have followed the instructions in , if You do not own the Copyright in the entire work of authorship Submitted. - -## 4. Disclaimer - -EXCEPT FOR THE EXPRESS WARRANTIES IN SECTION 3, THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION TO THE MINIMUM PERIOD PERMITTED BY LAW. - -## 5. Consequential Damage Waiver - -TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED. - -## 6. Miscellaneous - -6.1 This Agreement will be governed by and construed in accordance with the laws of excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement. - -6.2 This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings. - -6.3 If You or We assign the rights or obligations received through this Agreement to a third party, as a condition of the assignment, that third party must agree in writing to abide by all the rights and obligations in the Agreement. - -6.4 The failure of either party to require performance by the other party of any provision of this Agreement in one situation shall not affect the right of a party to require such performance at any time in the future. A waiver of performance under a provision in one situation shall not be considered a waiver of the performance of the provision in the future or a waiver of the provision in its entirety. - -6.5 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and which is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law. - -This agreement is derived from the Project Harmony CLA generator: -http://www.harmonyagreements.org/ -Harmony (HA-CLA-E-ANY) Version 1.0 diff --git a/CLA-individual.md b/CLA-individual.md deleted file mode 100644 index bbbba134..00000000 --- a/CLA-individual.md +++ /dev/null @@ -1,83 +0,0 @@ -OpenMPTCProuter Individual Contributor License Agreement -====================================================== - -Thank you for your interest in contributing to OpenMPTCProuter ("We" or "Us"). - -This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please submit a pull request with a file under the `/contributors` directory indicating your acceptance of this agreement. - -This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us. - -## 1. Definitions - -"You" means the individual who Submits a Contribution to Us. - -"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in . - -"Copyright" means all rights protecting works of authorship owned or controlled by You, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You. - -"Material" means the work of authorship which is made available by Us to third parties. When this Agreement covers more than one software project, the Material means the work of authorship to which the Contribution was Submitted. After You Submit the Contribution, it may be included in the Material. - -"Submit" means any form of electronic, verbal, or written communication sent to Us or our representatives, including but not limited to electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Us for the purpose of discussing and improving the Material, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution." - -"Submission Date" means the date on which You Submit a Contribution to Us. - -"Effective Date" means the date You execute this Agreement or the date You first Submit a Contribution to Us, whichever is earlier. - -## 2. Grant of Rights - -2.1 Copyright License - -(a) You retain ownership of the Copyright in Your Contribution and have the same rights to use or license the Contribution which You would have had without entering into the Agreement. - -(b) To the maximum extent permitted by the relevant law, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license under the Copyright covering the Contribution, with the right to sublicense such rights through multiple tiers of sublicensees, to reproduce, modify, display, perform and distribute the Contribution as part of the Material; provided that this license is conditioned upon compliance with Section 2.3. - -2.2 Patent License - -For patent claims including, without limitation, method, process, and apparatus claims which You own, control or have the right to grant, now or in the future, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable patent license, with the right to sublicense these rights to multiple tiers of sublicensees, to make, have made, use, sell, offer for sale, import and otherwise transfer the Contribution and the Contribution in combination with the Material (and portions of such combination). This license is granted only to the extent that the exercise of the licensed rights infringes such patent claims; and provided that this license is conditioned upon compliance with Section 2.3. - -2.3 Outbound License - -Based on the grant of rights in Sections 2.1 and 2.2, if We include Your Contribution in a Material, We may license the Contribution under any license, including copyleft, permissive, commercial, or proprietary licenses. As a condition on the exercise of this right, We agree to also license the Contribution under the terms of the license or licenses which We are using for the Material on the Submission Date. - -2.4 Moral Rights. If moral rights apply to the Contribution, to the maximum extent permitted by law, You waive and agree not to assert such moral rights against Us or our successors in interest, or any of our licensees, either direct or indirect. - -2.5 Our Rights. You acknowledge that We are not obligated to use Your Contribution as part of the Material and may decide to include any Contribution We consider appropriate. - -2.6 Reservation of Rights. Any rights not expressly licensed under this section are expressly reserved by You. - -3. Agreement - -You confirm that: - -(a) You have the legal authority to enter into this Agreement. - -(b) You own the Copyright and patent claims covering the Contribution which are required to grant the rights under Section 2. - -(c) The grant of rights under Section 2 does not violate any grant of rights which You have made to third parties, including Your employer. If You are an employee, You have had Your employer approve this Agreement or sign the Entity version of this document. If You are less than eighteen years old, please have Your parents or guardian sign the Agreement. - -(d) You have followed the instructions in , if You do not own the Copyright in the entire work of authorship Submitted. - -## 4. Disclaimer - -EXCEPT FOR THE EXPRESS WARRANTIES IN SECTION 3, THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION TO THE MINIMUM PERIOD PERMITTED BY LAW. - -## 5. Consequential Damage Waiver - -TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED. - -## 6. Miscellaneous - -6.1 This Agreement will be governed by and construed in accordance with the laws of excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement. - -6.2 This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings. - -6.3 If You or We assign the rights or obligations received through this Agreement to a third party, as a condition of the assignment, that third party must agree in writing to abide by all the rights and obligations in the Agreement. - -6.4 The failure of either party to require performance by the other party of any provision of this Agreement in one situation shall not affect the right of a party to require such performance at any time in the future. A waiver of performance under a provision in one situation shall not be considered a waiver of the performance of the provision in the future or a waiver of the provision in its entirety. - -6.5 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and which is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law. - -This agreement is derived from the Project Harmony CLA generator: -http://www.harmonyagreements.org/ -Harmony (HA-CLA-I-ANY) Version 1.0 - diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md deleted file mode 100644 index 05fbbc85..00000000 --- a/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,74 +0,0 @@ -# Contributor Covenant Code of Conduct - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as -contributors and maintainers pledge to making participation in our project and -our community a harassment-free experience for everyone, regardless of age, body -size, disability, ethnicity, gender identity and expression, level of experience, -nationality, personal appearance, race, religion, or sexual identity and -orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment -include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or -advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic - address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable -behavior and are expected to take appropriate and fair corrective action in -response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or -reject comments, commits, code, wiki edits, issues, and other contributions -that are not aligned to this Code of Conduct, or to ban temporarily or -permanently any contributor for other behaviors that they deem inappropriate, -threatening, offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces -when an individual is representing the project or its community. Examples of -representing a project or community include using an official project e-mail -address, posting via an official social media account, or acting as an appointed -representative at an online or offline event. Representation of a project may be -further defined and clarified by project maintainers. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at contact@openmptcprouter.com. All -complaints will be reviewed and investigated and will result in a response that -is deemed necessary and appropriate to the circumstances. The project team is -obligated to maintain confidentiality with regard to the reporter of an incident. -Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good -faith may face temporary or permanent repercussions as determined by other -members of the project's leadership. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, -available at [http://contributor-covenant.org/version/1/4][version] - -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 83235db7..00000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -Contribution - -When submitting a pull request for the first time, you will need to agree to the contributor license agreement (for individuals or entities). To do this, in the pull request please create a file with a name like /contributors/{github_username}.md, and in the content of that file indicate your agreement. An example of what that file should contain can be seen in example agreement file. - -(This method of CLA "signing" is borrowed from Medium's open source project.) diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 9cecc1d4..00000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - {project} Copyright (C) {year} {fullname} - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/README.md b/README.md deleted file mode 100644 index a332c0a9..00000000 --- a/README.md +++ /dev/null @@ -1,51 +0,0 @@ -![openmptcprouter](https://github.com/Ysurac/openmptcprouter-feeds/workflows/openmptcprouter/badge.svg) -![Latest tag](https://img.shields.io/github/tag/ysurac/openmptcprouter-feeds.svg) -[![Paypal](https://www.openmptcprouter.com/img/donate-PayPal-green.svg)](https://www.paypal.me/ycarus) -[![Flattr](https://www.openmptcprouter.com/img/donate-flattr-yellow.svg)](https://flattr.com/@ycarus) -[![Liberapay](https://img.shields.io/liberapay/patrons/Moul.svg?logo=liberapay)](https://liberapay.com/Ycarus/) -[![LinkedIn](https://www.openmptcprouter.com/img/linkedin.png)](https://www.linkedin.com/in/yannick-chabanois-550330146/) -[![Twitter](https://www.openmptcprouter.com/img/twitter.jpg)](https://twitter.com/OpenMPTCProuter) -[![Atom](https://www.openmptcprouter.com/img/feed.png)](https://www.openmptcprouter.com/atom) - -# OpenMPTCProuter - -OpenMPTCProuter is an open source solution to aggregate and encrypt multiple internet connections and terminates it over any VPS which make clients benefit security, reliability, net neutrality, as well as dedicated public IP. - -The aggregation is based on Multipath TCP (MPTCP), which is ISP, WAN type, and latency independent "whether it was Fiber, VDSL, SHDSL, ADSL or even 4G", different scenarios can be configured to have either aggregation or failover based on MPTCP. - -Aggregation via [Multi-link VPN (MLVPN)](https://github.com/markfoodyburton/MLVPN/commits/new-reorder) and [Glorytun UDP](https://github.com/angt/glorytun) with multipath support are also supported. - -The solution takes advantage of the OpenWRT/LEDE system, which is user friendly and also adds the possibility of installing other packages like VPN, QoS, routing protocols, monitoring, etc. through web-interface or terminal. - - -Main website: [https://www.openmptcprouter.com/](https://www.openmptcprouter.com/) - -Packages made for OpenMPTCProuter are available here: [https://github.com/Ysurac/openmptcprouter-feeds](https://github.com/Ysurac/openmptcprouter-feeds) - -OpenMPTCProuter VPS script part: [https://github.com/Ysurac/openmptcprouter-vps](https://github.com/Ysurac/openmptcprouter-vps) - - -## Install from pre-compiled images - -You can download precompiled images from [https://www.openmptcprouter.com/](https://www.openmptcprouter.com/) - -Then copy it to a sdcard: - -```sh -gunzip omr-*.img.gz -dd bs=4M if=omr-*.img of=/dev/sdX conv=fsync -``` - -## Install from source - -[Create image](https://github.com/Ysurac/openmptcprouter/wiki/Create-image-for-unsupported-platform) - - -## Credits - -Our solution is mainly based on: - -* [OpenWRT](https://openwrt.org) -* [MultiPath TCP (MPTCP)](https://multipath-tcp.org) -* [Shadowsocks](https://shadowsocks.org) -* [Glorytun](https://github.com/angt/glorytun) \ No newline at end of file diff --git a/build.sh b/build.sh deleted file mode 100755 index aada4f31..00000000 --- a/build.sh +++ /dev/null @@ -1,372 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2017 OVH OverTheBox -# Copyright (C) 2017-2020 Ycarus (Yannick Chabanois) for OpenMPTCProuter project -# -# This is free software, licensed under the GNU General Public License v3. -# See /LICENSE for more information. -# - -set -e - -umask 0022 -unset GREP_OPTIONS SED - -_get_repo() ( - mkdir -p "$1" - cd "$1" - [ -d .git ] || git init - if git remote get-url origin >/dev/null 2>/dev/null; then - git remote set-url origin "$2" - else - git remote add origin "$2" - fi - git fetch origin -f - git fetch origin --tags -f - git checkout -f "origin/$3" -B "build" 2>/dev/null || git checkout "$3" -B "build" -) - -OMR_DIST=${OMR_DIST:-openmptcprouter} -OMR_HOST=${OMR_HOST:-$(curl -sS ifconfig.co)} -OMR_PORT=${OMR_PORT:-80} -OMR_KEEPBIN=${OMR_KEEPBIN:-no} -OMR_IMG=${OMR_IMG:-yes} -#OMR_UEFI=${OMR_UEFI:-yes} -OMR_PACKAGES=${OMR_PACKAGES:-full} -OMR_ALL_PACKAGES=${OMR_ALL_PACKAGES:-no} -OMR_TARGET=${OMR_TARGET:-x86_64} -OMR_TARGET_CONFIG="config-$OMR_TARGET" -OMR_KERNEL=${OMR_KERNEL:-5.4} -#OMR_RELEASE=${OMR_RELEASE:-$(git describe --tags `git rev-list --tags --max-count=1` | sed 's/^\([0-9.]*\).*/\1/')} -#OMR_RELEASE=${OMR_RELEASE:-$(git tag --sort=committerdate | tail -1)} -OMR_RELEASE=${OMR_RELEASE:-$(git describe --tags `git rev-list --tags --max-count=1` | tail -1 | cut -d '-' -f1)} -OMR_REPO=${OMR_REPO:-http://$OMR_HOST:$OMR_PORT/release/$OMR_RELEASE/$OMR_TARGET} - -OMR_FEED_URL="${OMR_FEED_URL:-https://github.com/suyuan168/openmptcprouter-feeds}" -OMR_FEED_SRC="${OMR_FEED_SRC:-develop}" - -CUSTOM_FEED_URL="${CUSTOM_FEED_URL}" - -OMR_OPENWRT=${OMR_OPENWRT:-default} - -if [ ! -f "$OMR_TARGET_CONFIG" ]; then - echo "Target $OMR_TARGET not found !" - #exit 1 -fi - -if [ "$OMR_TARGET" = "rpi3" ]; then - OMR_REAL_TARGET="aarch64_cortex-a53" -elif [ "$OMR_TARGET" = "rpi4" ]; then - OMR_REAL_TARGET="aarch64_cortex-a72" -elif [ "$OMR_TARGET" = "rpi2" ]; then - OMR_REAL_TARGET="arm_cortex-a7_neon-vfpv4" -elif [ "$OMR_TARGET" = "wrt3200acm" ]; then - OMR_REAL_TARGET="arm_cortex-a9_vfpv3" -elif [ "$OMR_TARGET" = "wrt32x" ]; then - OMR_REAL_TARGET="arm_cortex-a9_vfpv3" -elif [ "$OMR_TARGET" = "bpi-r2" ]; then - OMR_REAL_TARGET="arm_cortex-a7_neon-vfpv4" -elif [ "$OMR_TARGET" = "bpi-r64" ]; then - OMR_REAL_TARGET="aarch64_cortex-a53" -elif [ "$OMR_TARGET" = "espressobin" ]; then - OMR_REAL_TARGET="aarch64_cortex-a53" -elif [ "$OMR_TARGET" = "x86" ]; then - OMR_REAL_TARGET="i386_pentium4" -else - OMR_REAL_TARGET=${OMR_TARGET} -fi - -#_get_repo source https://github.com/ysurac/openmptcprouter-source "master" -if [ "$OMR_OPENWRT" = "default" ]; then - _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "bfc433efd4a0c6875a92981d1bd2a5e3e60c61c6" - _get_repo feeds/packages https://github.com/openwrt/packages "85dbb482017faec4d69c21b57a5a0afb8095f48a" - _get_repo feeds/luci https://github.com/openwrt/luci "833e25d24a8cbf8dd587ee4424ef49b3e4e5f210" -elif [ "$OMR_OPENWRT" = "master" ]; then - _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "master" - _get_repo feeds/packages https://github.com/openwrt/packages "master" - _get_repo feeds/luci https://github.com/openwrt/luci "master" -else - _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "${OMR_OPENWRT}" - _get_repo feeds/packages https://github.com/openwrt/packages "${OMR_OPENWRT}" - _get_repo feeds/luci https://github.com/openwrt/luci "${OMR_OPENWRT}" -fi - -if [ -z "$OMR_FEED" ]; then - OMR_FEED=feeds/openmptcprouter - _get_repo "$OMR_FEED" "$OMR_FEED_URL" "$OMR_FEED_SRC" -fi - -if [ -n "$CUSTOM_FEED_URL" ] && [ -z "$CUSTOM_FEED" ]; then - CUSTOM_FEED=feeds/${OMR_DIST} - _get_repo "$CUSTOM_FEED" "$CUSTOM_FEED_URL" "master" -fi - -if [ -n "$1" ] && [ -f "$OMR_FEED/$1/Makefile" ]; then - OMR_DIST=$1 - shift 1 -fi - -if [ "$OMR_KEEPBIN" = "no" ]; then - rm -rf "$OMR_TARGET/source/bin" -fi -rm -rf "$OMR_TARGET/source/files" "$OMR_TARGET/source/tmp" -#rm -rf "$OMR_TARGET/source/target/linux/mediatek/patches-4.14" -cp -rf root/* "$OMR_TARGET/source" - -cat >> "$OMR_TARGET/source/package/base-files/files/etc/banner" < "$OMR_TARGET/source/feeds.conf" <> "$OMR_TARGET/source/feeds.conf" -fi - -if [ "$OMR_DIST" = "openmptcprouter" ]; then - cat > "$OMR_TARGET/source/package/system/opkg/files/customfeeds.conf" <<-EOF - src/gz openwrt_luci http://packages.openmptcprouter.com/${OMR_RELEASE}/${OMR_REAL_TARGET}/luci - src/gz openwrt_packages http://packages.openmptcprouter.com/${OMR_RELEASE}/${OMR_REAL_TARGET}/packages - src/gz openwrt_base http://packages.openmptcprouter.com/${OMR_RELEASE}/${OMR_REAL_TARGET}/base - src/gz openwrt_routing http://packages.openmptcprouter.com/${OMR_RELEASE}/${OMR_REAL_TARGET}/routing - src/gz openwrt_telephony http://packages.openmptcprouter.com/${OMR_RELEASE}/${OMR_REAL_TARGET}/telephony - EOF -elif [ -n "$OMR_PACKAGES_URL" ]; then - cat > "$OMR_TARGET/source/package/system/opkg/files/customfeeds.conf" <<-EOF - src/gz openwrt_luci ${OMR_PACKAGES_URL}/${OMR_RELEASE}/${OMR_REAL_TARGET}/luci - src/gz openwrt_packages ${OMR_PACKAGES_URL}/${OMR_RELEASE}/${OMR_REAL_TARGET}/packages - src/gz openwrt_base ${OMR_PACKAGES_URL}/${OMR_RELEASE}/${OMR_REAL_TARGET}/base - src/gz openwrt_routing ${OMR_PACKAGES_URL}/${OMR_RELEASE}/${OMR_REAL_TARGET}/routing - src/gz openwrt_telephony ${OMR_PACKAGES_URL}/${OMR_RELEASE}/${OMR_REAL_TARGET}/telephony - EOF -else - cat > "$OMR_TARGET/source/package/system/opkg/files/customfeeds.conf" <<-EOF - src/gz openwrt_luci http://downloads.openwrt.org/snapshots/packages/${OMR_REAL_TARGET}/luci - src/gz openwrt_packages http://downloads.openwrt.org/snapshots/packages/${OMR_REAL_TARGET}/packages - src/gz openwrt_base http://downloads.openwrt.org/snapshots/packages/${OMR_REAL_TARGET}/base - src/gz openwrt_routing http://downloads.openwrt.org/snapshots/packages/${OMR_REAL_TARGET}/routing - src/gz openwrt_telephony http://downloads.openwrt.org/snapshots/packages/${OMR_REAL_TARGET}/telephony - EOF -fi -#cat > "$OMR_TARGET/source/package/system/opkg/files/customfeeds.conf" < "$OMR_TARGET/source/.config" <<-EOF - CONFIG_IMAGEOPT=y - CONFIG_VERSIONOPT=y - CONFIG_VERSION_DIST="$OMR_DIST" - CONFIG_VERSION_REPO="$OMR_REPO" - CONFIG_VERSION_NUMBER="$(git -C "$OMR_FEED" tag --sort=committerdate | tail -1)" - EOF -else - cat config -> "$OMR_TARGET/source/.config" <<-EOF - CONFIG_IMAGEOPT=y - CONFIG_VERSIONOPT=y - CONFIG_VERSION_DIST="$OMR_DIST" - CONFIG_VERSION_REPO="$OMR_REPO" - CONFIG_VERSION_NUMBER="$(git -C "$OMR_FEED" tag --sort=committerdate | tail -1)-$(git -C "$OMR_FEED" rev-parse --short HEAD)" - EOF -fi -if [ "$OMR_ALL_PACKAGES" = "yes" ]; then - echo 'CONFIG_ALL=y' >> "$OMR_TARGET/source/.config" - echo 'CONFIG_ALL_NONSHARED=y' >> "$OMR_TARGET/source/.config" -fi -if [ "$OMR_IMG" = "yes" ] && [ "$OMR_TARGET" = "x86_64" ]; then - echo 'CONFIG_VDI_IMAGES=y' >> "$OMR_TARGET/source/.config" - echo 'CONFIG_VMDK_IMAGES=y' >> "$OMR_TARGET/source/.config" - echo 'CONFIG_VHDX_IMAGES=y' >> "$OMR_TARGET/source/.config" -fi - -if [ "$OMR_PACKAGES" = "full" ]; then - echo "CONFIG_PACKAGE_${OMR_DIST}-full=y" >> "$OMR_TARGET/source/.config" -fi -if [ "$OMR_PACKAGES" = "mini" ]; then - echo "CONFIG_PACKAGE_${OMR_DIST}-mini=y" >> "$OMR_TARGET/source/.config" -fi - -cd "$OMR_TARGET/source" - -#if [ "$OMR_UEFI" = "yes" ] && [ "$OMR_TARGET" = "x86_64" ]; then -# echo "Checking if UEFI patch is set or not" -# if [ "$(grep 'EFI_IMAGES' target/linux/x86/image/Makefile)" = "" ]; then -# patch -N -p1 -s < ../../patches/uefi.patch -# fi -# echo "Done" -#else -# if [ "$(grep 'EFI_IMAGES' target/linux/x86/image/Makefile)" != "" ]; then -# patch -N -R -p1 -s < ../../patches/uefi.patch -# fi -#fi - -#if [ "$OMR_TARGET" = "x86_64" ]; then -# echo "Checking if Hyper-V patch is set or not" -# if ! patch -Rf -N -p1 -s --dry-run < ../../patches/images.patch; then -# patch -N -p1 -s < ../../patches/images.patch -# fi -# echo "Done" -#fi - -echo "Checking if No check patch is set or not" -if ! patch -Rf -N -p1 -s --dry-run < ../../patches/nocheck.patch; then - echo "apply..." - patch -N -p1 -s < ../../patches/nocheck.patch -fi -echo "Done" - -echo "Checking if Nanqinlang patch is set or not" -if ! patch -Rf -N -p1 -s --dry-run < ../../patches/nanqinlang.patch; then - echo "apply..." - patch -N -p1 -s < ../../patches/nanqinlang.patch -fi -echo "Done" - -# Add BBR2 patch, only working on 64bits images for now -if [ "$OMR_TARGET" = "x86_64" ] || [ "$OMR_TARGET" = "bpi-r64" ] || [ "$OMR_TARGET" = "rpi4" ] || [ "$OMR_TARGET" = "espressobin" ] || [ "$OMR_TARGET" = "r2s" ] || [ "$OMR_TARGET" = "rpi3" ]; then - echo "Checking if BBRv2 patch is set or not" - if ! patch -Rf -N -p1 -s --dry-run < ../../patches/bbr2.patch; then - echo "apply..." - patch -N -p1 -s < ../../patches/bbr2.patch - fi - echo "Done" -fi - -echo "Checking if smsc75xx patch is set or not" -if ! patch -Rf -N -p1 -s --dry-run < ../../patches/smsc75xx.patch; then - echo "apply..." - patch -N -p1 -s < ../../patches/smsc75xx.patch -fi -echo "Done" - -#echo "Checking if ipt-nat patch is set or not" -#if ! patch -Rf -N -p1 -s --dry-run < ../../patches/ipt-nat6.patch; then -# echo "apply..." -# patch -N -p1 -s < ../../patches/ipt-nat6.patch -#fi -#echo "Done" - -#echo "Checking if mvebu patch is set or not" -#if [ ! -d target/linux/mvebu/patches-5.4 ]; then -# echo "apply..." -# patch -N -p1 -s < ../../patches/mvebu-5.14.patch -#fi -#echo "Done" - -echo "Checking if opkg install arguement too long patch is set or not" -if ! patch -Rf -N -p1 -s --dry-run < ../../patches/package-too-long.patch; then - echo "apply..." - patch -N -p1 -s < ../../patches/package-too-long.patch -fi -echo "Done" - -echo "Download via IPv4" -if ! patch -Rf -N -p1 -s --dry-run < ../../patches/download-ipv4.patch; then - patch -N -p1 -s < ../../patches/download-ipv4.patch -fi -echo "Done" - -echo "Remove check rsync" -if [ "$(grep rsync include/prereq-build.mk)" != "" ]; then - patch -N -p1 -s < ../../patches/check-rsync.patch -fi -echo "Done" - -if [ -f target/linux/mediatek/patches-5.4/0999-hnat.patch ]; then - rm -f target/linux/mediatek/patches-5.4/0999-hnat.patch -fi - -if [ -f target/linux/ipq40xx/patches-5.4/100-GPIO-add-named-gpio-exports.patch ]; then - rm -f target/linux/ipq40xx/patches-5.4/100-GPIO-add-named-gpio-exports.patch -fi - -#echo "Patch protobuf wrong hash" -#patch -N -R -p1 -s < ../../patches/protobuf_hash.patch -#echo "Done" - -#echo "Remove gtime dependency" -#if ! patch -Rf -N -p1 -s --dry-run < ../../patches/gtime.patch; then -# patch -N -p1 -s < ../../patches/gtime.patch -#fi -#echo "Done" - -if [ "$OMR_KERNEL" = "5.4" ]; then - echo "Set to kernel 5.4 for rpi arch" - find target/linux/bcm27xx -type f -name Makefile -exec sed -i 's%KERNEL_PATCHVER:=4.19%KERNEL_PATCHVER:=5.4%g' {} \; - echo "Done" - echo "Set to kernel 5.4 for x86 arch" - find target/linux/x86 -type f -name Makefile -exec sed -i 's%KERNEL_PATCHVER:=4.19%KERNEL_PATCHVER:=5.4%g' {} \; - echo "Done" - echo "Set to kernel 5.4 for mvebu arch (WRT)" - find target/linux/mvebu -type f -name Makefile -exec sed -i 's%KERNEL_PATCHVER:=4.19%KERNEL_PATCHVER:=5.4%g' {} \; - echo "Done" - echo "Set to kernel 5.4 for mediatek arch (BPI-R2)" - find target/linux/mediatek -type f -name Makefile -exec sed -i 's%KERNEL_PATCHVER:=4.19%KERNEL_PATCHVER:=5.4%g' {} \; - echo "Done" -fi - -#rm -rf feeds/packages/libs/libwebp -cd "../.." -rm -rf feeds/luci/modules/luci-mod-network -[ -d feeds/${OMR_DIST}/luci-mod-status ] && rm -rf feeds/luci/modules/luci-mod-status -[ -d feeds/${OMR_DIST}/luci-app-statistics ] && rm -rf feeds/luci/applications/luci-app-statistics - -echo "Add Occitan translation support" -if ! patch -Rf -N -p1 -s --dry-run < patches/luci-occitan.patch; then - patch -N -p1 -s < patches/luci-occitan.patch - #sh feeds/luci/build/i18n-add-language.sh oc -fi -[ -d $OMR_FEED/luci-base/po/oc ] && cp -rf $OMR_FEED/luci-base/po/oc feeds/luci/modules/luci-base/po/ -echo "Done" - -cd "$OMR_TARGET/source" -echo "Update feeds index" -cp .config .config.keep -scripts/feeds clean -scripts/feeds update -a - -#cd - -#echo "Checking if fullconenat-luci patch is set or not" -##if ! patch -Rf -N -p1 -s --dry-run < patches/fullconenat-luci.patch; then -# echo "apply..." -# patch -N -p1 -s < patches/fullconenat-luci.patch -#fi -#echo "Done" -#cd "$OMR_TARGET/source" - -if [ "$OMR_ALL_PACKAGES" = "yes" ]; then - scripts/feeds install -a -d m -p packages - scripts/feeds install -a -d m -p luci -fi -if [ -n "$CUSTOM_FEED" ]; then - scripts/feeds install -a -d m -p openmptcprouter - scripts/feeds install -a -d y -f -p ${OMR_DIST} -else - scripts/feeds install -a -d y -f -p openmptcprouter -fi -cp .config.keep .config -echo "Done" - -if [ ! -f "../../$OMR_TARGET_CONFIG" ]; then - echo "Target $OMR_TARGET not found ! You have to configure and compile your kernel manually." - exit 1 -fi - -echo "Building $OMR_DIST for the target $OMR_TARGET" -make defconfig -make IGNORE_ERRORS=m "$@" -echo "Done" \ No newline at end of file diff --git a/config b/config deleted file mode 100644 index cc029c42..00000000 --- a/config +++ /dev/null @@ -1,235 +0,0 @@ -CONFIG_DEVEL=y -CONFIG_TOOLCHAINOPTS=y -CONFIG_ALL_KMODS=y -CONFIG_BUSYBOX_CUSTOM=y -CONFIG_BUSYBOX_CONFIG_ADDUSER=y -CONFIG_BUSYBOX_CONFIG_ARP=y -CONFIG_BUSYBOX_CONFIG_ARPING=y -CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y -CONFIG_BUSYBOX_CONFIG_BASE64=y -CONFIG_BUSYBOX_CONFIG_BC=y -CONFIG_BUSYBOX_CONFIG_CHPASSWD=y -CONFIG_BUSYBOX_CONFIG_DELUSER=y -CONFIG_BUSYBOX_CONFIG_DIFF=y -CONFIG_BUSYBOX_CONFIG_FEATURE_DATE_NANO=y -CONFIG_BUSYBOX_CONFIG_FEATURE_DIFF_DIR=y -CONFIG_BUSYBOX_CONFIG_FEATURE_PS_LONG=y -CONFIG_BUSYBOX_CONFIG_FEATURE_SEAMLESS_BZ2=y -CONFIG_BUSYBOX_CONFIG_FEATURE_SHOW_THREADS=y -CONFIG_BUSYBOX_CONFIG_FEATURE_STAT_FILESYSTEM=y -CONFIG_BUSYBOX_CONFIG_FEATURE_STAT_FORMAT=y -# CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_SMP_CPU is not set -# CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_SMP_PROCESS is not set -CONFIG_BUSYBOX_CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_BUSYBOX_CONFIG_FEATURE_VI_UNDO=y -CONFIG_BUSYBOX_CONFIG_FEATURE_VI_UNDO_QUEUE=y -CONFIG_BUSYBOX_CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=32 -CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL=y -CONFIG_BUSYBOX_CONFIG_IOSTAT=y -CONFIG_BUSYBOX_CONFIG_LOADKMAP=y -CONFIG_BUSYBOX_CONFIG_LSPCI=y -CONFIG_BUSYBOX_CONFIG_LSUSB=y -CONFIG_BUSYBOX_CONFIG_NOHUP=y -CONFIG_BUSYBOX_CONFIG_PKILL=y -CONFIG_BUSYBOX_CONFIG_STAT=y -CONFIG_BUSYBOX_CONFIG_STTY=y -CONFIG_BUSYBOX_CONFIG_TELNET=y -CONFIG_BUSYBOX_CONFIG_TIMEOUT=y -CONFIG_BUSYBOX_CONFIG_WATCH=y -# CONFIG_GDB is not set -CONFIG_GRUB_SERIAL="" -CONFIG_GRUB_TIMEOUT="0" -CONFIG_GRUB_TITLE="antrouter" -CONFIG_KERNEL_AIO=y -CONFIG_KERNEL_DEBUG_GPIO=y -# CONFIG_KERNEL_DEBUG_INFO is not set -CONFIG_KERNEL_DEBUG_PINCTRL=y -CONFIG_KERNEL_DEVTMPFS=y -CONFIG_KERNEL_DEVTMPFS_MOUNT=y -CONFIG_KERNEL_DIRECT_IO=y -CONFIG_KERNEL_DMA_ACPI=y -CONFIG_KERNEL_FANOTIFY=y -CONFIG_KERNEL_FHANDLE=y -CONFIG_KERNEL_IPC_NS=y -# CONFIG_KERNEL_MAGIC_SYSRQ is not set -CONFIG_KERNEL_MMC_SDHCI_ACPI=y -CONFIG_KERNEL_NAMESPACES=y -CONFIG_KERNEL_NET_NS=y -CONFIG_KERNEL_PID_NS=y -# CONFIG_KERNEL_SWAP is not set -CONFIG_KERNEL_USER_NS=y -CONFIG_KERNEL_UTS_NS=y -# CONFIG_PACKAGE_dnsmasq is not set -CONFIG_PACKAGE_kmod-8021q=y -CONFIG_PACKAGE_kmod-ata-ahci=y -CONFIG_PACKAGE_kmod-ata-core=y -CONFIG_PACKAGE_kmod-block2mtd=y -CONFIG_PACKAGE_kmod-bridge=y -CONFIG_PACKAGE_kmod-crypto-gcm=y -CONFIG_PACKAGE_kmod-gpio-button-hotplug=y -CONFIG_PACKAGE_kmod-hid=y -CONFIG_PACKAGE_kmod-hid-generic=y -CONFIG_PACKAGE_kmod-i2c-gpio=y -CONFIG_PACKAGE_kmod-i2c-gpio-custom=y -CONFIG_PACKAGE_kmod-ifb=y -CONFIG_PACKAGE_kmod-ikconfig=y -CONFIG_PACKAGE_kmod-input-evdev=y -CONFIG_PACKAGE_kmod-loop=y -CONFIG_PACKAGE_kmod-macvlan=y -CONFIG_PACKAGE_kmod-mmc=y -CONFIG_PACKAGE_kmod-mmc-spi=y -CONFIG_PACKAGE_kmod-random-core=y -CONFIG_DEFAULT_kmod-r8169=y -CONFIG_PACKAGE_kmod-scsi-core=y -CONFIG_PACKAGE_kmod-sctp=y -CONFIG_PACKAGE_kmod-sdhci=y -CONFIG_PACKAGE_kmod-serial-8250=y -CONFIG_PACKAGE_kmod-stp=y -CONFIG_PACKAGE_kmod-usb-acm=y -CONFIG_PACKAGE_kmod-usb-core=y -CONFIG_PACKAGE_kmod-usb-hid=y -CONFIG_PACKAGE_kmod-usb-net=y -CONFIG_PACKAGE_kmod-usb-net-asix=y -CONFIG_PACKAGE_kmod-usb-net-asix-ax88179=y -CONFIG_PACKAGE_kmod-usb-net-cdc-eem=y -CONFIG_PACKAGE_kmod-usb-net-cdc-ether=y -CONFIG_PACKAGE_kmod-usb-net-cdc-mbim=y -CONFIG_PACKAGE_kmod-usb-net-cdc-ncm=y -CONFIG_PACKAGE_kmod-usb-net-cdc-subset=y -CONFIG_PACKAGE_kmod-usb-net-dm9601-ether=y -CONFIG_PACKAGE_kmod-usb-net-hso=y -CONFIG_PACKAGE_kmod-usb-net-huawei-cdc-ncm=y -CONFIG_PACKAGE_kmod-usb-net-ipheth=y -CONFIG_PACKAGE_kmod-usb-net-kalmia=y -CONFIG_PACKAGE_kmod-usb-net-kaweth=y -CONFIG_PACKAGE_kmod-usb-net-mcs7830=y -CONFIG_PACKAGE_kmod-usb-net-pegasus=y -CONFIG_PACKAGE_kmod-usb-net-qmi-wwan=y -CONFIG_PACKAGE_kmod-usb-net-rndis=y -CONFIG_PACKAGE_kmod-usb-net-rtl8150=y -CONFIG_PACKAGE_kmod-usb-net-rtl8152=y -CONFIG_PACKAGE_kmod-usb-net-sierrawireless=y -CONFIG_PACKAGE_kmod-usb-net-smsc95xx=y -CONFIG_PACKAGE_kmod-usb-net-sr9700=y -CONFIG_PACKAGE_kmod-usb-serial=y -CONFIG_PACKAGE_kmod-usb-serial-ark3116=y -CONFIG_PACKAGE_kmod-usb-serial-belkin=y -CONFIG_PACKAGE_kmod-usb-serial-ch341=y -CONFIG_PACKAGE_kmod-usb-serial-cp210x=y -CONFIG_PACKAGE_kmod-usb-serial-cypress-m8=y -CONFIG_PACKAGE_kmod-usb-serial-ftdi=y -CONFIG_PACKAGE_kmod-usb-serial-garmin=y -CONFIG_PACKAGE_kmod-usb-serial-ipw=y -CONFIG_PACKAGE_kmod-usb-serial-keyspan=y -CONFIG_PACKAGE_kmod-usb-serial-mct=y -CONFIG_PACKAGE_kmod-usb-serial-mos7720=y -CONFIG_PACKAGE_kmod-usb-serial-option=y -CONFIG_PACKAGE_kmod-usb-serial-oti6858=y -CONFIG_PACKAGE_kmod-usb-serial-pl2303=y -CONFIG_PACKAGE_kmod-usb-serial-qualcomm=y -CONFIG_PACKAGE_kmod-usb-serial-sierrawireless=y -CONFIG_PACKAGE_kmod-usb-serial-simple=y -CONFIG_PACKAGE_kmod-usb-serial-ti-usb=y -CONFIG_PACKAGE_kmod-usb-serial-visor=y -CONFIG_PACKAGE_kmod-usb-serial-wwan=y -CONFIG_PACKAGE_kmod-usb-storage=y -CONFIG_PACKAGE_kmod-usb-wdm=y -CONFIG_PACKAGE_kmod-usb2=y -CONFIG_PACKAGE_kmod-usb3=y -CONFIG_PACKAGE_kmod-veth=y -CONFIG_PACKAGE_kmod-3c59x=y -CONFIG_PACKAGE_kmod-8139cp=y -CONFIG_PACKAGE_kmod-8139too=y -CONFIG_PACKAGE_kmod-atl1=y -CONFIG_PACKAGE_kmod-atl1c=y -CONFIG_PACKAGE_kmod-atl1e=y -CONFIG_PACKAGE_kmod-atl2=y -CONFIG_PACKAGE_kmod-b44=y -CONFIG_PACKAGE_kmod-bnx2=y -CONFIG_PACKAGE_kmod-dm9000=y -CONFIG_PACKAGE_kmod-e100=y -CONFIG_PACKAGE_kmod-e1000=y -CONFIG_PACKAGE_kmod-e1000e=y -CONFIG_PACKAGE_kmod-et131x=y -CONFIG_PACKAGE_kmod-ethoc=y -CONFIG_PACKAGE_kmod-forcedeth=y -CONFIG_PACKAGE_kmod-gigaset=y -CONFIG_PACKAGE_kmod-hfcmulti=y -CONFIG_PACKAGE_kmod-hfcpci=y -CONFIG_PACKAGE_kmod-natsemi=y -CONFIG_PACKAGE_kmod-ne2k-pci=y -CONFIG_PACKAGE_kmod-of-mdio=y -CONFIG_PACKAGE_kmod-pcnet32=y -CONFIG_PACKAGE_kmod-phy-broadcom=y -CONFIG_PACKAGE_kmod-ppfe=y -CONFIG_PACKAGE_kmod-r6040=y -CONFIG_PACKAGE_kmod-r8169=y -CONFIG_PACKAGE_kmod-sis190=y -CONFIG_PACKAGE_kmod-sis900=y -CONFIG_PACKAGE_kmod-skge=y -CONFIG_PACKAGE_kmod-sky2=y -CONFIG_PACKAGE_kmod-solos-pci=y -CONFIG_PACKAGE_kmod-spi-ks8995=y -CONFIG_PACKAGE_kmod-tg3=y -CONFIG_PACKAGE_kmod-tulip=y -CONFIG_PACKAGE_kmod-via-rhine=y -CONFIG_PACKAGE_kmod-via-velocity=y -CONFIG_PACKAGE_kmod-vmxnet3=y -CONFIG_PACKAGE_kmod-fs-vfat=y -CONFIG_TARGET_IMAGES_PAD=y -CONFIG_TARGET_ROOTFS_EXT4=y -CONFIG_KERNEL_TCP_CONG_CDG=y -CONFIG_KERNEL_TCP_CONG_HTCP=y -CONFIG_KERNEL_TCP_CONG_HSTCP=y -CONFIG_KERNEL_TCP_CONG_HYBLA=y -CONFIG_KERNEL_TCP_CONG_ILLINOIS=y -CONFIG_KERNEL_TCP_CONG_SCALABLE=y -CONFIG_KERNEL_TCP_CONG_VEGAS=y -CONFIG_KERNEL_TCP_CONG_VENO=y -CONFIG_KERNEL_TCP_CONG_WESTWOOD=y -CONFIG_KERNEL_TCP_CONG_YEAH=y -CONFIG_KERNEL_TCP_CONG_LIA=y -CONFIG_KERNEL_TCP_CONG_BBR=y -CONFIG_KERNEL_TCP_CONG_NANQINLANG=y -CONFIG_KERNEL_TCP_CONG_OLIA=y -CONFIG_KERNEL_TCP_CONG_WVEGAS=y -CONFIG_KERNEL_TCP_CONG_BALIA=y -CONFIG_KERNEL_MPTCP_FULLMESH=y -CONFIG_KERNEL_DEFAULT_FULLMESH=y -CONFIG_KERNEL_MPTCP_NDIFFPORTS=y -# CONFIG_KERNEL_DEFAULT_NDIFFPORTS is not set -CONFIG_KERNEL_MPTCP_BINDER=y -CONFIG_KERNEL_MPTCP_ECF=y -# CONFIG_KERNEL_DEFAULT_BINDER is not set -# CONFIG_KERNEL_DEFAULT_DUMMY is not set -CONFIG_KERNEL_MPTCP_ROUNDROBIN=y -# CONFIG_KERNEL_DEFAULT_ROUNDROBIN is not set -CONFIG_KERNEL_MPTCP_REDUNDANT=y -# CONFIG_KERNEL_DEFAULT_REDUNDANT is not set -CONFIG_KERNEL_DEFAULT_SCHEDULER=y -CONFIG_KERNEL_MPTCP=y -CONFIG_KERNEL_CRYPTO_SHA256=y -CONFIG_LUCI_LANG_zh_Hans=y -CONFIG_LUCI_LANG_zh_Hant=y -CONFIG_LUCI_LANG_zh-tw=y -CONFIG_TARGET_ROOTFS_PARTSIZE=512 -CONFIG_TARGET_KERNEL_PARTSIZE=64 -CONFIG_OPENSSL_WITH_CHACHA_POLY1305=y -# CONFIG_LUCI_CSSTIDY is not set -# CONFIG_LIBCURL_WOLFSSL is not set -# CONFIG_PACKAGE_libustream-wolfssl is not set -CONFIG_KERNEL_DEVMEM=y -CONFIG_KERNEL_DEVKMEM=y -# CONFIG_PACKAGE_luci-theme-argon=y -CONFIG_PACKAGE_luci-theme-bootstrap=y -CONFIG_PACKAGE_luci-theme-openwrt-2020=y -# CONFIG_PACKAGE_luci-theme-argon is not set -CONFIG_PACKAGE_luci-app-status=m -CONFIG_PACKAGE_luci-mod-status=y -CONFIG_PACKAGE_frpc=y -CONFIG_PACKAGE_rtty-nossl=y -CONFIG_PACKAGE_minicom=y -CONFIG_PACKAGE_irqbalance=y -CONFIG_PACKAGE_mtr=y -CONFIG_AUTOREMOVE=y diff --git a/config-bpi-r64 b/config-bpi-r64 deleted file mode 100644 index 74443ce7..00000000 --- a/config-bpi-r64 +++ /dev/null @@ -1,10 +0,0 @@ -CONFIG_TARGET_mediatek=y -CONFIG_TARGET_mediatek_mt7622=y -CONFIG_TARGET_mediatek_mt7622_DEVICE_bpi_bananapi-r64=y -# CONFIG_PACKAGE_kmod-mt6625l-bt is not set -# CONFIG_PACKAGE_kmod-mt6625l-wlan-gen-2 is not set -CONFIG_PACKAGE_uboot-mediatek=y -CONFIG_PACKAGE_uboot-envtools=y -CONFIG_PACKAGE_mt7622-preloader=y -CONFIG_KERNEL_ARM64_MODULE_PLTS=y -CONFIG_KERNEL_TCP_CONG_BBR2=y diff --git a/config-cm520-79f b/config-cm520-79f deleted file mode 100644 index 9622e061..00000000 --- a/config-cm520-79f +++ /dev/null @@ -1,12 +0,0 @@ -CONFIG_TARGET_ipq40xx=y -CONFIG_TARGET_ipq40xx_generic=y -CONFIG_TARGET_ipq40xx_generic_DEVICE_mobipromo_cm520-79f=y -CONFIG_KERNEL_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_PACKAGE_ipq-wifi-mobipromo_cm520-79f=y -CONFIG_DEFAULT_ath10k-firmware-qca4019-ct=y -CONFIG_DEFAULT_kmod-ath10k-ct=y -# CONFIG_KERNEL_CC_OPTIMIZE_FOR_PERFORMANCE is not set -CONFIG_PACKAGE_kmod-ath10k-ct=y -CONFIG_ATH10K-CT_LEDS=y -CONFIG_PACKAGE_ath10k-firmware-qca4019-ct=y -CONFIG_KERNEL_ARM_MODULE_PLTS=y diff --git a/config-espressobin b/config-espressobin deleted file mode 100644 index ed5b4188..00000000 --- a/config-espressobin +++ /dev/null @@ -1,9 +0,0 @@ -CONFIG_TARGET_mvebu=y -CONFIG_TARGET_mvebu_cortexa53=y -CONFIG_TARGET_mvebu_cortexa53_DEVICE_globalscale_espressobin-v7=y -CONFIG_PACKAGE_kmod-6lowpan=y -CONFIG_PACKAGE_luci-app-advanced-reboot=y -# CONFIG_KERNEL_CC_OPTIMIZE_FOR_PERFORMANCE is not set -CONFIG_KERNEL_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_KERNEL_ARM_MODULE_PLTS=y -CONFIG_KERNEL_TCP_CONG_BBR2=y diff --git a/config-nanopi_neo b/config-nanopi_neo deleted file mode 100644 index 5f627826..00000000 --- a/config-nanopi_neo +++ /dev/null @@ -1,70 +0,0 @@ -CONFIG_MODULES=y -CONFIG_HAVE_DOT_CONFIG=y -CONFIG_TARGET_sunxi=y -CONFIG_TARGET_sunxi_cortexa7=y -CONFIG_TARGET_sunxi_cortexa7_DEVICE_friendlyarm_nanopi-neo=y -CONFIG_PACKAGE_kmod-6lowpan=y -CONFIG_HAS_SUBTARGETS=y -CONFIG_HAS_DEVICES=y -CONFIG_TARGET_BOARD="sunxi" -CONFIG_TARGET_SUBTARGET="cortexa7" -CONFIG_TARGET_PROFILE="DEVICE_friendlyarm_nanopi-neo" -CONFIG_TARGET_ARCH_PACKAGES="arm_cortex-a7_neon-vfpv4" -CONFIG_DEFAULT_TARGET_OPTIMIZATION="-Os -pipe" -CONFIG_CPU_TYPE="cortex-a7+neon-vfpv4" -CONFIG_LINUX_5_4=y -CONFIG_DEFAULT_base-files=y -CONFIG_DEFAULT_busybox=y -CONFIG_DEFAULT_ca-bundle=y -CONFIG_DEFAULT_dnsmasq=y -CONFIG_DEFAULT_dropbear=y -CONFIG_DEFAULT_e2fsprogs=y -CONFIG_DEFAULT_firewall=y -CONFIG_DEFAULT_fstools=y -CONFIG_DEFAULT_ip6tables=y -CONFIG_DEFAULT_iptables=y -CONFIG_DEFAULT_kmod-ipt-offload=y -CONFIG_DEFAULT_libc=y -CONFIG_DEFAULT_libgcc=y -CONFIG_DEFAULT_libustream-wolfssl=y -CONFIG_DEFAULT_logd=y -CONFIG_DEFAULT_mkf2fs=y -CONFIG_DEFAULT_mtd=y -CONFIG_DEFAULT_netifd=y -CONFIG_DEFAULT_odhcp6c=y -CONFIG_DEFAULT_odhcpd-ipv6only=y -CONFIG_DEFAULT_opkg=y -CONFIG_DEFAULT_partx-utils=y -CONFIG_DEFAULT_ppp=y -CONFIG_DEFAULT_ppp-mod-pppoe=y -CONFIG_DEFAULT_uboot-envtools=y -CONFIG_DEFAULT_uci=y -CONFIG_DEFAULT_uclient-fetch=y -CONFIG_DEFAULT_urandom-seed=y -CONFIG_DEFAULT_urngd=y -CONFIG_HAS_FPU=y -CONFIG_AUDIO_SUPPORT=y -CONFIG_GPIO_SUPPORT=y -CONFIG_USB_SUPPORT=y -CONFIG_RTC_SUPPORT=y -CONFIG_USES_DEVICETREE=y -CONFIG_USES_SQUASHFS=y -CONFIG_USES_EXT4=y -CONFIG_arm=y -CONFIG_arm_v7=y -CONFIG_ARCH="arm" -CONFIG_KERNEL_ARM_MODULE_PLTS=y -# CONFIG_PACKAGE_libustream-wolfssl is not set -CONFIG_KERNEL_DEVMEM=y -CONFIG_KERNEL_DEVKMEM=y -# CONFIG_PACKAGE_luci-theme-argon=y -CONFIG_PACKAGE_luci-theme-bootstrap=y -CONFIG_PACKAGE_luci-theme-openwrt-2020=y -# CONFIG_PACKAGE_luci-theme-argon is not set -CONFIG_PACKAGE_luci-app-status=m -CONFIG_PACKAGE_luci-mod-status=y -CONFIG_PACKAGE_frpc=y -CONFIG_PACKAGE_rtty-nossl=y -CONFIG_PACKAGE_minicom=y -CONFIG_PACKAGE_irqbalance=y -CONFIG_PACKAGE_mtr=y \ No newline at end of file diff --git a/config-p2w_r619ac b/config-p2w_r619ac deleted file mode 100644 index 750ecadb..00000000 --- a/config-p2w_r619ac +++ /dev/null @@ -1,12 +0,0 @@ -CONFIG_TARGET_ipq40xx=y -CONFIG_TARGET_ipq40xx_generic=y -CONFIG_TARGET_ipq40xx_generic_DEVICE_p2w_r619ac-128m=y -CONFIG_PACKAGE_ipq-wifi-p2w_r619ac=y -CONFIG_DEFAULT_ath10k-firmware-qca4019-ct=y -CONFIG_DEFAULT_kmod-ath10k-ct=y -# CONFIG_KERNEL_CC_OPTIMIZE_FOR_PERFORMANCE is not set -CONFIG_KERNEL_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_PACKAGE_kmod-ath10k-ct=y -CONFIG_ATH10K-CT_LEDS=y -CONFIG_PACKAGE_ath10k-firmware-qca4019-ct=y -CONFIG_KERNEL_ARM_MODULE_PLTS=y diff --git a/config-r2s b/config-r2s deleted file mode 100644 index 32b989e7..00000000 --- a/config-r2s +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_TARGET_rockchip=y -CONFIG_TARGET_rockchip_armv8=y -CONFIG_TARGET_rockchip_armv8_DEVICE_friendlyarm_nanopi-r2s=y -CONFIG_PACKAGE_kmod-6lowpan=y -CONFIG_KERNEL_ARM_MODULE_PLTS=y -CONFIG_KERNEL_TCP_CONG_BBR2=y diff --git a/config-rpi2 b/config-rpi2 deleted file mode 100644 index edadff44..00000000 --- a/config-rpi2 +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG_TARGET_bcm27xx=y -CONFIG_TARGET_bcm27xx_bcm2709=y -CONFIG_TARGET_bcm27xx_bcm2709_DEVICE_rpi-2=y -CONFIG_PACKAGE_kmod-ath10k-ct=n -CONFIG_PACKAGE_kmod-ath9k=y -CONFIG_PACKAGE_bcm27xx-eeprom=y -CONFIG_PACKAGE_bcm27xx-userland=y -CONFIG_KERNEL_ARM_MODULE_PLTS=y \ No newline at end of file diff --git a/config-rpi3 b/config-rpi3 deleted file mode 100644 index 70db978f..00000000 --- a/config-rpi3 +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG_TARGET_bcm27xx=y -CONFIG_TARGET_bcm27xx_bcm2710=y -CONFIG_TARGET_bcm27xx_bcm2710_DEVICE_rpi-3=y -CONFIG_PACKAGE_kmod-ath10k-ct=n -CONFIG_PACKAGE_kmod-ath9k=y -CONFIG_KERNEL_ARM_MODULE_PLTS=y -CONFIG_KERNEL_TCP_CONG_BBR2=y diff --git a/config-rpi4 b/config-rpi4 deleted file mode 100644 index c2840279..00000000 --- a/config-rpi4 +++ /dev/null @@ -1,9 +0,0 @@ -CONFIG_TARGET_bcm27xx=y -CONFIG_TARGET_bcm27xx_bcm2711=y -CONFIG_TARGET_bcm27xx_bcm2711_DEVICE_rpi-4=y -CONFIG_PACKAGE_kmod-ath10k-ct=n -CONFIG_PACKAGE_kmod-ath9k=y -CONFIG_PACKAGE_bcm27xx-eeprom=y -CONFIG_PACKAGE_bcm27xx-userland=y -CONFIG_KERNEL_ARM64_MODULE_PLTS=y -CONFIG_KERNEL_TCP_CONG_BBR2=y diff --git a/config-x86_64 b/config-x86_64 deleted file mode 100644 index 78b1a42c..00000000 --- a/config-x86_64 +++ /dev/null @@ -1,12 +0,0 @@ -CONFIG_TARGET_x86=y -CONFIG_TARGET_x86_64=y -CONFIG_TARGET_x86_64_Generic=y -CONFIG_TARGET_EXT4_JOURNAL=y -CONFIG_TARGET_ROOTFS_TARGZ=y -CONFIG_KERNEL_PAGE_TABLE_ISOLATION=y -CONFIG_PACKAGE_open-vm-tools=m -CONFIG_PACKAGE_kmod-ath9k=y -CONFIG_GRUB_IMAGES=y -CONFIG_EFI_IMAGES=y -# CONFIG_VMDK_IMAGES is not set -CONFIG_KERNEL_TCP_CONG_BBR2=y diff --git a/contributors/example.md b/contributors/example.md deleted file mode 100644 index 654879dc..00000000 --- a/contributors/example.md +++ /dev/null @@ -1,9 +0,0 @@ -2018-05-19 - -I hereby agree to the terms of the "OpenMPTCProuter Individual Contributor License Agreement", with MD5 checksum bc827a07eb93611d793ddb7c75083c00. - -I furthermore declare that I am authorized and able to make this agreement and sign this declaration. - -Signed, - -John Doe https://github.com/johndoe diff --git a/deploy_rsa.enc b/deploy_rsa.enc deleted file mode 100644 index 313c09926672b10123707af3988faee539bea434..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3248 zcmV;h3{Ue?FLkWP*X31F_eG&oa<<9sf>?g=G)ZMD160h8b{lY=H=opDpQnxC5n@?3iG5bY^%AvS!b@}@Z7{2pBb$D>SV3LM z4{s8ItncM%b4~PptHRByhR@xrXjQBapR&rpvE#e1M^>!}3SGFA5j724y7I*&T(%M} zLHITpF$zYF`LaNBjxUCPUI|S;j-iS`uH-@zhaTL?iFWAEpzv?3$B`&LQIl8(4LigvM_ zI@XL?&kO`RnVRM0SQ}0&>o`xzeF>R!dnv_d5$~6RWxIqsZ1o?ALLz}oNU>s+I_-wK# zYkSBXAdN}1y*UkH2|@!h?eRdNNlpc==4Ed5p7S?+duIT5U|N$1HF#CmK^?vCJ={Y) z5|O0TXMByd<@(iVWxDAl!kk{Uo_)UCbA_2Ap1{y3VLbD+?`XwLn}4f z|HuF?n~o3muwzFOX8(S=#7pQ@McL~hC8{&l*sgL}b}((f`&=S;CD7%}Lxg>&Ta2*d zT`(Y1=l3owmj!yL{33l4`X}ncz{0XF0h)C-uRzfa)W(){RhbJZZxGSWX!YX%*|1Bj zeffhnAVx;#t==(-(Avl6(*`3GV1F1ezNeF2_9Xb-;ZOC)3pSgB^Vc0c7!< z(fQ!=k-pv95R|vRNX+oxuA`~PgX6HKA6Dr!F(pPfk`?KFgf6R3$;aZ1lEe1n`*N;v zu7yb^rMU-g>~9y_v`lGkN_9gG>6t-#6wo)3zu3bk;sf8^o7ho%?E}Xq zSD2VqSjHAW1$#`|Fk?V=YHwlhqiC(%bYgL1u~#X(OsF@vHJ^~sh%fA5V>DwRrQt$} zd4g3Q(6d(r1+Lb;TpWfQ|ZgC_zRDW_QiwwmiI zW@5*M75S=?pxs=K+G12 zMo$@3A2ytB8ac{jJ?S%4Aci04Fqa}BG=ux*Y(CJ+muG{q27^c|!9+~VZ{ufj|%}tb}zL4CcVmyrbTrRhtk4E=M-EVZd zgexaHG(d6Z@0f+-BY+q&kTc?Hd3OKERg(_5shaK16}FEdZium}^Q!O=;`wul@Yr98z-{s7 z1JZuex(r^WR+}?=BTRcZ6~@~-U;YO_jrwS$Ne_7``lHKMM{u3|*nWtp`Ty=DT7Y16 z%@{4m79cF5kNgRK{DVPqZZC7rUD-4Y73==6sOY>|v|IRQF2YUR{q2I;R0tt$jd$bxa=Iq)nQvc8Et;Hovl+d2l$SaFYDrGp48^ zTwD(>2h)jAyv-EWtGYu9?ptg!%7X&jLA`y?l9u~dfxJo(dA%2C541%T73O0mKD?zS z^_zs&OF*npIes0h3$?P=VbbEs6Iv}+sylXMxJ<)??>P%Z_@}^cb;}$;ofT6IEclAAS3M)PGP>$AWD)&UhZL!gxS^rk8k; z6E~@&FldT+SPRCDK3a+Tp zz`)OYHLF$jd zPeg~m>1%(!07jibxgaMS(yz%!SON!5Fxl6e+EwW)k2!hd1`?0-g0@tqeqj$bijxli z$#t_wc52r`*Kr5GrAsH$)-*bc@H1%9!uZcPEu_FCiQd<)#mTKdjO}_{?gn3K;cw?n z#EOqx0Q8)7MO$%AFM;meHZ{ zi$XkxbUl^@bfzqg(J?TB%YuYv-zDB&YlsQ%);iiwzQd%&fjYLJ`r5;VBh`dGRc;Pp5;=Xz}!#LOvH zpH}MD5Z>g$cD@QFvoQB#-v=ri4~29Co7!L@+d;zB2n(Au=?IaduB{mn1iusX&dor?R{%@y-o_Q z`0vZsx--YC_kTOK17!LRt3p^IVP*JFeY1IauO=i`$3RnF7}R*M)mXC22_@rygFT1# z*nql3&HuKC^0N=$$bT1`6^9-%pxSf92Uz6;68rr@_7|esd#6li?nWd=1XyUQ#Gb;U zxw^;k%Lqr0CUGk`jgzLIWDfI9y1&#?Fl$Q{qP77{4O95_9dj&Fd(BjlB zVp-*wdWXjd%b^ypz$XD|U~GZQE~=QF=h@80A)eHWWz=Ts$KX6B#WjHTid)_G#w>gr zf22++Z^x6OY<%aKaF= 1.7.12.2, \ - $(eval $(call SetupHostCommand,file,Please install the 'file' package, \ - file --version 2>&1 | grep file)) - --$(eval $(call SetupHostCommand,rsync,Please install 'rsync', \ -- rsync --version &1 | tee $(BUILD_LOG_DIR)/$(1)$(if $(4),/$(4))/$(if $(3),$(3)-)$(2).txt) - diff --git a/patches/images.patch b/patches/images.patch deleted file mode 100644 index 392145d8..00000000 --- a/patches/images.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/config/Config-images.in.orig 2019-05-28 14:40:45.246749741 +0200 -+++ b/config/Config-images.in 2019-05-28 14:41:14.866378695 +0200 -@@ -251,6 +251,13 @@ - select TARGET_IMAGES_PAD - select PACKAGE_kmod-e1000 - -+ config VHDX_IMAGES -+ bool "Build Hyper-V image files (VHDX)" -+ depends on TARGET_x86 -+ select GRUB_IMAGES -+ select TARGET_IMAGES_PAD -+ select PACKAGE_kmod-e1000 -+ - config TARGET_IMAGES_PAD - bool "Pad images to filesystem size (for JFFS2)" - depends on GRUB_IMAGES ---- a/target/linux/x86/image/Makefile.orig 2019-06-03 14:32:39.094356089 +0200 -+++ b/target/linux/x86/image/Makefile 2019-06-03 19:04:23.875965073 +0200 -@@ -143,6 +143,15 @@ - endef - endif - -+ifneq ($(CONFIG_VHDX_IMAGES),) -+ define Image/Build/vhdx -+ rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vhdx || true -+ qemu-img convert -f raw -O vhdx \ -+ $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ -+ $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vhdx -+ endef -+endif -+ - define Image/Build/gzip - gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img - gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img -@@ -175,6 +184,7 @@ - $(call Image/Build/grub2,$(1)) - $(call Image/Build/vdi,$(1)) - $(call Image/Build/vmdk,$(1)) -+ $(call Image/Build/vhdx,$(1)) - $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img - else - $(CP) $(KDIR)/root.iso $(BIN_DIR)/$(IMG_PREFIX).iso diff --git a/patches/ipt-nat6.patch b/patches/ipt-nat6.patch deleted file mode 100644 index f3006a91..00000000 --- a/patches/ipt-nat6.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/package/kernel/linux/modules/netfilter.mk 2020-03-20 15:41:58.620893747 +0100 -+++ b/package/kernel/linux/modules/netfilter.mk 2020-03-20 15:45:34.389015301 +0100 -@@ -483,8 +483,10 @@ - define KernelPackage/ipt-nat6 - TITLE:=IPv6 NAT targets - DEPENDS:=@IPV6 - KCONFIG:=$(KCONFIG_IPT_NAT6) -- FILES:=$(foreach mod,$(IPT_NAT6-m),$(LINUX_DIR)/net/$(mod).ko) -+ FILES:= \ -+ $(LINUX_DIR)/net/ipv6/netfilter/ip6t_NPT.ko \ -+ $(LINUX_DIR)/net/ipv6/netfilter/ip6table_nat.ko - AUTOLOAD:=$(call AutoLoad,43,$(notdir $(IPT_NAT6-m))) - $(call AddDepends/ipt,+kmod-nf-nat6) - $(call AddDepends/ipt,+kmod-ipt-conntrack) diff --git a/patches/luci-occitan.patch b/patches/luci-occitan.patch deleted file mode 100644 index 8d3355e2..00000000 --- a/patches/luci-occitan.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/feeds/luci/luci.mk 2020-10-13 09:58:19.887513368 +0200 -+++ b/feeds/luci/luci.mk 2020-10-13 09:04:51.724277184 +0200 -@@ -34,6 +34,7 @@ - LUCI_LANG.ms=Bahasa Melayu (Malay) - LUCI_LANG.nb_NO=Norsk (Norwegian) - LUCI_LANG.nl=Nederlands (Dutch) -+LUCI_LANG.oc=Occitan - LUCI_LANG.pl=Polski (Polish) - LUCI_LANG.pt_BR=Português do Brasil (Brazilian Portuguese) - LUCI_LANG.pt=Português (Portuguese) diff --git a/patches/nanqinlang.patch b/patches/nanqinlang.patch deleted file mode 100644 index 9cc3fc3d..00000000 --- a/patches/nanqinlang.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/package/kernel/linux/modules/netsupport.mk 2019-12-18 18:31:28.865626571 +0100 -+++ b/package/kernel/linux/modules/netsupport.mk 2019-12-18 18:33:31.175524777 +0100 -@@ -962,6 +962,25 @@ - - $(eval $(call KernelPackage,tcp-bbr)) - -+define KernelPackage/tcp-nanqinlang -+ SUBMENU:=$(NETWORK_SUPPORT_MENU) -+ TITLE:=BBR NANQINLANG TCP congestion control -+ DEPENDS:=+LINUX_4_9:kmod-sched -+ KCONFIG:= \ -+ CONFIG_TCP_CONG_ADVANCED=y \ -+ CONFIG_TCP_CONG_NANQINLANG -+ FILES:=$(LINUX_DIR)/net/ipv4/tcp_nanqinlang.ko -+ AUTOLOAD:=$(call AutoLoad,74,tcp_nanqinlang) -+endef -+ -+define KernelPackage/tcp-nanqinlang/description -+ Kernel module for BBR (Bottleneck Bandwidth and RTT) TCP congestion -+ control. It requires the fq ("Fair Queue") pacing packet scheduler. -+ For kernel 4.13+, TCP internal pacing is implemented as fallback. -+endef -+ -+$(eval $(call KernelPackage,tcp-nanqinlang)) -+ - - define KernelPackage/ax25 - SUBMENU:=$(NETWORK_SUPPORT_MENU) diff --git a/patches/nocheck.patch b/patches/nocheck.patch deleted file mode 100644 index e4290aab..00000000 --- a/patches/nocheck.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/include/package-ipkg.mk.1 2019-06-02 10:10:48.814882668 +0200 -+++ b/include/package-ipkg.mk 2019-06-02 10:08:20.372736726 +0200 -@@ -79,7 +79,6 @@ - if [ -f "$(PKG_INFO_DIR)/$(1).missing" ]; then \ - echo "Package $(1) is missing dependencies for the following libraries:" >&2; \ - cat "$(PKG_INFO_DIR)/$(1).missing" >&2; \ -- false; \ - fi; \ - ) - endef diff --git a/patches/package-too-long.patch b/patches/package-too-long.patch deleted file mode 100644 index 00d7afce..00000000 --- a/patches/package-too-long.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/package/Makefile 2020-04-04 15:52:15.706831084 +0200 -+++ b/package/Makefile 2020-04-04 15:53:54.645052663 +0200 -@@ -66,7 +66,7 @@ - rm -rf $(TARGET_DIR) $(TARGET_DIR_ORIG) - mkdir -p $(TARGET_DIR)/tmp - $(call opkg,$(TARGET_DIR)) install \ -- $(call opkg_package_files,$(foreach pkg,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null),$(pkg)$(call GetABISuffix,$(pkg)))) -+ $(subst $(TOPDIR)/,,$(call opkg_package_files,$(foreach pkg,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null),$(pkg)$(call GetABISuffix,$(pkg))))) - @for file in $(PACKAGE_INSTALL_FILES); do \ - [ -s $$file.flags ] || continue; \ - for flag in `cat $$file.flags`; do \ diff --git a/patches/smsc75xx.patch b/patches/smsc75xx.patch deleted file mode 100644 index e08dab97..00000000 --- a/patches/smsc75xx.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: package/kernel/linux/modules/usb.mk -=================================================================== ---- a/package/kernel/linux/modules/usb.mk (revisione 42462) -+++ b/package/kernel/linux/modules/usb.mk (copia locale) -@@ -1091,8 +1091,21 @@ - endef - - $(eval $(call KernelPackage,usb-net-smsc95xx)) -+ -+define KernelPackage/usb-net-smsc75xx -+ TITLE:=SMSC LAN75XX based USB 2.0 Gigabit ethernet devices -+ KCONFIG:=CONFIG_USB_NET_SMSC75XX -+ FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/smsc75xx.ko -+ AUTOLOAD:=$(call AutoProbe,smsc75xx) -+ $(call AddDepends/usb-net, +kmod-lib-crc16) -+endef - -+define KernelPackage/usb-net-smsc75xx/description -+ Kernel module for SMSC LAN75XX based devices -+endef - -+$(eval $(call KernelPackage,usb-net-smsc75xx)) -+ - define KernelPackage/usb-net-dm9601-ether - TITLE:=Support for DM9601 ethernet connections - KCONFIG:=CONFIG_USB_NET_DM9601 diff --git a/patches/uefi.patch b/patches/uefi.patch deleted file mode 100644 index 794d6578..00000000 --- a/patches/uefi.patch +++ /dev/null @@ -1,1323 +0,0 @@ -From 964f624954b5e4ea83a4f05a57d79a6af6836d13 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E6=9D=8E=E5=9B=BD?= -Date: Thu, 4 Apr 2019 02:40:15 +0000 -Subject: [PATCH 1/8] firmware-utils: ptgen: add GPT support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add GPT support to ptgen, so we can generate EFI bootable images. - -Introduced two options: - -g generate GPT partition table - -G GUID use GUID for disk and increase last bit for all partitions - -We drop The alternate partition table to reduce size, This may cause -problems when generate vmdk images or vdi images. We must pad enough -sectors when generate these images. - -Signed-off-by: 李国 ---- - tools/firmware-utils/Makefile | 2 +- - tools/firmware-utils/src/ptgen.c | 337 ++++++++++++++++++++++++++++--- - 2 files changed, 314 insertions(+), 25 deletions(-) - -diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile -index 97c89eec279..561d6d868fe 100644 ---- a/tools/firmware-utils/Makefile -+++ b/tools/firmware-utils/Makefile -@@ -32,7 +32,7 @@ define Host/Compile - $(call cc,dgfirmware) - $(call cc,mksenaofw md5, -Wall --std=gnu99) - $(call cc,trx2usr) -- $(call cc,ptgen) -+ $(call cc,ptgen cyg_crc32) - $(call cc,srec2bin) - $(call cc,mkmylofw) - $(call cc,mkcsysimg) -diff --git a/tools/firmware-utils/src/ptgen.c b/tools/firmware-utils/src/ptgen.c -index 0192bb65e51..caee0f94190 100644 ---- a/tools/firmware-utils/src/ptgen.c -+++ b/tools/firmware-utils/src/ptgen.c -@@ -31,15 +31,62 @@ - #include - #include - #include -+#include -+#include "cyg_crc.h" - - #if __BYTE_ORDER == __BIG_ENDIAN -+#define cpu_to_le16(x) bswap_16(x) - #define cpu_to_le32(x) bswap_32(x) -+#define cpu_to_le64(x) bswap_64(x) - #elif __BYTE_ORDER == __LITTLE_ENDIAN -+#define cpu_to_le16(x) (x) - #define cpu_to_le32(x) (x) -+#define cpu_to_le64(x) (x) - #else - #error unknown endianness! - #endif - -+#define swap(a, b) \ -+ do { typeof(a) __tmp = (a); (a) = (b); (b) = __tmp; } while (0) -+ -+#ifndef GUID_INIT -+typedef uuid_le guid_t; -+#define GUID_INIT(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \ -+ UUID_LE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) -+#endif -+ -+#define GUID_STRING_LENGTH 36 -+ -+#define GPT_SIGNATURE 0x5452415020494645ULL -+#define GPT_REVISION 0x00010000 -+ -+#define GUID_PARTITION_SYSTEM \ -+ GUID_INIT( 0xC12A7328, 0xF81F, 0x11d2, \ -+ 0xBA, 0x4B, 0x00, 0xA0, 0xC9, 0x3E, 0xC9, 0x3B) -+ -+#define GUID_PARTITION_BASIC_DATA \ -+ GUID_INIT( 0xEBD0A0A2, 0xB9E5, 0x4433, \ -+ 0x87, 0xC0, 0x68, 0xB6, 0xB7, 0x26, 0x99, 0xC7) -+ -+#define GUID_PARTITION_BIOS_BOOT \ -+ GUID_INIT( 0x21686148, 0x6449, 0x6E6F, \ -+ 0x74, 0x4E, 0x65, 0x65, 0x64, 0x45, 0x46, 0x49) -+ -+#define GPT_HEADER_SIZE 92 -+#define GPT_ENTRY_SIZE 128 -+#define GPT_ENTRY_MAX 128 -+#define GPT_ENTRY_NAME_SIZE 72 -+ -+#define GPT_HEADER_SECTOR 1 -+#define GPT_FIRST_ENTRY_SECTOR 2 -+ -+#define MBR_ENTRY_MAX 4 -+#define MBR_DISK_SIGNATURE_OFFSET 440 -+#define MBR_PARTITION_ENTRY_OFFSET 446 -+#define MBR_BOOT_SIGNATURE_OFFSET 510 -+ -+#define DISK_SECTOR_SIZE 512 -+ - /* Partition table entry */ - struct pte { - uint8_t active; -@@ -55,13 +102,43 @@ struct partinfo { - int type; - }; - -+/* GPT Partition table header */ -+struct gpth { -+ uint64_t signature; -+ uint32_t revision; -+ uint32_t size; -+ uint32_t crc32; -+ uint32_t reserved; -+ uint64_t self; -+ uint64_t alternate; -+ uint64_t first_usable; -+ uint64_t last_usable; -+ guid_t disk_guid; -+ uint64_t first_entry; -+ uint32_t entry_num; -+ uint32_t entry_size; -+ uint32_t entry_crc32; -+} __attribute__((packed)); -+ -+/* GPT Partition table entry */ -+struct gpte { -+ guid_t type; -+ guid_t guid; -+ uint64_t start; -+ uint64_t end; -+ uint64_t attr; -+ uint16_t name[GPT_ENTRY_NAME_SIZE / sizeof(uint16_t)]; -+} __attribute__((packed)); -+ -+ - int verbose = 0; - int active = 1; - int heads = -1; - int sectors = -1; - int kb_align = 0; - bool ignore_null_sized_partition = false; --struct partinfo parts[4]; -+bool use_guid_partition_table = false; -+struct partinfo parts[GPT_ENTRY_MAX]; - char *filename = NULL; - - -@@ -91,7 +168,7 @@ static long to_kbytes(const char *string) - end++; - - if (*end) { -- fprintf(stderr, "garbage after end of number\n"); -+ fputs("garbage after end of number\n", stderr); - return 0; - } - -@@ -132,20 +209,73 @@ static inline unsigned long round_to_kb(long sect) { - return ((sect - 1) / kb_align + 1) * kb_align; - } - -+/* Compute a CRC for guid partition table */ -+static inline unsigned long gpt_crc32(void *buf, unsigned long len) -+{ -+ return cyg_crc32_accumulate(~0L, buf, len) ^ ~0L; -+} -+ -+/* Parse a guid string to guid_t struct */ -+static inline int guid_parse(char *buf, guid_t *guid) -+{ -+ char b[4] = {0}; -+ char *p = buf; -+ unsigned i = 0; -+ if (strnlen(buf, GUID_STRING_LENGTH) != GUID_STRING_LENGTH) -+ return -1; -+ for (i = 0; i < sizeof(guid_t); i++) { -+ if (*p == '-') -+ p++; -+ if (*p == '\0') -+ return -1; -+ memcpy(b, p, 2); -+ guid->b[i] = strtol(b, 0, 16); -+ p += 2; -+ } -+ swap(guid->b[0], guid->b[3]); -+ swap(guid->b[1], guid->b[2]); -+ swap(guid->b[4], guid->b[5]); -+ swap(guid->b[6], guid->b[7]); -+ return 0; -+} -+ -+/* init an utf-16 string from utf-8 string */ -+static inline void init_utf16(char *str, uint16_t *buf, unsigned bufsize) -+{ -+ unsigned i, n = 0; -+ for (i = 0; i < bufsize; i++) { -+ if (str[n] == 0x00) { -+ buf[i] = 0x00; -+ return ; -+ } else if ((str[n] & 0x80) == 0x00) {//0xxxxxxx -+ buf[i] = cpu_to_le16(str[n++]); -+ } else if ((str[n] & 0xE0) == 0xC0) {//110xxxxx -+ buf[i] = cpu_to_le16((str[n] & 0x1F) << 6 | str[n + 1] & 0x3F); -+ n += 2; -+ } else if ((str[n] & 0xF0) == 0xE0) {//1110xxxx -+ buf[i] = cpu_to_le16((str[n] & 0x0F) << 12 | (str[n + 1] & 0x3F) << 6 | str[n + 2] & 0x3F); -+ n += 3; -+ } else { -+ buf[i] = cpu_to_le16('?'); -+ n++; -+ } -+ } -+} -+ - /* check the partition sizes and write the partition table */ - static int gen_ptable(uint32_t signature, int nr) - { -- struct pte pte[4]; -- unsigned long sect = 0; -- int i, fd, ret = -1, start, len; -+ struct pte pte[MBR_ENTRY_MAX]; -+ unsigned long start, len, sect = 0; -+ int i, fd, ret = -1; - -- memset(pte, 0, sizeof(struct pte) * 4); -+ memset(pte, 0, sizeof(struct pte) * MBR_ENTRY_MAX); - for (i = 0; i < nr; i++) { - if (!parts[i].size) { - if (ignore_null_sized_partition) - continue; - fprintf(stderr, "Invalid size in partition %d!\n", i); -- return -1; -+ return ret; - } - - pte[i].active = ((i + 1) == active) ? 0x80 : 0; -@@ -165,30 +295,34 @@ static int gen_ptable(uint32_t signature, int nr) - to_chs(start + len - 1, pte[i].chs_end); - - if (verbose) -- fprintf(stderr, "Partition %d: start=%ld, end=%ld, size=%ld\n", i, (long)start * 512, ((long)start + (long)len) * 512, (long)len * 512); -- printf("%ld\n", (long)start * 512); -- printf("%ld\n", (long)len * 512); -+ fprintf(stderr, "Partition %d: start=%ld, end=%ld, size=%ld\n", -+ i, -+ (long)start * DISK_SECTOR_SIZE, -+ (long)(start + len) * DISK_SECTOR_SIZE, -+ (long)len * DISK_SECTOR_SIZE); -+ printf("%ld\n", (long)start * DISK_SECTOR_SIZE); -+ printf("%ld\n", (long)len * DISK_SECTOR_SIZE); - } - - if ((fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, 0644)) < 0) { - fprintf(stderr, "Can't open output file '%s'\n",filename); -- return -1; -+ return ret; - } - -- lseek(fd, 440, SEEK_SET); -+ lseek(fd, MBR_DISK_SIGNATURE_OFFSET, SEEK_SET); - if (write(fd, &signature, sizeof(signature)) != sizeof(signature)) { -- fprintf(stderr, "write failed.\n"); -+ fputs("write failed.\n", stderr); - goto fail; - } - -- lseek(fd, 446, SEEK_SET); -- if (write(fd, pte, sizeof(struct pte) * 4) != sizeof(struct pte) * 4) { -- fprintf(stderr, "write failed.\n"); -+ lseek(fd, MBR_PARTITION_ENTRY_OFFSET, SEEK_SET); -+ if (write(fd, pte, sizeof(struct pte) * MBR_ENTRY_MAX) != sizeof(struct pte) * MBR_ENTRY_MAX) { -+ fputs("write failed.\n", stderr); - goto fail; - } -- lseek(fd, 510, SEEK_SET); -+ lseek(fd, MBR_BOOT_SIGNATURE_OFFSET, SEEK_SET); - if (write(fd, "\x55\xaa", 2) != 2) { -- fprintf(stderr, "write failed.\n"); -+ fputs("write failed.\n", stderr); - goto fail; - } - -@@ -198,20 +332,162 @@ static int gen_ptable(uint32_t signature, int nr) - return ret; - } - -+/* check the partition sizes and write the guid partition table */ -+static int gen_gptable(uint32_t signature, guid_t guid, unsigned nr) -+{ -+ struct pte pte; -+ struct gpth gpth = { -+ .signature = cpu_to_le64(GPT_SIGNATURE), -+ .revision = cpu_to_le32(GPT_REVISION), -+ .size = cpu_to_le32(GPT_HEADER_SIZE), -+ .self = cpu_to_le64(GPT_HEADER_SECTOR), -+ .first_usable = cpu_to_le64(GPT_FIRST_ENTRY_SECTOR + GPT_ENTRY_SIZE * GPT_ENTRY_MAX / DISK_SECTOR_SIZE), -+ .first_entry = cpu_to_le64(GPT_FIRST_ENTRY_SECTOR), -+ .disk_guid = guid, -+ .entry_num = cpu_to_le32(GPT_ENTRY_MAX), -+ .entry_size = cpu_to_le32(GPT_ENTRY_SIZE), -+ }; -+ struct gpte gpte[GPT_ENTRY_MAX]; -+ uint64_t start, end, sect = 0; -+ int fd, ret = -1; -+ unsigned i; -+ -+ memset(gpte, 0, GPT_ENTRY_SIZE * GPT_ENTRY_MAX); -+ for (i = 0; i < nr; i++) { -+ if (!parts[i].size) { -+ if (ignore_null_sized_partition) -+ continue; -+ fprintf(stderr, "Invalid size in partition %d!\n", i); -+ return ret; -+ } -+ start = sect + sectors; -+ if (kb_align != 0) -+ start = round_to_kb(start); -+ gpte[i].start = cpu_to_le64(start); -+ -+ sect = start + parts[i].size * 2; -+ if (kb_align == 0) -+ sect = round_to_cyl(sect); -+ gpte[i].end = cpu_to_le64(sect -1); -+ gpte[i].guid = guid; -+ gpte[i].guid.b[sizeof(guid_t) -1] += i + 1; -+ if (parts[i].type == 0xEF || (i + 1) == active) { -+ gpte[i].type = GUID_PARTITION_SYSTEM; -+ init_utf16("EFI System Partition", gpte[i].name, GPT_ENTRY_NAME_SIZE / sizeof(uint16_t)); -+ } else { -+ gpte[i].type = GUID_PARTITION_BASIC_DATA; -+ } -+ -+ if (verbose) -+ fprintf(stderr, "Partition %d: start=%lld, end=%lld, size=%lld\n", -+ i, -+ start * DISK_SECTOR_SIZE, sect * DISK_SECTOR_SIZE, -+ (sect - start) * DISK_SECTOR_SIZE); -+ printf("%lld\n", start * DISK_SECTOR_SIZE); -+ printf("%lld\n", (sect - start) * DISK_SECTOR_SIZE); -+ } -+ -+ gpte[GPT_ENTRY_MAX - 1].start = cpu_to_le64(GPT_FIRST_ENTRY_SECTOR + GPT_ENTRY_SIZE * GPT_ENTRY_MAX / DISK_SECTOR_SIZE); -+ gpte[GPT_ENTRY_MAX - 1].end = cpu_to_le64((kb_align ? round_to_kb(sectors) : sectors) - 1); -+ gpte[GPT_ENTRY_MAX - 1].type = GUID_PARTITION_BIOS_BOOT; -+ gpte[GPT_ENTRY_MAX - 1].guid = guid; -+ gpte[GPT_ENTRY_MAX - 1].guid.b[sizeof(guid_t) -1] += GPT_ENTRY_MAX; -+ -+ end = sect + sectors - 1; -+ -+ pte.type = 0xEE; -+ pte.start = cpu_to_le32(GPT_HEADER_SECTOR); -+ pte.length = cpu_to_le32(end); -+ to_chs(GPT_HEADER_SECTOR, pte.chs_start); -+ to_chs(end, pte.chs_end); -+ -+ gpth.last_usable = cpu_to_le64(end - GPT_ENTRY_SIZE * GPT_ENTRY_MAX / DISK_SECTOR_SIZE - 1); -+ gpth.alternate = cpu_to_le64(end); -+ gpth.entry_crc32 = cpu_to_le32(gpt_crc32(gpte, GPT_ENTRY_SIZE * GPT_ENTRY_MAX)); -+ gpth.crc32 = cpu_to_le32(gpt_crc32((char *)&gpth, GPT_HEADER_SIZE)); -+ -+ if ((fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, 0644)) < 0) { -+ fprintf(stderr, "Can't open output file '%s'\n",filename); -+ return ret; -+ } -+ -+ lseek(fd, MBR_DISK_SIGNATURE_OFFSET, SEEK_SET); -+ if (write(fd, &signature, sizeof(signature)) != sizeof(signature)) { -+ fputs("write failed.\n", stderr); -+ goto fail; -+ } -+ -+ lseek(fd, MBR_PARTITION_ENTRY_OFFSET, SEEK_SET); -+ if (write(fd, &pte, sizeof(struct pte)) != sizeof(struct pte)) { -+ fputs("write failed.\n", stderr); -+ goto fail; -+ } -+ -+ lseek(fd, MBR_BOOT_SIGNATURE_OFFSET, SEEK_SET); -+ if (write(fd, "\x55\xaa", 2) != 2) { -+ fputs("write failed.\n", stderr); -+ goto fail; -+ } -+ -+ //lseek(fd, GPT_HEADER_SECTOR * DISK_SECTOR_SIZE, SEEK_SET); -+ if (write(fd, &gpth, GPT_HEADER_SIZE) != GPT_HEADER_SIZE) { -+ fputs("write failed.\n", stderr); -+ goto fail; -+ } -+ -+ lseek(fd, GPT_FIRST_ENTRY_SECTOR * DISK_SECTOR_SIZE, SEEK_SET); -+ if (write(fd, &gpte, GPT_ENTRY_SIZE * GPT_ENTRY_MAX) != GPT_ENTRY_SIZE * GPT_ENTRY_MAX) { -+ fputs("write failed.\n", stderr); -+ goto fail; -+ } -+ -+#if 0 -+ /* The alternate partition table (We omit it) */ -+ swap(gpth.self, gpth.alternate); -+ gpth.first_entry = cpu_to_le64(end - GPT_ENTRY_SIZE * GPT_ENTRY_MAX / DISK_SECTOR_SIZE), -+ gpth.crc32 = 0; -+ gpth.crc32 = cpu_to_le32(gpt_crc32(&gpth, GPT_HEADER_SIZE)); -+ -+ lseek(fd, end * DISK_SECTOR_SIZE - GPT_ENTRY_SIZE * GPT_ENTRY_MAX, SEEK_SET); -+ if (write(fd, &gpte, GPT_ENTRY_SIZE * GPT_ENTRY_MAX) != GPT_ENTRY_SIZE * GPT_ENTRY_MAX) { -+ fputs("write failed.\n", stderr); -+ goto fail; -+ } -+ -+ lseek(fd, end * DISK_SECTOR_SIZE, SEEK_SET); -+ if (write(fd, &gpth, GPT_HEADER_SIZE) != GPT_HEADER_SIZE) { -+ fputs("write failed.\n", stderr); -+ goto fail; -+ } -+ lseek(fd, (end + 1) * DISK_SECTOR_SIZE -1, SEEK_SET); -+ if (write(fd, "\x00", 1) != 1) { -+ fputs("write failed.\n", stderr); -+ goto fail; -+ } -+#endif -+ -+ ret = 0; -+fail: -+ close(fd); -+ return ret; -+} -+ - static void usage(char *prog) - { -- fprintf(stderr, "Usage: %s [-v] [-n] -h -s -o [-a 0..4] [-l ] [[-t ] -p ...] \n", prog); -+ fprintf(stderr, "Usage: %s [-v] [-n] [-g] -h -s -o [-a 0..4] [-l ] [-G ] [[-t ] -p ...] \n", prog); - exit(EXIT_FAILURE); - } - - int main (int argc, char **argv) - { -- char type = 0x83; -+ unsigned char type = 0x83; - int ch; - int part = 0; - uint32_t signature = 0x5452574F; /* 'OWRT' */ -+ guid_t guid = GUID_INIT( signature, 0x2211, 0x4433, \ -+ 0x55, 0x66, 0x77, 0x88, 0x99, 0xAA, 0xBB, 0x00); - -- while ((ch = getopt(argc, argv, "h:s:p:a:t:o:vnl:S:")) != -1) { -+ while ((ch = getopt(argc, argv, "h:s:p:a:t:o:vngl:S:G:")) != -1) { - switch (ch) { - case 'o': - filename = optarg; -@@ -222,6 +498,9 @@ int main (int argc, char **argv) - case 'n': - ignore_null_sized_partition = true; - break; -+ case 'g': -+ use_guid_partition_table = 1; -+ break; - case 'h': - heads = (int)strtoul(optarg, NULL, 0); - break; -@@ -229,8 +508,8 @@ int main (int argc, char **argv) - sectors = (int)strtoul(optarg, NULL, 0); - break; - case 'p': -- if (part > 3) { -- fprintf(stderr, "Too many partitions\n"); -+ if (part > GPT_ENTRY_MAX - 1 || (!use_guid_partition_table && part > 3)) { -+ fputs("Too many partitions\n", stderr); - exit(EXIT_FAILURE); - } - parts[part].size = to_kbytes(optarg); -@@ -250,6 +529,12 @@ int main (int argc, char **argv) - case 'S': - signature = strtoul(optarg, NULL, 0); - break; -+ case 'G': -+ if (guid_parse(optarg, &guid)) { -+ fputs("Invalid guid string\n", stderr); -+ exit(EXIT_FAILURE); -+ } -+ break; - case '?': - default: - usage(argv[0]); -@@ -259,5 +544,9 @@ int main (int argc, char **argv) - if (argc || (heads <= 0) || (sectors <= 0) || !filename) - usage(argv[0]); - -- return gen_ptable(signature, part) ? EXIT_FAILURE : EXIT_SUCCESS; -+ if (use_guid_partition_table) { -+ return gen_gptable(signature, guid, part) ? EXIT_FAILURE : EXIT_SUCCESS; -+ } else { -+ return gen_ptable(signature, part) ? EXIT_FAILURE : EXIT_SUCCESS; -+ } - } - -From c634da575c221e6a340884219d78978f56f23976 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E6=9D=8E=E5=9B=BD?= -Date: Thu, 4 Apr 2019 03:17:01 +0000 -Subject: [PATCH 2/8] grub2: split to grub2 and grub2-efi packages -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -EFI bootable images need grub2 host packages with efi platform, -but grub2 can not build efi platform and pc platform together, -so we split it to grub2 and grub2-efi packages. - -Signed-off-by: 李国 ---- - package/boot/grub2/common.mk | 54 +++++++++++++++++++++++++ - package/boot/grub2/grub2-efi/Makefile | 19 +++++++++ - package/boot/grub2/{ => grub2}/Makefile | 50 +---------------------- - 3 files changed, 75 insertions(+), 48 deletions(-) - create mode 100644 package/boot/grub2/common.mk - create mode 100644 package/boot/grub2/grub2-efi/Makefile - rename package/boot/grub2/{ => grub2}/Makefile (66%) - -diff --git a/package/boot/grub2/common.mk b/package/boot/grub2/common.mk -new file mode 100644 -index 00000000000..53ee26552f8 ---- /dev/null -+++ b/package/boot/grub2/common.mk -@@ -0,0 +1,54 @@ -+# -+# Copyright (C) 2006-2015 OpenWrt.org -+# -+# This is free software, licensed under the GNU General Public License v2. -+# See /LICENSE for more information. -+# -+ -+include $(TOPDIR)/rules.mk -+include $(INCLUDE_DIR)/kernel.mk -+ -+PKG_NAME:=grub -+PKG_CPE_ID:=cpe:/a:gnu:grub2 -+PKG_VERSION:=2.04 -+PKG_RELEASE:=2 -+ -+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -+PKG_SOURCE_URL:=@GNU/grub -+PKG_HASH:=e5292496995ad42dabe843a0192cf2a2c502e7ffcc7479398232b10a472df77d -+ -+HOST_BUILD_PARALLEL:=1 -+ -+PKG_SSP:=0 -+ -+PKG_FLAGS:=nonshared -+ -+PATCH_DIR:=../patches -+ -+HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)-$(GRUB_PLATFORM)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) -+HOST_BUILD_PREFIX := $(STAGING_DIR_HOST) -+ -+include $(INCLUDE_DIR)/host-build.mk -+include $(INCLUDE_DIR)/package.mk -+ -+ -+HOST_CONFIGURE_VARS += \ -+ grub_build_mkfont_excuse="don't want fonts" -+ -+HOST_CONFIGURE_ARGS += \ -+ --disable-grub-mkfont \ -+ --target=$(REAL_GNU_TARGET_NAME) \ -+ --sbindir="$(STAGING_DIR_HOST)/bin" \ -+ --disable-werror \ -+ --disable-libzfs \ -+ --disable-nls \ -+ --with-platform=$(GRUB_PLATFORM) -+ -+HOST_MAKE_FLAGS += \ -+ TARGET_RANLIB=$(TARGET_RANLIB) \ -+ LIBLZMA=$(STAGING_DIR_HOST)/lib/liblzma.a -+ -+define Host/Configure -+ $(SED) 's,(RANLIB),(TARGET_RANLIB),' $(HOST_BUILD_DIR)/grub-core/Makefile.in -+ $(Host/Configure/Default) -+endef -diff --git a/package/boot/grub2/grub2-efi/Makefile b/package/boot/grub2/grub2-efi/Makefile -new file mode 100644 -index 00000000000..2fc21fdb890 ---- /dev/null -+++ b/package/boot/grub2/grub2-efi/Makefile -@@ -0,0 +1,19 @@ -+GRUB_PLATFORM:=efi -+ -+PKG_BUILD_DEPENDS:=grub2-efi/host -+include ../common.mk -+ -+define Package/grub2-efi -+ CATEGORY:=Boot Loaders -+ SECTION:=boot -+ TITLE:=GRand Unified Bootloader(EFI) -+ URL:=http://www.gnu.org/software/grub/ -+ DEPENDS:=@TARGET_x86 -+endef -+ -+define Host/Install -+ $(call Host/Compile/Default,install-data) -+endef -+ -+$(eval $(call HostBuild)) -+$(eval $(call BuildPackage,grub2-efi)) -diff --git a/package/boot/grub2/Makefile b/package/boot/grub2/grub2/Makefile -similarity index 66% -rename from package/boot/grub2/Makefile -rename to package/boot/grub2/grub2/Makefile -index 980a6e372a3..7126beab4cf 100644 ---- a/package/boot/grub2/Makefile -+++ b/package/boot/grub2/grub2/Makefile -@@ -1,31 +1,7 @@ --# --# Copyright (C) 2006-2015 OpenWrt.org --# --# This is free software, licensed under the GNU General Public License v2. --# See /LICENSE for more information. --# -+GRUB_PLATFORM:=pc - --include $(TOPDIR)/rules.mk --include $(INCLUDE_DIR)/kernel.mk -- --PKG_NAME:=grub --PKG_CPE_ID:=cpe:/a:gnu:grub2 --PKG_VERSION:=2.04 --PKG_RELEASE:=1 -- --PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz --PKG_SOURCE_URL:=@GNU/grub --PKG_HASH:=e5292496995ad42dabe843a0192cf2a2c502e7ffcc7479398232b10a472df77d -- --HOST_BUILD_PARALLEL:=1 - PKG_BUILD_DEPENDS:=grub2/host -- --PKG_SSP:=0 -- --PKG_FLAGS:=nonshared -- --include $(INCLUDE_DIR)/host-build.mk --include $(INCLUDE_DIR)/package.mk -+include ../common.mk - - define Package/grub2 - CATEGORY:=Boot Loaders -@@ -48,8 +24,6 @@ define Package/grub2-editenv/description - Edit grub2 environment files. - endef - --HOST_BUILD_PREFIX := $(STAGING_DIR_HOST) -- - CONFIGURE_VARS += \ - grub_build_mkfont_excuse="don't want fonts" - -@@ -62,26 +36,6 @@ CONFIGURE_ARGS += \ - --disable-grub-mkfont \ - --with-platform=none - --HOST_CONFIGURE_VARS += \ -- grub_build_mkfont_excuse="don't want fonts" -- --HOST_CONFIGURE_ARGS += \ -- --disable-grub-mkfont \ -- --target=$(REAL_GNU_TARGET_NAME) \ -- --sbindir="$(STAGING_DIR_HOST)/bin" \ -- --disable-werror \ -- --disable-libzfs \ -- --disable-nls -- --HOST_MAKE_FLAGS += \ -- TARGET_RANLIB=$(TARGET_RANLIB) \ -- LIBLZMA=$(STAGING_DIR_HOST)/lib/liblzma.a -- --define Host/Configure -- $(SED) 's,(RANLIB),(TARGET_RANLIB),' $(HOST_BUILD_DIR)/grub-core/Makefile.in -- $(Host/Configure/Default) --endef -- - define Host/Install - $(call Host/Install/Default) - - -From 15212ac11ac95a57f75317fff83bb7d53b581a93 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E6=9D=8E=E5=9B=BD?= -Date: Thu, 4 Apr 2019 03:42:16 +0000 -Subject: [PATCH 3/8] x86: add EFI images and make iso images EFI bootable -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add EFI bootable images for x86 platforms. These images can also -boot from legacy BIOS. And iso images can boot from EFI now. - -EFI System Partition need to be fat12/fat16/fat32 (not need to load -filesystem drivers), so the first partition of EFI images are not ext4 -filesystem any more. - -GPT partition table has an alternate partition table, we did not -generate it. This may cause problems when use these images as qemu disk, -kernel can not find rootfs, we pad enough sectors will be ok. - -Signed-off-by: 李国 ---- - config/Config-images.in | 23 +++++++++++++------ - .../base-files/files/lib/upgrade/common.sh | 11 +++++++++ - scripts/gen_image_generic.sh | 10 ++++++-- - .../x86/base-files/lib/preinit/79_move_config | 6 +++-- - .../x86/base-files/lib/upgrade/platform.sh | 6 +++-- - target/linux/x86/generic/config-4.19 | 1 + - target/linux/x86/generic/config-5.4 | 1 + - target/linux/x86/image/Makefile | 3 +++ - target/linux/x86/image/grub-iso.cfg | 7 +++++- - 9 files changed, 54 insertions(+), 14 deletions(-) - -diff --git a/config/Config-images.in b/config/Config-images.in -index e4db0482ce2..16b575247ea 100644 ---- a/config/Config-images.in -+++ b/config/Config-images.in -@@ -188,19 +188,28 @@ menu "Target Images" - select PACKAGE_grub2 - default y - -+ config EFI_IMAGES -+ bool "Build EFI images (Linux x86 or x86_64 host only)" -+ depends on TARGET_x86 -+ depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS -+ select PACKAGE_grub2 -+ select PACKAGE_grub2-efi -+ select PACKAGE_kmod-fs-vfat -+ default n -+ - config GRUB_CONSOLE - bool "Use Console Terminal (in addition to Serial)" -- depends on GRUB_IMAGES -+ depends on GRUB_IMAGES || EFI_IMAGES - default y - - config GRUB_SERIAL - string "Serial port device" -- depends on GRUB_IMAGES -+ depends on GRUB_IMAGES || EFI_IMAGES - default "ttyS0" - - config GRUB_BAUDRATE - int "Serial port baud rate" -- depends on GRUB_IMAGES -+ depends on GRUB_IMAGES || EFI_IMAGES - default 38400 if TARGET_x86_generic - default 115200 - -@@ -211,20 +220,20 @@ menu "Target Images" - - config GRUB_BOOTOPTS - string "Extra kernel boot options" -- depends on GRUB_IMAGES -+ depends on GRUB_IMAGES || EFI_IMAGES - help - If you don't know, just leave it blank. - - config GRUB_TIMEOUT - string "Seconds to wait before booting the default entry" -- depends on GRUB_IMAGES -+ depends on GRUB_IMAGES || EFI_IMAGES - default "5" - help - If you don't know, 5 seconds is a reasonable default. - - config GRUB_TITLE - string "Title for the menu entry in GRUB" -- depends on GRUB_IMAGES -+ depends on GRUB_IMAGES || EFI_IMAGES - default "OpenWrt" - help - This is the title of the GRUB menu entry. -@@ -272,7 +281,7 @@ menu "Target Images" - - config TARGET_ROOTFS_PARTNAME - string "Root partition on target device" -- depends on GRUB_IMAGES -+ depends on GRUB_IMAGES || EFI_IMAGES - help - Override the root partition on the final device. If left empty, - it will be mounted by PARTUUID which makes the kernel find the -diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh -index a986cc0b5c7..6e967aeffe8 100644 ---- a/package/base-files/files/lib/upgrade/common.sh -+++ b/package/base-files/files/lib/upgrade/common.sh -@@ -136,6 +136,17 @@ export_bootdevice() { - fi - done - ;; -+ PARTUUID=????????-????-????-????-??????????02) -+ uuid="${rootpart#PARTUUID=}" -+ uuid="${uuid%02}00" -+ for disk in $(find /dev -type b); do -+ set -- $(dd if=$disk bs=1 skip=568 count=16 2>/dev/null | hexdump -v -e '8/1 "%02x "" "2/1 "%02x""-"6/1 "%02x"') -+ if [ "$4$3$2$1-$6$5-$8$7-$9" = "$uuid" ]; then -+ uevent="/sys/class/block/${disk##*/}/uevent" -+ break -+ fi -+ done -+ ;; - /dev/*) - uevent="/sys/class/block/${rootpart##*/}/../uevent" - ;; -diff --git a/scripts/gen_image_generic.sh b/scripts/gen_image_generic.sh -index 2c57d56f073..1df4d0673b3 100755 ---- a/scripts/gen_image_generic.sh -+++ b/scripts/gen_image_generic.sh -@@ -20,7 +20,7 @@ sect=63 - cyl=$(( (KERNELSIZE + ROOTFSSIZE) * 1024 * 1024 / (head * sect * 512))) - - # create partition table --set $(ptgen -o "$OUTPUT" -h $head -s $sect -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m ${ALIGN:+-l $ALIGN} ${SIGNATURE:+-S 0x$SIGNATURE}) -+set $(ptgen -o "$OUTPUT" -h $head -s $sect ${EFI_SIGNATURE:+-g} -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m ${ALIGN:+-l $ALIGN} ${SIGNATURE:+-S 0x$SIGNATURE} ${EFI_SIGNATURE:+-G $EFI_SIGNATURE}) - - KERNELOFFSET="$(($1 / 512))" - KERNELSIZE="$2" -@@ -30,6 +30,12 @@ ROOTFSSIZE="$(($4 / 512))" - [ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc count="$ROOTFSSIZE" - dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc - --make_ext4fs -J -L kernel -l "$KERNELSIZE" "$OUTPUT.kernel" "$KERNELDIR" -+if [ -n "$EFI_SIGNATURE" ]; then -+ [ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$(($ROOTFSOFFSET + $ROOTFSSIZE))" conv=notrunc count="$sect" -+ mkfs.fat -n kernel -C "$OUTPUT.kernel" -S 512 "$(($KERNELSIZE / 1024))" -+ mcopy -s -i "$OUTPUT.kernel" "$KERNELDIR"/* ::/ -+else -+ make_ext4fs -J -L kernel -l "$KERNELSIZE" "$OUTPUT.kernel" "$KERNELDIR" -+fi - dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc - rm -f "$OUTPUT.kernel" -diff --git a/target/linux/x86/base-files/lib/preinit/79_move_config b/target/linux/x86/base-files/lib/preinit/79_move_config -index 702da9e873d..015efcf748b 100644 ---- a/target/linux/x86/base-files/lib/preinit/79_move_config -+++ b/target/linux/x86/base-files/lib/preinit/79_move_config -@@ -2,13 +2,15 @@ - # Copyright (C) 2012-2015 OpenWrt.org - - move_config() { -- local partdev -+ local partdev magic parttype=ext4 - - . /lib/upgrade/common.sh - - if export_bootdevice && export_partdevice partdev 1; then - mkdir -p /boot -- mount -t ext4 -o rw,noatime "/dev/$partdev" /boot -+ magic=$(dd if="/dev/$partdev" bs=1 count=3 skip=54 2>/dev/null) -+ [ "$magic" = "FAT" ] && parttype=vfat -+ mount -t $parttype -o rw,noatime "/dev/$partdev" /boot - if [ -f "/boot/$BACKUP_FILE" ]; then - mv -f "/boot/$BACKUP_FILE" / - fi -diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh -index 53c751861cc..1c93f5bd9b9 100644 ---- a/target/linux/x86/base-files/lib/upgrade/platform.sh -+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh -@@ -37,10 +37,12 @@ platform_check_image() { - } - - platform_copy_config() { -- local partdev -+ local partdev magic parttype=ext4 - - if export_partdevice partdev 1; then -- mount -t ext4 -o rw,noatime "/dev/$partdev" /mnt -+ magic=$(dd if="/dev/$partdev" bs=1 count=3 skip=54 2>/dev/null) -+ [ "$magic" = "FAT" ] && parttype=vfat -+ mount -t $parttype -o rw,noatime "/dev/$partdev" /mnt - cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE" - umount /mnt - fi -diff --git a/target/linux/x86/generic/config-4.19 b/target/linux/x86/generic/config-4.19 -index 4a689ca026c..ada81ce04ea 100644 ---- a/target/linux/x86/generic/config-4.19 -+++ b/target/linux/x86/generic/config-4.19 -@@ -139,6 +139,7 @@ CONFIG_FB_DEFERRED_IO=y - CONFIG_FB_EFI=y - CONFIG_FB_HYPERV=y - # CONFIG_FB_I810 is not set -+CONFIG_FB_SIMPLE=y - CONFIG_FB_SYS_COPYAREA=y - CONFIG_FB_SYS_FILLRECT=y - CONFIG_FB_SYS_FOPS=y -diff --git a/target/linux/x86/generic/config-5.4 b/target/linux/x86/generic/config-5.4 -index 4a689ca026c..ada81ce04ea 100644 ---- a/target/linux/x86/generic/config-5.4 -+++ b/target/linux/x86/generic/config-5.4 -@@ -139,6 +139,7 @@ CONFIG_FB_DEFERRED_IO=y - CONFIG_FB_EFI=y - CONFIG_FB_HYPERV=y - # CONFIG_FB_I810 is not set -+CONFIG_FB_SIMPLE=y - CONFIG_FB_SYS_COPYAREA=y - CONFIG_FB_SYS_FILLRECT=y - CONFIG_FB_SYS_FOPS=y -diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile -index c2961e5b9c9..aa80d77b978 100644 ---- a/target/linux/x86/image/Makefile -+++ b/target/linux/x86/image/Makefile -@@ -38,6 +38,9 @@ endif - - ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME)) - ROOTPART:=$(if $(ROOTPART),$(ROOTPART),PARTUUID=$(IMG_PART_SIGNATURE)-02) -+EFI_SIGNATURE:=$(strip $(shell uuidgen | sed -r 's/[a-zA-Z0-9]{2}$$/00/')) -+EFI_ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME)) -+EFI_ROOTPART:=$(if $(EFI_ROOTPART),$(EFI_ROOTPART),PARTUUID=$(shell echo $(EFI_SIGNATURE) | sed 's/00$$/02/')) - - GRUB_TIMEOUT:=$(call qstrip,$(CONFIG_GRUB_TIMEOUT)) - GRUB_TITLE:=$(call qstrip,$(CONFIG_GRUB_TITLE)) -diff --git a/target/linux/x86/image/grub-iso.cfg b/target/linux/x86/image/grub-iso.cfg -index f5848b38534..4bef492a414 100644 ---- a/target/linux/x86/image/grub-iso.cfg -+++ b/target/linux/x86/image/grub-iso.cfg -@@ -3,7 +3,12 @@ - - set default="0" - set timeout="@TIMEOUT@" --set root='(cd)' -+ -+if [ "${grub_platform}" = "efi" ]; then -+ set root='(cd0)' -+else -+ set root='(cd)' -+fi - - menuentry "@TITLE@" { - linux /boot/vmlinuz root=/dev/sr0 rootfstype=iso9660 rootwait @CMDLINE@ noinitrd - -From c24086b352f6f773c07f15f85b0e5ffe26e206af Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E6=9D=8E=E5=9B=BD?= -Date: Sat, 31 Aug 2019 13:28:05 +0000 -Subject: [PATCH 4/8] x86: fix sysupgrade for EFI images -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -1. make function get_partitions support GPT disks -2. get more bytes from image to get GPT partition table -3. update the original PARTUUID to new grub.cfg - -Signed-off-by: 李国 ---- - .../base-files/files/lib/upgrade/common.sh | 40 ++++++++++++++----- - .../x86/base-files/lib/upgrade/platform.sh | 20 ++++++++-- - 2 files changed, 45 insertions(+), 15 deletions(-) - -diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh -index 6e967aeffe8..1324b98ed2f 100644 ---- a/package/base-files/files/lib/upgrade/common.sh -+++ b/package/base-files/files/lib/upgrade/common.sh -@@ -218,17 +218,35 @@ get_partitions() { # - rm -f "/tmp/partmap.$filename" - - local part -- for part in 1 2 3 4; do -- set -- $(hexdump -v -n 12 -s "$((0x1B2 + $part * 16))" -e '3/4 "0x%08X "' "$disk") -- -- local type="$(( $(hex_le32_to_cpu $1) % 256))" -- local lba="$(( $(hex_le32_to_cpu $2) ))" -- local num="$(( $(hex_le32_to_cpu $3) ))" -- -- [ $type -gt 0 ] || continue -- -- printf "%2d %5d %7d\n" $part $lba $num >> "/tmp/partmap.$filename" -- done -+ local magic=$(dd if="$disk" bs=8 count=1 skip=64 2>/dev/null) -+ if [ "$magic" = "EFI PART" ]; then -+ #export_partdevice will fail when partition number is greater than 15, as -+ #the partition major device number is not equal to the disk major device number -+ for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do -+ set -- $(hexdump -v -n 48 -s "$((0x380 + $part * 0x80))" -e '4/4 "%08x"" "4/4 "%08x"" "4/4 "0x%08X "' "$disk") -+ -+ local type="$1" -+ local lba="$(( $(hex_le32_to_cpu $4) * 0x100000000 + $(hex_le32_to_cpu $3) ))" -+ local end="$(( $(hex_le32_to_cpu $6) * 0x100000000 + $(hex_le32_to_cpu $5) ))" -+ local num="$(( $end - $lba ))" -+ -+ [ "$type" = "00000000000000000000000000000000" ] && continue -+ -+ printf "%2d %5d %7d\n" $part $lba $num >> "/tmp/partmap.$filename" -+ done -+ else -+ for part in 1 2 3 4; do -+ set -- $(hexdump -v -n 12 -s "$((0x1B2 + $part * 16))" -e '3/4 "0x%08X "' "$disk") -+ -+ local type="$(( $(hex_le32_to_cpu $1) % 256))" -+ local lba="$(( $(hex_le32_to_cpu $2) ))" -+ local num="$(( $(hex_le32_to_cpu $3) ))" -+ -+ [ $type -gt 0 ] || continue -+ -+ printf "%2d %5d %7d\n" $part $lba $num >> "/tmp/partmap.$filename" -+ done -+ fi - fi - } - -diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh -index 1c93f5bd9b9..3acee2c7a9c 100644 ---- a/target/linux/x86/base-files/lib/upgrade/platform.sh -+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh -@@ -20,7 +20,7 @@ platform_check_image() { - get_partitions "/dev/$diskdev" bootdisk - - #extract the boot sector from the image -- get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b 2>/dev/null -+ get_image "$@" | dd of=/tmp/image.bs count=63 bs=512b 2>/dev/null - - get_partitions /tmp/image.bs image - -@@ -40,7 +40,7 @@ platform_copy_config() { - local partdev magic parttype=ext4 - - if export_partdevice partdev 1; then -- magic=$(dd if="/dev/$partdev" bs=1 count=3 skip=54 2>/dev/null) -+ magic="$(dd if="/dev/$partdev" bs=1 count=3 skip=54 2>/dev/null)" - [ "$magic" = "FAT" ] && parttype=vfat - mount -t $parttype -o rw,noatime "/dev/$partdev" /mnt - cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE" -@@ -83,7 +83,7 @@ platform_do_upgrade() { - get_partitions "/dev/$diskdev" bootdisk - - #extract the boot sector from the image -- get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b -+ get_image "$@" | dd of=/tmp/image.bs count=63 bs=512b >/dev/null - - get_partitions /tmp/image.bs image - -@@ -108,7 +108,7 @@ platform_do_upgrade() { - while read part start size; do - if export_partdevice partdev $part; then - echo "Writing image to /dev/$partdev..." -- get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync -+ get_image "$@" | dd of="/dev/$partdev" ibs=512 obs=1M skip="$start" count="$size" conv=fsync - else - echo "Unable to find partition $part device, skipped." - fi -@@ -119,4 +119,16 @@ platform_do_upgrade() { - get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync - - platform_do_bootloader_upgrade "$diskdev" -+ local magic parttype=ext4 -+ magic="$(dd if="/dev/$diskdev" bs=8 count=1 skip=64 2>/dev/null)" -+ [ "$magic" = "EFI PART" ] || return 0 -+ if export_partdevice partdev 1; then -+ magic="$(dd if="/dev/$partdev" bs=1 count=3 skip=54 2>/dev/null)" -+ [ "$magic" = "FAT" ] && parttype=vfat -+ mount -t $parttype -o rw,noatime "/dev/$partdev" /mnt -+ set -- $(dd if="/dev/$diskdev" bs=1 skip=1168 count=16 2>/dev/null | hexdump -v -e '8/1 "%02x "" "2/1 "%02x""-"6/1 "%02x"') -+ sed -i "s/\(PARTUUID=\)[a-f0-9-]\+/\1$4$3$2$1-$6$5-$8$7-$9/ig" /mnt/boot/grub/grub.cfg -+ umount /mnt -+ fi -+ - } - -From b915dff5280cc48a2331f01961f2504b9b12f245 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E6=9D=8E=E5=9B=BD?= -Date: Tue, 24 Mar 2020 17:12:22 +0800 -Subject: [PATCH 5/8] grub2: grub-early.cfg auto detect efi platform -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: 李国 ---- - package/boot/grub2/files/grub-early.cfg | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/package/boot/grub2/files/grub-early.cfg b/package/boot/grub2/files/grub-early.cfg -index 4a5b5a60927..9e7cad47607 100644 ---- a/package/boot/grub2/files/grub-early.cfg -+++ b/package/boot/grub2/files/grub-early.cfg -@@ -1 +1,5 @@ --configfile (hd0,msdos1)/boot/grub/grub.cfg -+if [ "${grub_platform}" = "efi" ]; then -+ configfile (hd0,gpt1)/boot/grub/grub.cfg -+else -+ configfile (hd0,msdos1)/boot/grub/grub.cfg -+fi - -From dce4fc3201395f886e496c3bb5f6ffd979558aa3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E6=9D=8E=E5=9B=BD?= -Date: Tue, 24 Mar 2020 17:13:27 +0800 -Subject: [PATCH 6/8] x86: add efi images - ---- - include/image.mk | 1 + - scripts/gen_image_generic.sh | 4 ++-- - target/linux/x86/image/Makefile | 34 +++++++++++++++++++++++++---- - target/linux/x86/image/grub-efi.cfg | 13 +++++++++++ - 4 files changed, 46 insertions(+), 6 deletions(-) - create mode 100644 target/linux/x86/image/grub-efi.cfg - -diff --git a/include/image.mk b/include/image.mk -index 8af5905c600..051a6206cef 100644 ---- a/include/image.mk -+++ b/include/image.mk -@@ -45,6 +45,7 @@ IMG_PREFIX:=$(VERSION_DIST_SANITIZED)-$(IMG_PREFIX_VERNUM)$(IMG_PREFIX_VERCODE)$ - IMG_ROOTFS:=$(IMG_PREFIX)-rootfs - IMG_COMBINED:=$(IMG_PREFIX)-combined - IMG_PART_SIGNATURE:=$(shell echo $(SOURCE_DATE_EPOCH)$(LINUX_VERMAGIC) | mkhash md5 | cut -b1-8) -+IMG_PART_UUID:=$(shell echo $(SOURCE_DATE_EPOCH)$(LINUX_VERMAGIC) | mkhash md5 | sed -r 's/(.{8})(.{4})(.{4})(.{4})(.{10})../\1-\2-\3-\4-\500/') - - MKFS_DEVTABLE_OPT := -D $(INCLUDE_DIR)/device_table.txt - -diff --git a/scripts/gen_image_generic.sh b/scripts/gen_image_generic.sh -index 1df4d0673b3..e45a8dd417e 100755 ---- a/scripts/gen_image_generic.sh -+++ b/scripts/gen_image_generic.sh -@@ -20,7 +20,7 @@ sect=63 - cyl=$(( (KERNELSIZE + ROOTFSSIZE) * 1024 * 1024 / (head * sect * 512))) - - # create partition table --set $(ptgen -o "$OUTPUT" -h $head -s $sect ${EFI_SIGNATURE:+-g} -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m ${ALIGN:+-l $ALIGN} ${SIGNATURE:+-S 0x$SIGNATURE} ${EFI_SIGNATURE:+-G $EFI_SIGNATURE}) -+set $(ptgen -o "$OUTPUT" -h $head -s $sect ${UUID:+-g} -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m ${ALIGN:+-l $ALIGN} ${SIGNATURE:+-S 0x$SIGNATURE} ${UUID:+-G $UUID}) - - KERNELOFFSET="$(($1 / 512))" - KERNELSIZE="$2" -@@ -30,7 +30,7 @@ ROOTFSSIZE="$(($4 / 512))" - [ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc count="$ROOTFSSIZE" - dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc - --if [ -n "$EFI_SIGNATURE" ]; then -+if [ -n "$UUID" ]; then - [ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$(($ROOTFSOFFSET + $ROOTFSSIZE))" conv=notrunc count="$sect" - mkfs.fat -n kernel -C "$OUTPUT.kernel" -S 512 "$(($KERNELSIZE / 1024))" - mcopy -s -i "$OUTPUT.kernel" "$KERNELDIR"/* ::/ -diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile -index aa80d77b978..efb0b1cff99 100644 ---- a/target/linux/x86/image/Makefile -+++ b/target/linux/x86/image/Makefile -@@ -38,9 +38,8 @@ endif - - ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME)) - ROOTPART:=$(if $(ROOTPART),$(ROOTPART),PARTUUID=$(IMG_PART_SIGNATURE)-02) --EFI_SIGNATURE:=$(strip $(shell uuidgen | sed -r 's/[a-zA-Z0-9]{2}$$/00/')) - EFI_ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME)) --EFI_ROOTPART:=$(if $(EFI_ROOTPART),$(EFI_ROOTPART),PARTUUID=$(shell echo $(EFI_SIGNATURE) | sed 's/00$$/02/')) -+EFI_ROOTPART:=$(if $(EFI_ROOTPART),$(EFI_ROOTPART),PARTUUID=$(shell echo $(IMG_PART_UUID) | sed 's/00$$/02/')) - - GRUB_TIMEOUT:=$(call qstrip,$(CONFIG_GRUB_TIMEOUT)) - GRUB_TITLE:=$(call qstrip,$(CONFIG_GRUB_TITLE)) -@@ -50,7 +49,8 @@ BOOTOPTS:=$(call qstrip,$(CONFIG_GRUB_BOOTOPTS)) - define Build/combined - $(CP) $(KDIR)/$(KERNEL_NAME) $@.boot/boot/vmlinuz - -$(CP) $(STAGING_DIR_ROOT)/boot/. $@.boot/boot/ -- PADDING="1" SIGNATURE="$(IMG_PART_SIGNATURE)" $(SCRIPT_DIR)/gen_image_generic.sh \ -+ PADDING="1" SIGNATURE="$(IMG_PART_SIGNATURE)" \ -+ $(if $(filter $(1),efi),UUID="$(IMG_PART_UUID)") $(SCRIPT_DIR)/gen_image_generic.sh \ - $@ \ - $(CONFIG_TARGET_KERNEL_PARTSIZE) $@.boot \ - $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(IMAGE_ROOTFS) \ -@@ -64,6 +64,7 @@ define Build/grub-config - -e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \ - -e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \ - -e 's#@ROOTPART@#root=$(ROOTPART) rootwait#g' \ -+ -e 's#@EFI_ROOTPART@#root=$(EFI_ROOTPART) rootwait#g' \ - -e 's#@CMDLINE@#$(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE)#g' \ - -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \ - -e 's#@TITLE@#$(GRUB_TITLE)#g' \ -@@ -80,7 +81,7 @@ define Build/grub-install - $(STAGING_DIR_HOST)/bin/grub-bios-setup \ - -m "$@.grub2/device.map" \ - -d "$@.grub2" \ -- -r "hd0,msdos1" \ -+ -r "hd0,$(if $(filter $(1),efi),gpt1,msdos1)" \ - $@ - endef - -@@ -91,7 +92,9 @@ define Build/iso - $(STAGING_DIR_HOST)/lib/grub/grub2-iso/eltorito.img \ - > $@.boot/boot/grub/eltorito.img - -$(CP) $(STAGING_DIR_ROOT)/boot/. $@.boot/boot/ -+ $(if $(filter $(1),efi),$(CP) $(STAGING_DIR_HOST)/lib/grub/grub2-iso/efiboot.img $@.boot/boot/grub/) - mkisofs -R -b boot/grub/eltorito.img -no-emul-boot -boot-info-table \ -+ $(if $(filter $(1),efi),-boot-load-size 4 -c boot.cat -eltorito-alt-boot -e boot/grub/efiboot.img -no-emul-boot) \ - -o $@ $@.boot $(TARGET_DIR) - endef - -@@ -102,13 +105,25 @@ define Device/Default - IMAGE/combined.img.gz := grub-config pc | combined | grub-install | gzip - IMAGE/combined.vdi := grub-config pc | combined | grub-install | qemu-image vdi - IMAGE/combined.vmdk := grub-config pc | combined | grub-install | qemu-image vmdk - IMAGE/rootfs.img := append-rootfs - IMAGE/rootfs.img.gz := append-rootfs | gzip -+ ARTIFACT/image-efi.iso := grub-config iso | iso efi -+ IMAGE/combined-efi.img := grub-config efi | combined efi | grub-install efi -+ IMAGE/combined-efi.img.gz := grub-config efi | combined efi | grub-install efi | gzip -+ IMAGE/combined-efi.vdi := grub-config efi | combined efi | grub-install efi | qemu-image vdi -+ IMAGE/combined-efi.vmdk := grub-config efi | combined efi | grub-install efi | qemu-image vmdk - ifeq ($(CONFIG_TARGET_IMAGES_GZIP),y) - IMAGES := combined.img.gz rootfs.img.gz - else - IMAGES := combined.img rootfs.img - endif -+ ifeq $(CONFIG_EFI_IMAGES) -+ ifeq ($(CONFIG_TARGET_IMAGES_GZIP),y) -+ IMAGES += combined-efi.img.gz -+ else -+ IMAGES += combined-efi.img -+ endif -+ endif - KERNEL := kernel-bin - KERNEL_INSTALL := 1 - KERNEL_NAME := bzImage -@@ -119,6 +134,17 @@ define Device/Default - ifeq ($(CONFIG_VMDK_IMAGES),y) - IMAGES += combined.vmdk - endif -+ ifeq $(CONFIG_EFI_IMAGES) -+ ifeq ($(CONFIG_ISO_IMAGES),y) -+ ARTIFACTS += image-efi.iso -+ endif -+ ifeq ($(CONFIG_VDI_IMAGES),y) -+ IMAGES += combined-efi.vdi -+ endif -+ ifeq ($(CONFIG_VMDK_IMAGES),y) -+ IMAGES += combined-efi.vmdk -+ endif -+ endif - endef - - $(eval $(call Image/gzip-ext4-padded-squashfs)) -diff --git a/target/linux/x86/image/grub-efi.cfg b/target/linux/x86/image/grub-efi.cfg -new file mode 100644 -index 00000000000..f3f6a02c021 ---- /dev/null -+++ b/target/linux/x86/image/grub-efi.cfg -@@ -0,0 +1,13 @@ -+@SERIAL_CONFIG@ -+@TERMINAL_CONFIG@ -+ -+set default="0" -+set timeout="@TIMEOUT@" -+set root='(hd0,gpt1)' -+ -+menuentry "@TITLE@" { -+ linux /boot/vmlinuz @EFI_ROOTPART@ @CMDLINE@ noinitrd -+} -+menuentry "@TITLE@ (failsafe)" { -+ linux /boot/vmlinuz failsafe=true @EFI_ROOTPART@ @CMDLINE@ noinitrd -+} - -From 317bb3e99c4ad67e6e5680d0fbf03d65294aac2f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E6=9D=8E=E5=9B=BD?= -Date: Tue, 24 Mar 2020 18:01:39 +0800 -Subject: [PATCH 7/8] grub2: fix path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: 李国 ---- - package/boot/grub2/grub2/Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/package/boot/grub2/grub2/Makefile b/package/boot/grub2/grub2/Makefile -index 7126beab4cf..3302838d719 100644 ---- a/package/boot/grub2/grub2/Makefile -+++ b/package/boot/grub2/grub2/Makefile -@@ -44,7 +44,7 @@ define Host/Install - -d $(STAGING_DIR_HOST)/lib/grub/i386-pc \ - -p /boot/grub \ - -O i386-pc \ -- -c ./files/grub-early.cfg \ -+ -c ../files/grub-early.cfg \ - -o $(STAGING_DIR_HOST)/lib/grub/grub2-generic/core.img \ - at_keyboard biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga - -@@ -53,7 +53,7 @@ define Host/Install - -d $(STAGING_DIR_HOST)/lib/grub/i386-pc \ - -p /boot/grub \ - -O i386-pc \ -- -c ./files/grub-early.cfg \ -+ -c ../files/grub-early.cfg \ - -o $(STAGING_DIR_HOST)/lib/grub/grub2-iso/eltorito.img \ - at_keyboard biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial vga - -@@ -62,7 +62,7 @@ define Host/Install - -d $(STAGING_DIR_HOST)/lib/grub/i386-pc \ - -p /boot/grub \ - -O i386-pc \ -- -c ./files/grub-early.cfg \ -+ -c ../files/grub-early.cfg \ - -o $(STAGING_DIR_HOST)/lib/grub/grub2-legacy/core.img \ - biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga - endef - -From 784fcc94242d146f2ef2c31e292ace8816985d62 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E6=9D=8E=E5=9B=BD?= -Date: Tue, 24 Mar 2020 18:02:57 +0800 -Subject: [PATCH 8/8] x86: fix -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: 李国 ---- - target/linux/x86/image/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile -index efb0b1cff99..ff964cde8ab 100644 ---- a/target/linux/x86/image/Makefile -+++ b/target/linux/x86/image/Makefile -@@ -115,7 +115,7 @@ define Device/Default - else - IMAGES := combined.img - endif -- ifeq $(CONFIG_EFI_IMAGES) -+ ifeq ($(CONFIG_EFI_IMAGES),y) - ifeq ($(CONFIG_TARGET_IMAGES_GZIP),y) - IMAGES += combined-efi.img.gz - else -@@ -134,7 +134,7 @@ define Device/Default - ifeq ($(CONFIG_VMDK_IMAGES),y) - IMAGES += combined.vmdk - endif -- ifeq $(CONFIG_EFI_IMAGES) -+ ifeq ($(CONFIG_EFI_IMAGES),y) - ifeq ($(CONFIG_ISO_IMAGES),y) - ARTIFACTS += image-efi.iso - endif diff --git a/root/package/base-files/files/bin/config_generate b/root/package/base-files/files/bin/config_generate deleted file mode 100755 index f4dcd8d1..00000000 --- a/root/package/base-files/files/bin/config_generate +++ /dev/null @@ -1,512 +0,0 @@ -#!/bin/sh - -CFG=/etc/board.json - -. /usr/share/libubox/jshn.sh - -[ -s $CFG ] || /bin/board_detect || exit 1 -[ -s /etc/config/network -a -s /etc/config/system ] && exit 0 - -generate_bridge() { - local name=$1 - local macaddr=$2 - uci -q batch <<-EOF - set network.$name=device - set network.$name.name=$name - set network.$name.type=bridge - EOF - if [ -n "$macaddr" ]; then - uci -q batch <<-EOF - set network.$name.macaddr=$macaddr - EOF - fi -} - -bridge_vlan_id=0 -generate_bridge_vlan() { - local name=$1_vlan - local device=$2 - local ports="$3" - local vlan="$4" - uci -q batch <<-EOF - set network.$name=bridge-vlan - set network.$name.device='$device' - set network.$name.vlan='$vlan' - set network.$name.ports='$ports' - EOF -} - -generate_static_network() { - uci -q batch <<-EOF - delete network.loopback - set network.loopback='interface' - set network.loopback.ifname='lo' - set network.loopback.proto='static' - set network.loopback.ipaddr='127.0.0.1' - set network.loopback.netmask='255.0.0.0' - EOF - [ -e /proc/sys/net/ipv6 ] && { - uci -q batch <<-EOF - delete network.globals - set network.globals='globals' - set network.globals.ula_prefix='auto' - EOF - } - - if json_is_a dsl object; then - json_select dsl - if json_is_a atmbridge object; then - json_select atmbridge - local vpi vci encaps payload nameprefix - json_get_vars vpi vci encaps payload nameprefix - uci -q batch <<-EOF - delete network.atm - set network.atm='atm-bridge' - set network.atm.vpi='$vpi' - set network.atm.vci='$vci' - set network.atm.encaps='$encaps' - set network.atm.payload='$payload' - set network.atm.nameprefix='$nameprefix' - EOF - json_select .. - fi - - if json_is_a modem object; then - json_select modem - local type annex firmware tone xfer_mode - json_get_vars type annex firmware tone xfer_mode - uci -q batch <<-EOF - delete network.dsl - set network.dsl='dsl' - set network.dsl.annex='$annex' - set network.dsl.firmware='$firmware' - set network.dsl.tone='$tone' - set network.dsl.xfer_mode='$xfer_mode' - EOF - json_select .. - fi - json_select .. - fi -} - -addr_offset=2 -generate_network() { - local ifname macaddr protocol type ipaddr netmask vlan - local bridge=$2 - - json_select network - json_select "$1" - json_get_vars ifname macaddr protocol ipaddr netmask vlan - json_select .. - json_select .. - - [ -n "$ifname" ] || return - - # force bridge for multi-interface devices (and lan) - case "$1:$ifname" in - *\ * | lan:*) type="bridge" ;; - esac - - [ -n "$bridge" ] && { - if [ -z "$vlan" ]; then - bridge_vlan_id=$((bridge_vlan_id + 1)) - vlan=$bridge_vlan_id - fi - generate_bridge_vlan $1 $bridge "$ifname" $vlan - ifname=$bridge.$vlan - type="" - } - - uci -q batch <<-EOF - delete network.$1 - set network.$1='interface' - set network.$1.type='$type' - set network.$1.ifname='$ifname' - set network.$1.proto='none' - EOF - - if [ -n "$macaddr" ]; then - for name in $ifname; do - uci -q batch <<-EOF - delete network.$1_${name/./_}_dev - set network.$1_${name/./_}_dev='device' - set network.$1_${name/./_}_dev.name='$name' - set network.$1_${name/./_}_dev.macaddr='$macaddr' - EOF - done - fi - - case "$protocol" in - static) - local ipad - case "$1" in - lan) ipad=${ipaddr:-"192.168.100.1"} ;; - *) ipad=${ipaddr:-"192.168.$((addr_offset++)).1"} ;; - esac - - netm=${netmask:-"255.255.255.0"} - - uci -q batch <<-EOF - set network.$1.proto='static' - set network.$1.ipaddr='$ipad' - set network.$1.netmask='$netm' - EOF - [ -e /proc/sys/net/ipv6 ] && uci set network.$1.ip6assign='60' - ;; - - dhcp) - # fixup IPv6 slave interface if parent is a bridge - [ "$type" = "bridge" ] && ifname="br-$1" - - uci set network.$1.proto='dhcp' - [ -e /proc/sys/net/ipv6 ] && { - uci -q batch <<-EOF - delete network.${1}6 - set network.${1}6='interface' - set network.${1}6.ifname='$ifname' - set network.${1}6.proto='dhcpv6' - EOF - } - ;; - - pppoe) - uci -q batch <<-EOF - set network.$1.proto='pppoe' - set network.$1.username='username' - set network.$1.password='password' - EOF - [ -e /proc/sys/net/ipv6 ] && { - uci -q batch <<-EOF - set network.$1.ipv6='1' - delete network.${1}6 - set network.${1}6='interface' - set network.${1}6.ifname='@${1}' - set network.${1}6.proto='dhcpv6' - EOF - } - ;; - esac -} - -generate_switch_vlans_ports() { - local switch="$1" - local port ports role roles num attr val - - # - # autogenerate vlans - # - - if json_is_a roles array; then - json_get_keys roles roles - json_select roles - - for role in $roles; do - json_select "$role" - json_get_vars ports - json_select .. - - uci -q batch <<-EOF - add network switch_vlan - set network.@switch_vlan[-1].device='$switch' - set network.@switch_vlan[-1].vlan='$role' - set network.@switch_vlan[-1].ports='$ports' - EOF - done - - json_select .. - fi - - - # - # write port specific settings - # - - if json_is_a ports array; then - json_get_keys ports ports - json_select ports - - for port in $ports; do - json_select "$port" - json_get_vars num - - if json_is_a attr object; then - json_get_keys attr attr - json_select attr - uci -q batch <<-EOF - add network switch_port - set network.@switch_port[-1].device='$switch' - set network.@switch_port[-1].port=$num - EOF - - for attr in $attr; do - json_get_var val "$attr" - uci -q set network.@switch_port[-1].$attr="$val" - done - json_select .. - fi - json_select .. - done - - json_select .. - fi -} - -generate_switch() { - local key="$1" - local vlans - - json_select switch - json_select "$key" - json_get_vars enable reset blinkrate cpu_port \ - ar8xxx_mib_type ar8xxx_mib_poll_interval - - uci -q batch <<-EOF - add network switch - set network.@switch[-1].name='$key' - set network.@switch[-1].reset='$reset' - set network.@switch[-1].enable_vlan='$enable' - set network.@switch[-1].blinkrate='$blinkrate' - set network.@switch[-1].ar8xxx_mib_type='$ar8xxx_mib_type' - set network.@switch[-1].ar8xxx_mib_poll_interval='$ar8xxx_mib_poll_interval' - EOF - - generate_switch_vlans_ports "$1" - - json_select .. - json_select .. -} - - -generate_static_system() { - uci -q batch <<-EOF - delete system.@system[0] - add system system - set system.@system[-1].hostname='openmptcprouter' - set system.@system[-1].timezone='UTC' - set system.@system[-1].ttylogin='0' - set system.@system[-1].log_size='64' - set system.@system[-1].urandom_seed='0' - - delete system.ntp - set system.ntp='timeserver' - set system.ntp.enabled='1' - set system.ntp.enable_server='0' - add_list system.ntp.server='ntp1.aliyun.com' - add_list system.ntp.server='time1.cloud.tencent.com' - add_list system.ntp.server='time.ustc.edu.cn' - add_list system.ntp.server='cn.pool.ntp.org' - EOF - - if json_is_a system object; then - json_select system - local hostname - if json_get_var hostname hostname; then - uci -q set "system.@system[-1].hostname=$hostname" - fi - - local compat_version - if json_get_var compat_version compat_version; then - uci -q set "system.@system[-1].compat_version=$compat_version" - else - uci -q set "system.@system[-1].compat_version=1.0" - fi - - if json_is_a ntpserver array; then - local keys key - json_get_keys keys ntpserver - json_select ntpserver - uci -q delete "system.ntp.server" - - for key in $keys; do - local server - if json_get_var server "$key"; then - uci -q add_list "system.ntp.server=$server" - fi - done - json_select .. - fi - json_select .. - fi -} - -generate_rssimon() { - local key="$1" - local cfg="rssid_$key" - local refresh threshold - - json_select rssimon - json_select "$key" - json_get_vars refresh threshold - json_select .. - json_select .. - - uci -q batch <<-EOF - delete system.$cfg - set system.$cfg='rssid' - set system.$cfg.dev='$key' - set system.$cfg.refresh='$refresh' - set system.$cfg.threshold='$threshold' - EOF -} - -generate_led() { - local key="$1" - local cfg="led_$key" - - json_select led - json_select "$key" - json_get_vars name sysfs type trigger default - - uci -q batch <<-EOF - delete system.$cfg - set system.$cfg='led' - set system.$cfg.name='$name' - set system.$cfg.sysfs='$sysfs' - set system.$cfg.trigger='$trigger' - set system.$cfg.default='$default' - EOF - - case "$type" in - gpio) - local gpio inverted - json_get_vars gpio inverted - uci -q batch <<-EOF - set system.$cfg.trigger='gpio' - set system.$cfg.gpio='$gpio' - set system.$cfg.inverted='$inverted' - EOF - ;; - - netdev) - local device mode - json_get_vars device mode - uci -q batch <<-EOF - set system.$cfg.trigger='netdev' - set system.$cfg.mode='$mode' - set system.$cfg.dev='$device' - EOF - ;; - - usb) - local device - json_get_vars device - uci -q batch <<-EOF - set system.$cfg.trigger='usbdev' - set system.$cfg.interval='50' - set system.$cfg.dev='$device' - EOF - ;; - - usbport) - local ports port - json_get_values ports ports - uci set system.$cfg.trigger='usbport' - for port in $ports; do - uci add_list system.$cfg.port=$port - done - ;; - - rssi) - local iface minq maxq offset factor - json_get_vars iface minq maxq offset factor - uci -q batch <<-EOF - set system.$cfg.trigger='rssi' - set system.$cfg.iface='rssid_$iface' - set system.$cfg.minq='$minq' - set system.$cfg.maxq='$maxq' - set system.$cfg.offset='$offset' - set system.$cfg.factor='$factor' - EOF - ;; - - switch) - local port_mask speed_mask mode - json_get_vars port_mask speed_mask mode - uci -q batch <<-EOF - set system.$cfg.port_mask='$port_mask' - set system.$cfg.speed_mask='$speed_mask' - set system.$cfg.mode='$mode' - EOF - ;; - - portstate) - local port_state - json_get_vars port_state - uci -q batch <<-EOF - set system.$cfg.port_state='$port_state' - EOF - ;; - - timer|oneshot) - local delayon delayoff - json_get_vars delayon delayoff - uci -q batch <<-EOF - set system.$cfg.trigger='$type' - set system.$cfg.delayon='$delayon' - set system.$cfg.delayoff='$delayoff' - EOF - ;; - esac - - json_select .. - json_select .. -} - -generate_gpioswitch() { - local cfg="$1" - - json_select gpioswitch - json_select "$cfg" - local name pin default - json_get_vars name pin default - uci -q batch <<-EOF - delete system.$cfg - set system.$cfg='gpio_switch' - set system.$cfg.name='$name' - set system.$cfg.gpio_pin='$pin' - set system.$cfg.value='$default' - EOF - json_select .. - json_select .. -} - -json_init -json_load "$(cat ${CFG})" - -umask 077 - -if [ ! -s /etc/config/network ]; then - bridge_name="" - touch /etc/config/network - generate_static_network - - json_get_vars bridge - [ -n "$bridge" ] && { - json_select bridge - json_get_vars name macaddr - generate_bridge "$name" "$macaddr" - json_select .. - bridge_name=$name - } - - json_get_keys keys network - for key in $keys; do generate_network $key $bridge_name; done - - json_get_keys keys switch - for key in $keys; do generate_switch $key; done -fi - -if [ ! -s /etc/config/system ]; then - touch /etc/config/system - generate_static_system - - json_get_keys keys rssimon - for key in $keys; do generate_rssimon $key; done - - json_get_keys keys gpioswitch - for key in $keys; do generate_gpioswitch $key; done - - json_get_keys keys led - for key in $keys; do generate_led $key; done -fi -uci commit diff --git a/root/package/base-files/files/etc/banner b/root/package/base-files/files/etc/banner deleted file mode 100644 index 4dd2e767..00000000 --- a/root/package/base-files/files/etc/banner +++ /dev/null @@ -1,39 +0,0 @@ - -/*** - * ,s555SB@@& - * :9H####@@@@@Xi - * 1@@@@@@@@@@@@@@8 - * ,8@@@@@@@@@B@@@@@@8 - * :B@@@@X3hi8Bs;B@@@@@Ah, - * ,8i r@@@B: 1S ,M@@@@@@#8; - * 1AB35.i: X@@8 . SGhr ,A@@@@@@@@S - * 1@h31MX8 18Hhh3i .i3r ,A@@@@@@@@@5 - * ;@&i,58r5 rGSS: :B@@@@@@@@@@A - * 1#i . 9i hX. .: .5@@@@@@@@@@@1 - * sG1, ,G53s. 9#Xi;hS5 3B@@@@@@@B1 - * .h8h.,A@@@MXSs, #@H1: 3ssSSX@1 - * s ,@@@@@@@@@@@@Xhi, r#@@X1s9M8 .GA981 - * ,. rS8H#@@@@@@@@@@#HG51;. .h31i;9@r .8@@@@BS;i; - * .19AXXXAB@@@@@@@@@@@@@@#MHXG893hrX#XGGXM@@@@@@@@@@MS - * s@@MM@@@hsX#@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@&, - * :GB@#3G@@Brs ,1GM@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@B, - * .hM@@@#@@#MX 51 r;iSGAM@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@8 - * :3B@@@@@@@@@@@&9@h :Gs .;sSXH@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@: - * s&HA#@@@@@@@@@@@@@@M89A;.8S. ,r3@@@@@@@@@@@@@@@@@@@@@@@@@@@r - * ,13B@@@@@@@@@@@@@@@@@@@5 5B3 ;. ;@@@@@@@@@@@@@@@@@@@@@@@@@@@i - * 5#@@#&@@@@@@@@@@@@@@@@@@9 .39: ;@@@@@@@@@@@@@@@@@@@@@@@@@@@; - * 9@@@X:MM@@@@@@@@@@@@@@@#; ;31. H@@@@@@@@@@@@@@@@@@@@@@@@@@: - * SH#@B9.rM@@@@@@@@@@@@@B :. 3@@@@@@@@@@@@@@@@@@@@@@@@@@5 - * ,:. 9@@@@@@@@@@@#HB5 .M@@@@@@@@@@@@@@@@@@@@@@@@@B - * ,ssirhSM@&1;i19911i,. s@@@@@@@@@@@@@@@@@@@@@@@@@@S - * ,,,rHAri1h1rh&@#353Sh: 8@@@@@@@@@@@@@@@@@@@@@@@@@#: - * .A3hH@#5S553&@@#h i:i9S #@@@@@@@@@@@@@@@@@@@@@@@@@A. - * - * - * 又看源码，看你妹妹呀！ - */ - ------------------------------------------------------------------------------- -55860.com QQ 175338181 weixin:xinyangla -(%C) ------------------------------------------------------------------------------- diff --git a/root/package/base-files/files/etc/board.d/99-default_network b/root/package/base-files/files/etc/board.d/99-default_network deleted file mode 100755 index d70aa352..00000000 --- a/root/package/base-files/files/etc/board.d/99-default_network +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2013-2015 OpenWrt.org -# - -. /lib/functions/uci-defaults.sh - -board_config_update - -json_is_a network object && exit 0 - -ucidef_set_interface_lan 'eth0' -[ -d /sys/class/net/eth1 ] && ucidef_set_interface_wan 'eth1' - -board_config_flush - -exit 0 diff --git a/root/package/base-files/files/etc/shadow b/root/package/base-files/files/etc/shadow deleted file mode 100644 index 40218708..00000000 --- a/root/package/base-files/files/etc/shadow +++ /dev/null @@ -1,5 +0,0 @@ -root:$1$ie.8vTnt$7EzhI1ZYiwp8hSAC4eSId0:18473:0:99999:7::: -daemon:*:0:0:99999:7::: -ftp:*:0:0:99999:7::: -network:*:0:0:99999:7::: -nobody:*:0:0:99999:7::: diff --git a/root/package/firmware/ipq-wifi/Makefile b/root/package/firmware/ipq-wifi/Makefile deleted file mode 100644 index 20b07c79..00000000 --- a/root/package/firmware/ipq-wifi/Makefile +++ /dev/null @@ -1,135 +0,0 @@ -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/version.mk - -PKG_NAME:=ipq-wifi -PKG_RELEASE:=1 -PKG_FLAGS:=nonshared - -include $(INCLUDE_DIR)/package.mk - -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) -endef - -define Build/Compile -endef - -# Use ath10k-bdencoder from https://github.com/qca/qca-swiss-army-knife.git -# to generate the board-* files here. -# -# This is intended to be used on an interim basis until device-specific -# board data for new devices is available through the upstream compilation -# -# Please send a mail with your device-specific board files upstream. -# You can find instructions and examples on the linux-wireless wiki: -# - -ALLWIFIBOARDS:= \ - 8dev_habanero-dvk \ - aruba_ap-303 \ - avm_fritzrepeater-1200 \ - buffalo_wtr-m2133hp \ - cellc_rtl30vw \ - devolo_magic-2-wifi-next \ - dlink_dap2610 \ - edgecore_ecw5410 \ - edgecore_oap100 \ - engenius_eap2200 \ - engenius_emd1 \ - engenius_emr3500 \ - ezviz_cs-w3-wd1200g-eup \ - glinet_gl-s1300 \ - linksys_ea8300 \ - linksys_mr8300-v0 \ - luma_wrtq-329acn \ - pangu_l1000 \ - p2w_r619ac \ - mobipromo_cm520-79f \ - plasmacloud_pa1200 \ - plasmacloud_pa2200 \ - qxwlan_e2600ac - -ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD)) - -define Package/ipq-wifi-default - SUBMENU:=ath10k Board-Specific Overrides - SECTION:=firmware - CATEGORY:=Firmware - DEPENDS:=@(TARGET_ipq40xx||TARGET_ipq806x) - TITLE:=Custom Board -endef - -define ipq-wifi-install-one-to - $(INSTALL_DIR) $(2)/lib/firmware/ath10k/$(3)/ - $(INSTALL_DATA) $(1) $(2)/lib/firmware/ath10k/$(3)/board-2.bin -endef - -define ipq-wifi-install-one - $(if $(filter $(suffix $(1)),.QCA4019 .qca4019),\ - $(call ipq-wifi-install-one-to,$(1),$(2),QCA4019/hw1.0),\ - $(if $(filter $(suffix $(1)),.QCA9888 .qca9888),\ - $(call ipq-wifi-install-one-to,$(1),$(2),QCA9888/hw2.0),\ - $(if $(filter $(suffix $(1)),.QCA9984 .qca9984),\ - $(call ipq-wifi-install-one-to,$(1),$(2),QCA9984/hw1.0),\ - $(error Unrecognized board-file suffix '$(suffix $(1))' for '$(1)')\ - ))) - -endef -# Blank line required at end of above define due to foreach context - -define generate-ipq-wifi-package - define Package/ipq-wifi-$(1) - $(call Package/ipq-wifi-default) - TITLE:=board-2.bin Overrides for $(2) - CONFLICTS:=$(PREV_BOARD) - endef - - define Package/ipq-wifi-$(1)/description -The $(2) requires board-specific, reference ("cal") data -that is not yet present in the upstream wireless firmware distribution. - -This package supplies board-2.bin file(s) that, in the interim, -overwrite those supplied by the ath10k-firmware-* packages. - -This is package is only necessary for the $(2). - -Do not install it for any other device! - endef - - define Package/ipq-wifi-$(1)/install-overlay - $$$$(foreach IPQ_WIFI_BOARD_FILE,$$$$(wildcard board-$(1).*),\ - $$$$(call ipq-wifi-install-one,$$$$(IPQ_WIFI_BOARD_FILE),$$(1))) - endef - - PREV_BOARD+=ipq-wifi-$(1) -endef - -# Add board name to ALLWIFIBOARDS -# Place files in this directory as board-. -# Add $(eval $(call generate-ipq-wifi-package,,)) - -$(eval $(call generate-ipq-wifi-package,8dev_habanero-dvk,8devices Habanero DVK)) -$(eval $(call generate-ipq-wifi-package,aruba_ap-303,Aruba AP-303)) -$(eval $(call generate-ipq-wifi-package,avm_fritzrepeater-1200,AVM FRITZRepeater 1200)) -$(eval $(call generate-ipq-wifi-package,buffalo_wtr-m2133hp,Buffalo WTR-M2133HP)) -$(eval $(call generate-ipq-wifi-package,cellc_rtl30vw, Cell C RTL30VW)) -$(eval $(call generate-ipq-wifi-package,devolo_magic-2-wifi-next,devolo Magic 2 WiFi next)) -$(eval $(call generate-ipq-wifi-package,dlink_dap2610,D-Link DAP-2610)) -$(eval $(call generate-ipq-wifi-package,edgecore_ecw5410,Edgecore ECW5410)) -$(eval $(call generate-ipq-wifi-package,edgecore_oap100,Edgecore OAP100)) -$(eval $(call generate-ipq-wifi-package,engenius_eap2200,EnGenius EAP2200)) -$(eval $(call generate-ipq-wifi-package,engenius_emd1,EnGenius EMD1)) -$(eval $(call generate-ipq-wifi-package,engenius_emr3500,EnGenius EMR3500)) -$(eval $(call generate-ipq-wifi-package,ezviz_cs-w3-wd1200g-eup,EZVIZ CS-W3-WD1200G EUP)) -$(eval $(call generate-ipq-wifi-package,glinet_gl-s1300,GL.iNet GL-S1300)) -$(eval $(call generate-ipq-wifi-package,linksys_ea8300,Linksys EA8300)) -$(eval $(call generate-ipq-wifi-package,linksys_mr8300-v0,Linksys MR8300)) -$(eval $(call generate-ipq-wifi-package,luma_wrtq-329acn,Luma WRTQ-329ACN)) -$(eval $(call generate-ipq-wifi-package,mobipromo_cm520-79f,MobiPromo CM520-79F)) -$(eval $(call generate-ipq-wifi-package,plasmacloud_pa1200,Plasma Cloud PA1200)) -$(eval $(call generate-ipq-wifi-package,plasmacloud_pa2200,Plasma Cloud PA2200)) -$(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC)) -$(eval $(call generate-ipq-wifi-package,pangu_l1000,PANGU L1000)) -$(eval $(call generate-ipq-wifi-package,p2w_r619ac,P&W R619AC)) - -$(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE)))) diff --git a/root/package/firmware/ipq-wifi/board-p2w_r619ac.qca4019 b/root/package/firmware/ipq-wifi/board-p2w_r619ac.qca4019 deleted file mode 100644 index a1b1166f6f9dd713fd5d45bbf50767a03703e902..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24300 zcmeHPT~HHQ7QVsoqvA*>0UY-!5feV8|2_H7=d%G%oUWu3h@orVC(ND#&VeZuK` z?(KW-Irr-(>F)a_pQWcor|nS2#b!s#bJOw_pt7d4H0sVsE7{M|B3Slt7niH&q z0yJJ^A7FrD0M@yCp(=n|UOX&4;LDZ>h4E-80OI50|MTVzkaFC>+kan3rF0F)me>2+ zf&t^{>|X6;B=9qo+57C*H%{&Hg0n#{N>GlJJzb{S%y`^^h~!x7%*Es9o}k5rd`-t7 zEe^}N#dh3>4#Z`{;gF&kBK5Io04$L@DxRL7eB!9j?Ebvj4Iimq-8O}2 zYpYh1sZM=0+SAfls?N^b{Aj4>Olytiv&_Ut!_cbL8vmO?s2M1t1?qsJQy)ybJr(6za7zghvi-RNnB zuGtd7qtTv=jn(RWNvy>oVrG8tsWn1*PnVgyX@{A3*siSvlx)vzd9^<2EB_)(8@tOV zb>wPoOHygrPHy(Yp~HrZGlCl5V#Dxm!{#%=wd{TOuV{{Em-Dy#$nN)7olYqe7Wu25 z-fH|h_l&4EaQ`>M^@i=|qU!?=KDkjy*K&!2L@5^_|qkNkDV6EYeoq#hyY+PTwGij zXuD>OtE;PE7sd+-;qyXxyaJ{Nymq4HS4N<{y{>M@4poK( ztY7cuMh2G%!}vU25UgM_IaU^$5Hkfx}my zXd6L_BE^bCB1)s8A_WoQsJ18;8iX8g5iDD%U^s@Q;b~YL9*0#QJ$9n`Y+FayTmwig z^1va3g|kGg=PZnib46U07w(1m;&NOrl0TPYS$LKxOC`f)m=YJ`Vv+c{7)!>JMaimI zJQkDSQ%M;6ZJSd$Nu^U+(dL}vGapFUIQuml^T+)~{;G65{dGE)jc1FpRq=TI>v${$ zPZ6c4$b(?LHHRXhU-B(FcdO4DN31pM17-S?#kOVZ|7D?VE8&`yp2K{OK8+HMk{tx- zQ^O80Gn!W=N;43kD>MQ$0yF|N0yF|N0;?E-P2x>h5bIO%r&um4Nt}eGvOFjO`6Ux5NQn&t&m2+dPrDV}!tl~pRPkp5zFy9q|`Sx38xTyA&>Bn9G0Lun_-`I=UrTLk6 z(Fo`o@dptM`cOO{gLfdMIy zGGzb*e}61&0w50XG03BWgc}~@^H3^YOTXN8z60(lUMfrLHS|1A`;C$L>A+%lALLaD0c=I-X-!uFIx3Ft3BE zSS{2_sCf-kC2yftLCx!*Dsc<70_r%3c0E=;y36J?SXqhAXU#aLVDG`U&Z{?w@rl3L zvsV@>)3f2c<6r@JfG9x40g87DOogjNDwP5xyi35OxKt!nB`n(g^>kE6EFZBChO;un z8CVW0QJjcvWvRQ-Ywj4-=Nwfoms=c1x%NqRx%T243`$M?)i1V&skS}Unlq0fns=-{^=DaVI zYmbHuw!CJ9ft8u0e%o;!;o1W(muuG9f$Y`cy#zo?$*lSYDAcZnmiD>!GEN`o_C5btgXZW$5~xh+6pzg?i$)LIRQ|Qcx@=ihetM{GH za}#TpJ!zZMB`3J#Tl8;i&9g`L2U6|BRE6jP_rn)fw-+P@r}MyTccD+ z#L%HbS3x;kHADyj>~@~0*5_*zC$F12hz5P3R!U6hd$dQC+XTMm2<6({WJ<tyHE-Vocu>{rX1jE(sSo^mYrw!DOeYi73`3EBz)7re>m4Csq2vL=3v4 zMcEReX`JZR*JyKeDIB=K#_u(J0wLU?rRycBV!*uUZ7g&mRB%wz%j3Key{G6?>AzA%UNG z9O=wx79Qr7cxHSzaNztF9skg#qQ7=Ds8gfEy?tHpUOrx)B^Sr|`(EfPXp1`*tlgON z^j5`1SyNc0-`;24n!Kcl@J#?b>OEGWOczB52HqPy+$lRLtYPhZJf!JJZQ@t>?tRi* zTP#lu3-I-PaJ}M?Qi=1t*!rHFQ*lSUcWu~q|5nMx}9sa{*$;qHf@4aJPNA_oKjpDQ2hKzN!nJTfw+kdRLrY-$= zRHaY;vp;5?i)!>c=(X#1=P_-rLdave4H&9E&)X55;Lp2h(6nql8hMDFePghyJEfUl z!`XZDLUoBEg&z>W>Hezpz_zR?u{Za8+paGXw7lIc*`1->%{^}YvI?TJHAoJL>; zAn>8Tyy0#wHt^_csa8rF)Kak^EG!iM!C&17=7)svLJC}+=9f3-^57||y~m=h)6b1T zQSH|*S_~WT(@iu23qxSOM32Spx3FwijMw|Q_9TNH{nCsxS{4R7B(poIW&S2W1mfB| zrRD4=@*w2Ulbm1>a}l9w+UD8>T0q5Ci69~YB+8(opfRYZ(261mf=xzaOhnQu z5o5TuphLXdL)2wrqTp!EWM(D3GPBNFGwb~8b7q}6XTE=B{t0t3NhWK~nfSlEs;j%Y zsiLcIQgrVPyXviX-=EqIRkfdf>L<&Wr7T;UpO(5ZC1>@rl3b#uriOs9VJ_MdL>$De z4fQWygW(uOi7~>?t}uQ2bI;jTfF-k>#Wx3x0rb^Nu2c`1Z^tL*^zmQV!}l8CPdZnQLSC|_KV3`LJNZ!6D*Y!`dl zpy*0f;?Rwr)6KQzC8|_ofdtF`**I#3U?YoVGA>|=2m6sHpu|41iRJyIf7h#p>eTgN zS=Z0iw=S%VTNknN{?&b5dB+m#!YjJ2ZR}cfOjaMflq)Gn%{*#R%;BtFYMgC_;iW5U(V`JbqPCjQ&jC_tjNW8>PjMR_V>`t-?@sistlxEQ%S8V*7NzW?FJA49>Se8?FU7~t#Y_b)Q555ZQR zs>OZV+UsyV0@c?ZI(Z#M)Ka1`#K)o_mqmre$I9h0sU#vCEXRFNGA1SlRRpyf>vP7( zhKfik5-pQ16QxPhM70eE4;?*zvZHgfL1Y@kJ-ZCCRIC(#E*3>dBa{(ELDC>mxHLza zqs;j{M^q>+R2CLxOS47!(sXIMGX3*((PHUh<>I1LX{tyiHFZLFf!#FqDKpd5D{PKB zKYSnwmIi+vEQ*vyDkF=QOP7DWT(nZUQn|8do^;;V^F&LeOO#8BsFT3ll1)+2yM2r1 zZtZd1b!LonGMN9fuv=`O7e{@ba7~KGz~}5^lrTyh2;ix~0gQ#)D^apQ03TokFaj6> zi~vReBjCjd%u1gniWa|^{-S8LcwzcNQI>cL9f*>xr!U-m#N5)i{`T!hw=tCtE^EV! zPaz(fc$0vtC z_Ai_?(8KuYtE&LZ7Z@0z^die1g!5MLuB=+Ku}&#(m-x5s^t` z`ehR$;@6K9hY2E$h!Fvg3Wzsy;PcQi6Z|>;iZ62l6u*Ip_GAq56A=N2{biRS{mGYK z5x@K0SL7bqDB|F`2s|AO4Dt1?gcS&a@bUGV@-Bq)5aFIh zxY+TG)XE*TR!6PQ6&0`Du&JW5O51*>v$ucX^7X;nAKw4P<6nJYe*$A2&%P_y36q;3 z*FlTKt@KJLxdvL4(@L*`lIx#E>8Qw|C{voL%q*JkvioautM*u7 z>0u(NI4?anh{2)^YwV;vMnAopXnh$l=yTT=fMbI1TX><6@iM1@=}UlFBS*QphjUQ zzrKPhKVydPH&po@JLoziBH)_JFTmk8CID^>IZT&_nI}UodVjEKFN}JVuTicI%6DX>o?8~UBPV(kkfeTL)u-MV#}6#Ylqv+BD1Tva+0 z=+Nw@3!LjpP!N#qguYf=qRtq3&(NW7(r!>^>W8&G>izjE62r+BcBwZ~UD9=hV&w3Lx_8JfMWZgA>rR9gIt{Puw`rEL{I!)~ud;Lh=umsg~vNM=uduXXpP zh3Rvmo}04&Y~E4DzKE@Xc@GA*pLjtNvvXG2!;Yr%td#iBaQ|EHwCpO(NuL`TeyYFp zWZFTQdgiK6uk1dZeK@XW_U6yJtBV&V#Lps#p}vE=^Oq}AqM|;$yzgxG5k;MN-J`43 z9a)ECc872Nq_4grCnHW09(eD)-8=L1rShO)ZO^JV()Ne0pRwZZm93{2ACm0~-FRQO zdsA_4a;(Vj_Jzi}75VbS(1^CK)o;#k3@;1Jzjf`EcT`8BYeF~Q?%cnvU}ei(VNjrmAUc9`wd&$w5x{%G6PStMBT@oXagmk}MxqU@pa(ZaQiIeMJov)T}6ldSO zTHm|sMB;()?Or=^@W3$w9)N(eY8wH}z=B7AYi+)&sXQ}1F)l6^enDwN7Bgp#d`_vq zVAM87bKhxt{S=q2&5v$_rq@q(SsN_yV;4riF$DOMJ6xU5vEF)2Da@}2?z3%xm*RzuA!LLvllPLXqAEaLo^nxrpI?At?5ro_I>ro%c!CGusTo&nk4{Y=6XOrJ( zpzF&bCXoRobHN3Qxqj#y4Ie(G({1nJyAW_UV2)v6Go$SqEOShUVCk8-M`P*N8?N6t z-qX~)uHg9_{XHj}tIJn|raXs!J&_3d^@f3=vpo&XKPk@u>3OO^5|@5GkqG+rP@toy zvAMKB0R`R$t@<^pR4)B`LIIQ*dx9q{4C68IIpcPt#HUiB=ec-&S8w)lMN{~W$L}BP zFFKjrEU9MGuRk}i<80QE#D-a0KfAFGtqWI&Y-H1~KRK|eWAW<=jp3Ca-Dv4u@M=tL z*cPl`FZ5Z!zkl|vs3CftWq_8()UWS9T#+sN?A79Qsdwwwzjw+9fI`oq;Fr2+v3Zhe z@0ha`gANE=NN00`&+zm#>$OmcNx%M|cI(&AgclB&%YSDo&(Q^!x!L&j@#cWU>OpHB z9LSJLBu2|QpVU-egsDCUd~6_K{d(#S`kwhl+6zrS&q_RxUk`VYV+OX*i=#ffF92}? zK2T$nFiIQ<;Hkj@jD;JcWB~`qf%{S7Xc)UO0vG{|07d{KfD!OI1V(e;F~8pHCV`g? z`0t~FKmhP^zP>GfJv^C)hu%md-e^fB;R5rK&*o*uXYz7sL>Sp+)Mo+s(1HQNPa0vg zq!I9*WfX+r6Ue8Kvl|TkdL&6H0sVS%5Bl}w9_iJ`BdvOfvBo{Jje7Mom;N`vsV5_6 zLpZ_f5WxEN=*`nuzuvq^XqScg^>)F9GfxBr_^cT-dGuWNL>Q|heZ>6w@xM&4mtVig zf?wbDU!(NvVMw7bBBnM$fOsd#uO|;!HZg0g`SpR;{Cd83loqwic<9$7(|5ktq5kc zvu30~VP}z1+2x}=v;*tc(@0qE-MT{()l>X> zF!(MHLF&LkR!x6GDzg{X5QH^A7Wu&@gUKF>gx{rbm4pkEIKTC~;b9Cgm{O(;-B7U0mY|8yAX*LUkH zb%ojtZ3bx-XcuS~aOv0oav15?_v&}(R+0tI>R-|2YL!|gmwx>(A7K4@+aCu{xFN!0 zuzj8h0;4oRQR35WoX49G&|g@0eDT3}b;Qe8&X*ip(h^%etBg&*e&GD-V+)()RkJoe zx}xsLeLd}fq>@d){!*W&BmcFOy%8HfxU{)F^EJi(u$S5N>j(StURCUxRXQ`T_d@B3 z`3EK2L~Ggf>p$v!@t~qAtYqf0W4iSxQVvLV&M0KluYc5A)S|4Oy=G=kYtM!gsZG+V z8HH^6^#k2|PAsU4sT3C;>@Lw}9!ad9UCE|j|9)@N$wiHEJAzl%oXu}VDhsn-!TR;y z^vS?u^#%k2rcR$RQxqIJYj$K*G|Ts(Ewwd9A2H?Yjj!~!fUR9!oJ^2v8(6Dl@s^!ZNd(IXvtX7rcQy!sdhr{0QJkNEURuO7wU2z{Kmf1?q=`t@;ZLWs=;)|^Jv8_LwaN_b#(Q1#m<;^J zBjav>nUiVHBwmv(BbMd*8QJx4fou$@kF;&xXYnJ_n+tGQ(@gEk2pgEZZ!ce2pc=Z> z)6ra0zP2ETOTYf{FG0T^MCjX^x0V+aWDE`Vw1eP%aluk9{rbnBfqwna`#mS1g_jBz z4gDMnsL28sp^~cdm7tY>qvtee+Lx$O(eqs>fc5KbP9sbKunCceWEgmB%YjAP6G|m3 zA9mCo%BxYn5}L!NUw^S}OT(hA@oS47u)B>Q6IkQ z<%1kX38Tb;0G=8gz*x93N)~W%90(94j-FySMgSv#5x@vw1TX?#hXB^E_qtQ=^#dLy zU;lT3Kw_jT*z678d^Rf*Rt8)AdSyy-axy&WmPv(aLFbZ^662wN0=1xf#{LP?64q=S z-J5JeLYrkY)pQ=b!OACZGOGfQoo+$xd%+1yyNG?3F070pT8>sFfhrz#r&_a9`rmzxj~yP1wKrM<1do z)|a??-IuubH(%n54<`{{XZjH{@B0y1FZdIp&`JJmxpAyq{Q9|bl}Z%R zx&nGaE+;UqAE^^y>}x^yjpVQ161_LH*CPE$XteOfLQU;fK&A5Qgv3y{4^E zuNZz`e?iv!6VSGhcTSi9n|j7 ztTKEIooiATm(AtUum8nE(64`TYq(2SuidQ4HGHV=*4Aq_sSCOE>wobW>({gWS-13g zmw4f(#HGB*ACD}y`x^G?Se4B63nb-l~* zU7hb4Vj#q(Z1U?#DH(VGo=6(X1%7_gqS$?wb>gFmfB@F7$NKf=1w6r7m|rir zQ-V9>ECPJijJY`VOuw`J5NdhMuOI&_2YdPTDhq!7wX;_G_2htP{dx&OOh^2BKaOE4 z6viZmem!uRv*_rke!Yw!KDBO=onLRA%lg%&*CyC+F?yI<>lhn z&$iUBCn!3<5BWt_5VH641JFOTgA0znCcuo&>eo+)U>d{(H^$PhH(bAQyr-#oUBUA= z`g=}-9Q|t0l)u_@tgWv4Cm>OO4Xpa=l7ajfb=|7Ac;%A zo=61!dMMD*)7V^Epnw8zgI4_-Rq7Cjem$YU`t`OaoBP+QJ)s5LI0`?<#p}CzvyUs9 z!goA=|6qU7$>e59HJg6@xq%&LvyLP-%-Z_djddr}4$7)SHnQp0pB&iKvH10b#_-CI zZnX5GH-m?5!TR;Wp9g$(_?_eE-AP z`t|1W-yGO5%VAJi2OV)*b{TGE2ORN{<}4Ft@u zr|!@1nQzm*(B$*1#Pj&|R{vf`9kP919QAp^H7OngpRk(~+r`y7A8Zy|mO@i%nj+b+)M`3PYBdaPe>ULdsF!u)!>A;SfPjsTxE zVzbw~}$n~dw=z38fk$OOPA!{-!^f;rkU=fx%l;F zp?OrF3-s%`yTzVjL*L%L`t>cL?V%4s{}}o=lY;#p?b5IxGzIp-S$g4IGlFHBJx5-- zY>NlYXNm|AB|hE8c`yPP0gS-2K%l6iQrrIJzx^Jy_4}uTaIN&w(-4U0hi-rW)10S< zrxj195x0qc_@TozV({r%h^3JCB7l&OhSHz^?z`{)_=i8B2H_3| zd`Q1OA|m3ilzx2xNQ^<=3aUKhHI|3GrIZh4rhDMJJsZCs>(`U_p!divY|MsODpra= z7mFgK5z2_7ASrrEmm|$l=6s$bDwGx~3yZR)*`j=Dx-?yx{&~7+v2?L=aZ#!?Riu(q zeD0GSow^I`CYl$AA;KtT-O)W4_wsd`gcj{dIhqUNZ&p==|UemxYx`t`QX zF(JTv1KcH>XALr7lrTyh2ncX$aP$eu@VM!%kASlERT@Mr{V^6O2j z^EO~`bv_%-d3v%fe*N<(pqIABl2#(f*UPZab1)G8{B~ZyUWWDSg@2k^dWiMwv3@@M%=eBHi^6TfNTJYy(z!LMsRR2!HhJ2 zp5EJ8@l*(Q78#XYKFUKovP1eqzO?*`0iDEaf9={eUiqj@FdrGgj)GQM1-Ph+yJU5a zSP#7tB~~P`6C;2Tzz8^r0Mf4q-FiyD9t=L!xrJZf-bnN7gQghy@n-${|NZJejr@Ab zhxqkV|MA~Uetml*&99%~OY`e@l$-eVa82d%z{amfDm}(P3eL#oaD*(W#HfpdbZMOM zAw?jnz6hfQ>O1!P*ucR0_0%2uJ@bva7n*#Ym5e{Xo^Ad*<15;rX53kfHf`1Y0>?B}Wy{Kzja<-K&~Xb)Gs8+B(uwu3oEN%f+vMJcPP5 zs5_`BQ7=<38@{7Gq25_mSXQY2Slgv;%+F7Z9R5)Ej;5w8M-`3OERTm0p@l(Ri?&*w zqs|$=2?eUi0`Kek)HV6bRC5g<>n~`V)$3IesKBSgig;qATVJUw)MjWiNUK1*K)Yc0 z1M>R_D^&`^9eua9PQ5xm78UsAup*Hd>DBMhtt1Pa)xV<4)he}0!(IJ(fI3?xeR6BK zS9d_YJbyM>-~o)mp5T=?6L`>krU*s}qr`!L`=j)iuOB$S`q;uIdDX0qkFKaYa$iq7AgN^I*I(+>bmYI5vNvMm2bVUtXTGM` zANDdEzkaYU?^VUFS*0`cdM}ion14{RO|+JcU;k0>iw6}|VI?z{9n-Bpk#az?b4FoX z*XlRtH-?u5=HI&Z$~&qf(KVr)AN3ZsD640$nVHktv*AQ)leB6^;qAVT}-98@L+d|HuFeg{p`w1UDd5i80ohTcS5HTVZavbhN80tIe!bAg ziTgJi0nD$*{Ce{Op5QFZuNT}Y!5wlI0X}QSOddU#?QB1UT3-14`mppckyMR;GWwKaKbO?Aq)s_NR5>dF^V z$)l}%x71al!}QeT#w~T#TlVaK;ic_$TXt2ayi_u8o(1QA-;cnTnsi7!zZBJ+)DN2q zf|wRSY1#uR`nfSR?GZ*TIkTG-(torJb zf(7Vt?Bic55{RK2J#Ecf%L^cJu&2Gby1ckx>ChFF4SXsn@K)P_@}hzzWP#5Tl8B-A zdrm+LFBL2r`Z*L(lLan9B~|4sRf$mD>E_z<5>=|PK!RoeY#h0NDHpe3;}np|0z`>V zw}qZ(;H@nO7Hv-`m8^W&QFkb>M)^u;&i$+Vy7G=C)`eGeUEA2T=$NcNc+17MEe(sd z#;=JgxYxd?Wkq%J#?YmoUTJ=J^)Y3A)V7bV9q4-LEm+gtar;D7)6(sVQqiK1Az!Xq zxiNU@rHj>_`EAc1h^)GMqp@%9q3GJ+3ZdhI`^S!eT`E@S53W^!T1f&q(8+y$eb9E& zB>1;H*%$&YAKs8ksaVCv#=vi!e9oL0`5d{t)DNpzv7ZvRdN*t+Sw-pB|KlIujQsc` zx&mTw?nnOp&rBcU+(!il`1<+%3-Zl`B^7h|zyJN~zfgJI+F_`ijdP!93KTV7E=^2y zsUTpyu`#^ z;&U=FN*E;$1n|`00LH?NQL=yoA7BJ90vG{|07d{KfDsrI0nE7{6CRxCfe6^tv>&fA z^Cg<_%{N}-aIjrloO@+Ta&mG~VysLmOba@fge3Q6Qh{2~J!Ag_X*oD;o>{SMLPP}r zS#g-;*aJT&9tcpeMvgt&w~NyVxm+TFwN+g7~RcJu@J1LoP=Ear%AzDv8?Tu*3{nW$!{b4}osz zLkQ0JiZ*Pj()Qo}71ur?-o2c9TlG_Kqo&?JO}%ltsCey$O%;_@+V(S@z5N51uMgh- z@cu6z|LP0-6BzHNHZQ_?l!ZC>9(6kLU=RX)){MD$_DsL0qKP^8^nb_k+uO^zPqWFn zpY}&9oqLjV9~wZ75g1HkbMDLB#<{;`jdHv3J`_;L_azx?ID001t|eP-tTREo#{OpJ?Oswh29>!-M*tXf*AwTsrr^cnCW8pk&{rtJiMU@V2pX%-C7O}eZ%I4nmH>C~Yt!z5?E!WnaOKFX0 zd~VCt!2>_bKAG4utBOtM{*$|!tE+nwUJI+yzu$0SNt?V;{0f`S{Y8CsU+yVcgQ()l zwR&CV8}fZYWo$b4R|a?X=ber{7_y`D>Yj61ZShSZTiA5&yRU5NTK3kQdhzBn7puE7 z-;Ajb-h_4Tz4vp1NA8&jIIF;6OXq&DwL%rds&h{WMu7u!?mcsE<56)VV3TvtlRdzf zWxzWhcbB~)#TMrto>ij|A1f8E1#gRm$MdLv!m~`eI&xuJ!k^@6M7)t}KLCo8v4Ieu zBZzDwjhHr|I84S*%zKhI@9Sse%@aPkz}Zh)6uXaIFW*ll{PBBl4@sSS;KXm}y!_Z5 zoOpL5%f+>){kAyq?oP*?d-L+30~Y4oI{+FkB5VZstQj-8^<1{FN9lO)Fz4Rg|21vb zUptq|g9O@n=-j7em^k;#N?%IJD=Ao8p0l?pWq#`X)Eac#DTDfCb0h!Xv9#{t>z#9u z*8LRtVG9byJn9aX(z+*HrFAbOd_J{q&x&_%oy>6z7thAP#k;4|sXaUY{f-@)^He?4 zOx4N=>c`|T8X;C%_txp?*dDEWI9H(NZ;ruWqbM;(*x41PPk#>XIGhXIynE;BwYT(G zTK7*b-)L)7R~M9LJ-N}-+FS{$_lvl+?r+`!t^2R9-gu*JSM^Kf*-x(Zya|H!MFp8$ zTK6~afY$xj127g98`~H%7?<4vqu&qr}lLc4GuE0vG{|07d{K;B^RK-o4kI zay($6BH(Jizfi}?(Jx!Pdw5a}�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
  • h@PR5m2 z%TTW)LzrvtNHlR>&jSKFX?vYx(rd1-O-JW5>4v+VTI1U5o_PzgC&C!O=Ng{vJP;wC z$H=S$b3@?R^?w~*OmOL=fkPh+teSq1?TnlU8z@kwL40n%q>5s*;dC1e#Ywiv> z`uZY|OyJ}%SrvKM*DDD)_H#wXo0rJlUjME<_p3uSwP(KUFEPYhu< z8pg9o=q4`$HAjsa=bpf2&6q3KzMmX3^@3;fshL8(#MykKp-ka~x&%}OY`!6QOuoHb zduR{-@KJjhC;Uk>+*5HbL+kGDhHTUxY5?DGPsB0TJ~3`rd0G6fLnW1a;>-5DoUGTl zH|5%&2{qBRC%N_py7mhQU3)f@NW|3LD5Y!f;V4~uXz#vhn|A8j&!IW*Q_;0I?ThvE zxrlC;m1}RJYY&h0KtOkvfgyCqDpy0_6Zl*NGTaD~z2T};(sFWQom!KQ2f_zTdr2O;|A`dy%5zhZ2pv!%YQC_iT{o38!iFG1IS z?0V;EXki2B<$nYP6l4JwU3(~ib?vQAsF|=b?)))Wh4DGa(0{6=cGcdP!jSb3S}Tub zl_$LJpTVSSf4RA&deyGz&7nD?Ee9LcmBnrMU(2Lxf9rH<-P*m9Lf)!RAz!8_8c#XQ?ps-+W+t5zkI{4 zYrhbdL-pl<_~E;6sk~0@FjUT@Yfn5=rp@&j_C(L9UNK?Am1|EvoiWrbCmw_BIDi`iwaL7$hnan;%=?KqL--)4iIw`RbV5heuiR;hc!(Ia9K0v%C(=S zAvm>Jd%5;b?UYgFm}_sswNF|RS5s11R&wyj%LLax#X#47-ES;$?cwdEt8(o*z8zYq z)0cl9x%T%k*Pi2bwww)f?e+NByo8Gj=)q(6To5Jp&OSdWm}~$1Tq{@TDdyU{!c};7 zeb95||N7VOCk=V^VbF=^l4~DHeobu%L2q|GkLk)XaP8H7lx(?P*Z#^?bX7yyu+E`x z+eURxtJcoz9OrWFyRXsKW7TcDLR&kt+p8U*M$^OW(!+Ej!QP;W_iV7UIy*Dgi~vT!-4VcC zdv~7!?l*oN#a`#Q2nLvIue$XWLcqDNgKvcV%Ji5(Slp7>=t%6%L=0TyRmj>6%(Z8Q z1}97r0nD}c!W)WW z&`0;7-dOOgaqZ-ckjGzP!)uS>9ecg?WT- z{{&wmWs}XFYgO0YsJ>KN8!#$Oo(Kd2L~OJL1Oy;rqs_+i`CxQWdyit)f@y+Y!PkQO z{-S{VfX09keJ@!{7$*#C%{a<-W+XLf!{--F>vO>cR@^1ii^O#9mMAd+fnyi}i~vSp zrXXOMYyUrg{P#cn{`bFw!Ad1j5uii@1pJ@=`#=Bn+i(8^Vr;thGFeI@nH4>K`sY76 zUhAGo*PdKkpm#33+Q2k#7`XN{p<2(iZ*9|QPmIzxgPa`aa_#A^JRA1=Om20Wi5o#VdeNW6?M|17-ww1!7;k~bn?=bXdOs^Ni*pnOM7t}S%Liy4scgH)`4a%Kz z>G*B+Mde|6mNaVohNfSoRLG?v#J8}F-j9hzP@q*^t=uY4m>AKVQyo$i$fcTF>RyFH zzEK)C{;~SJvRs}a6%hsQJ%BICBC{!!h04N-Pc&VsYQ<*xO3f##i;BwZOldL{XjLAd z3yeL8k)VlDO}DBB>RmoQqWM78ppeUDnsHU9;z;(o*g&#{{fg~Wm&PAJmnQCNI@NEf z$`$LzuWS0$%}{uw=2KO>q9!{#HhBDw`aQBsVMLeiKa7?aFHTdZ}dM zwx&Z>so0bqNfh|(fdo*xIo__WQteb`PTYaSD&-DEE_Cw}V3{TrLTZ<~R`E*qVzR(v z7=tb5mNyf4&|IbnMhTAV;UA8JaRGX z9m(OKUGuW;_wPOZvNGb0Me<8Gj$FxTUD^~}ePd*wI``a5zX(2bwzu$1(ovCO;l|Gg z51dbHj4EHeQ#G=+M|v)-fv;#9+}V|UTv*NDb!Xu4#k992mHe#_hss)08zT+`?ra#| z+8y5%RI{LDXr%Uov@@{{i%M0U8{bVj;{WRWb$17MonL)SwBLXGqr1wXO`S1s1(a*9 zSNE-H7T54!Z*JdoJf$X3J}>*`@aykM-wrGH-+5V6){}WwRLv_M9IjH!-W4DAmEY>A zJo8FJTzNpjmmlSximP9|&-c~AkvDp?&PN^<>}wl3*qz!OT_-5H(q7iIwtC4Me(Ns} z9O_u}PDG_(XUAYkd-|#HD*nz3m&-b2$0MrzcAP%*>YFJF@pgXNjiIWpji+O41NXY^ z#K8l{2+RNkrmDOFYk_)Wz+YB*!$lF{;o|T@GzY#k(IpIX?OozB z;7&Y41auU8onz8C*Vm?_^O>1y|mi&$RiVU@t3TMJnZY0gnSz3ii|fek?W7&eS1i7;k`h2 zep}nXV-HWSIq!pA0;3VR12&ZyU5~SldE0gnOA)_fJH|vuMNa4DD|9B;zJF+Fs1L4| zTCMJ)tg~}qaBy(IVgiv9l$|<=>q;0|Lcd5iWv`>Xy}c7m_l4M(2L{MWSrb4riuh*l z_dtP4XJm^UFz-+;0xQY zT#?Dx{EHVazE4c+-d>rE&9_h2UVW*jr{@D|f06k6rZ(JDaV{h6>;_0>)c)f8@S>L) z?y309=h`1xO8v*qgu|}ts+UVjcg5{0FN@z@T2>KXw&!INu6^=y9oIfRFDpHMf^NOm-2Q5fxvy zY}t?BfA1j^%tOFCNTs(~0{fmoi4eL^H$~t6nsV<$!00^eM|cCRHB;_A(MKX_p)vO! zdC#8h?Z$Qe&DN{q1JAVvTqfDw2G z2z+?f1I_Uuo>9RsIM1L-#wLndYKpdO$;*_zvdq2rfj6g6zL+Zi z=lP!6^0IwJg;Wd$!Fwr(8x!|FMrYBHgo(v5F{Bq38mjf|iV;FDx{8DlsN7 zF!!FilO5IH(7K_^z?vS$SAa&zGs@dQ;kiTd;hWeBoM-1k-suItZ7im6{{7i z*|_%)J|(#KAFEF&OXcbE^vOX@t!j&6nPM3m_x|B1aPOboRKKO%uE7wlq2NkWEzf7tP*~7%W zztW>@&3-HXP|)^|uk37*y(Kvk@EQ~MexxVsP09X6g$uK~`U+2{91Ypc+rq@X|D@|@ zM=kn-^v@b#6PISSKu(&!;IE|s1xF&x0Xy#ya$f~nhQtrjlf_2@|Pb;W8>aC zX!P^Ylb;IE`k#tD{`sff=>Po*sJhrJAYhGq4^O(`akUt}-c{>`g#@}%jCyho{R`E4 zVZn=BDMmi(2mC^VwO&}TzbnNoObr)F0`9#pLJ_cuffpo(V;F2Q;NE9=Oa2MA-)Oh5 z;rKP7i$C`rNn<9YFIgo{r?yBqMjj?M7a0`p1_uO4?!71G-aCt*?_BOZxsEiGchkzf zpUJ@Du}vQWT-J=aaPOyY1kP>QKJLA9`(#`@hkvXrS*DFL#L^$OaD|q8PcXE(aPJfK z-21`}@mU2qTZ%Fc)y1z|zAUkv7&FDYzvc^^saeNB_MT{WNiXswH1Fs7z?)4l;_WBF zyPpF;OeT>mqu`@>_eds~jsEs;XH)47c=vXh2zh*NTF{htZ<@}0&d$3h`eMr_1~6F7W80dg7Ji!UyKPy0^I z*m?I;tJl`j6=$v*JasiL{bb-;bF-o>rzrKwwa%vcJw@wtR*emHo@lNt`+3fav0?D4 z$_jFp6VGRF+?K?k?}o0u+q}PQLs8n3;m+grrA2u;vavxTTTxDq6bhVbu7%hdszA&V z^j-h8hWc$qt8?O@=sWehi!veG<<4d(x?UPPcCGV#eMM1$G*Me1#<+i0&TL+t#RaS& zN+!<)l(>x3)$=^+-T!8;BJtIL)T`Z9O)K|AZ4Fv~Z|HD))`{54z~c7d?d_{hh^qWb z?skrLrf2D~unNCoSH}hSj~M|Yl`Dp&HsWur-Wcm3 zN#sB&_w@82_OoVrd&6h(DDxR;sVmO@^6mUsL1bhE{6>kx!$IjvEH3nN8I>!>QO(d` zOG`}+#gTvU#o4o|LF#$;0-wM9jnb^wYu<;>^YQfZ`a7A`12L6%HdIW!`&g}MS@NRL z0MPt_^@ot4K=25Ihy8ZMpkPEq1W^&So$w;7GR9RZi$i+0{8?YfDyn5U<5D%7y&m% z0Bhd6@x{kOcP#|Cl1;egbFI-??Tt0wJv^y~N7cfR#e#?k5%usJJlBcAx8_p)3nU%l zVYA17_^jz!3ynFrfpdB9O-P-{gF5=nz{-rLH%PvXS8 z&%0=%cTe)}{k7r_@Rl-y;N25~_e}4IA~u`z?ty-gN^kb^?xC&wrtLYJcTe<@XhUe! z5HtT>&!;!aY<8m0$ANcmRGPV6TX^?6oqJmEo<0)a3qWl1=FPKZd*KCV^6t|Fy@Idp z{8R=39M-$nP9L{iVa9_t`s0C5Faj6>jDQ;=P+UxF)ARYh^C-E>yj)>!LT+A~FpZZj zOco|5B>y^@w_3P5VRc@jFp(z}QatZ7t!?T)W*5=z$z-|~u}gzu6C_-oq0Btq{Z#et zCr?fs(B!F;R3Vd16ZYKoPsvlmacPrReqqm*SYX4AXx?jZE;&rZ~7wkead1(W9{j%td)dq`bVm6Mk&^$%v!yC1oDRIw>jBIeKTZ$ES}e@lEyu$W2j{>s^kU72elLP7)` z=l1Mfmm8PtAB6Sp@e2kcFtZStstSiSz5Cv#ifn0Jkt{hjDk>6wL4iXQ5gslMFZ6a9 z6%Ne1pILJnkH!HAaOJf-I-di&{ybNKdH2AHcOqxsl{ofHeR1`;T2+(7UC;D6A(`;)B*`S(KQ#c#^*|WU8X3>Vw?VoI=h|fiIyR3Tm z`bNQH=G_}*v34R52oSN+2A|hO#73Kq=kvknqV^uy_3kO&{e6E?Kz=}Dz=*z=9Ge2( zJ!#ys!)GiEj9VF|TsAL-;sQ)Cn#M3nrid_|+l&%ZB{+r=zzARjW(oq^wiRp?i^E_z zfBozClZM*%MC^b5`0s!C{qKJVo?h?%r~m%XfBp8`|A5#+jP!SxO>R z=hLTu{u330><%*~z56(0TM`?s4Y-)c1OnE(r=D$$>K}2qq08kN3g+FLzJ8wE7{8#d zQ5MRVKDj&Iscum2luOxo_oMfLAPxmu)z!+a@`Q;I%{kQ}MS)z(#=F1w0C@LgHifcK zSvc{Drb|_=*eqYk#=9ST0KEH&QBAk12I^ftKBDmxXzx_Nr7Bmf z8^5mUQ#V85jcmO8`wxM44@2$IoK;t=ilIwt^}DLWN;w0gLYqb9cbe*B5zY0&joGs>s6>AD`gi8*W}A*B`(8_K@V= zd+kBn+6EpwLyz9s$kMv@Y)5;z@{TM+@$M--tVE#{RI&2%w`|){yr)#va-prOw}0U3 z$gMl~K70JDuWV01{aU+WU>}X#82QNdgb!`DsAph^&*zKzdHg0?fh?JyEKbf#ZlaaO zNZm0wU#(RhvmHd%5~y8k2H@VfdQEffDr>@GttA^+Tzo=&9BTq=RjdiDRk0>?*=!(K zY@@L@VPie+klj!0$M@p}3xgAa^OlL1@t5(|2-hU6$y+8|_T3t-&xLod*4brPPo&M* z57k+8g3b*!_B%OP@G~@lSilbvQoQ>VaSET-xKDX1v!Hk1-TeU=wHFE_z|8lCvvevm zZRYFUA6QEL=UxQ|4!ry1L>=!wKYioRw#MfrB_<}88*=Xd?RyUo^qVjLpHF~sFG5Rt zq2gkM=K8>wCV|0QPaWre!z&wK-?(YZ>sgz&Zpy6_2dwbJ7f8vOcEn4^fP?_OI z(AW((eOuhTg<#xrx_+*TGgs-ytkmo==yK<9{fV6Iu`6R&b`BqYJLmOSS*&bqsPjZ~ zW!cYjR*VgUS5;P!vz&M;J91ePgZc;GK3-6im=YV`KUDvA!Oqx}*p#tBB3n^TjuZ-< zYOXEH%UMGfxDvAjT^(v}D%v4k5gT*$>f7%Y$P-t@E*-nv*<4>*v|buJcCGV#eMM1$ zG*Me1#-MZ7UA!D^9V3L?5+yFcxO$$>wp}OE>z0;>Y(LZfTJu`vl7k_y-y1sIo^>L& zGO)OPczgS*6QU}=64lwlH&-8AvOB2Y?Q>h-UR4#dFR<|Q!TR?%ok*w(-TldMZTp5( z@wFlQ-f8-I?aI>F9f9i`PH+Cj%0p2lfdyACm$hX#zf>DsdiPpQ&(dRI6@JC8jtlM| zGXhgxWrJGb4H2>P^z`%~_OoVrdwb8;n$JMvw!}bkl`S$d0)C^!;o+cgB^DQYxy&jX zGcq$Xs^`ozaqjKYBmm() z*(E(DY%u2@bM9rM?#a0~xUFDxnO-mU#@zBvEFLtM>4H(hD6t@brv?i!M&X%&lF@+h z2}S@TfDyn5U<5D%Zj1ot+`I9`chjMpQSN_m5g?3M3l{psHJ^nlTrtTS=N>qDadAsx zBSk{j^q_M~Km-T+=b|3*Q3a}hF6p`AoHXncp>6N?jieC)$DZKchXDa95~xsO*ob2b zKM9G&At7QDy8vnt5S)Hb&poK(B&;rbdd+F?c>n!NU>^}|Hn2}Vy>o{t_C6SqkIIG69WbUC8`qwW zJCZ+dPhD8+UN6aIhljQ9?EnoIacu;+tQm9R+`IND?eCr7sengw?lYfe^74dv33+*$ zDCKF21X)Yp%rt7e`Y{$M&hv9E`O(EE9XARD(AjPsO8*WAUOB_ zy#Pcpp>y8|4$0xR$hr4i?KI9ki_Sd@=br2>)6P2Q9_!p|aWm1ucZ|;cY^I9>v8n3Z z{}*MCSgO~CySgSOx_al$Gp55>E@LTmCalcjF<837blOZni5`pdkGv*?Hp7RasslaI zm4Egix8ra;{s#|K7wL(Hu6m;3KY60B?#x2p$-L0QdtNB@WpBjupXIIpFYNq&;ubIh z7=f9DfMw48^P_XWbZJ5Yu@P$x#8Y!Ix#}==FYYDsA-ot?2^``v%^l3Sr|wlp^|!2U z=yG{}f_3gqUq4^`gStt%TfR!_KXL2BreE$Zk);XPbnZX81A^>d-2CvIvP3S00{`$~ z^Dp<5tW67G)43nH13LGb8!DATk)0aL*Nmu|6{Xp-#1J-}duTy|KECdPUi0yL=PLKf*Ghvm_f)48#qu<12%FCR^}C>Rueq%{Sy?Jil?H!!OLb1M zH-AkcpH1f;3dEuhM}MhOlxMF_4Epen>OI99`LaYmHl6$HpJ1JP(`jjbJ`-+;@EFXm zt9b;YWR8h>#060@?<9`6Hv%g4#-^m2kllV;K5TvM7pu#|<%@EebnZ(}q*h0k1a5v& zTHm<-P+U<^-n>L6o%<8&Evlrt2!-#a!A?c<+8RlzAdgAs{z9v~F=@YO$AYwvPVTQ+ zQxaXkU%{kve_LI4a^>NOk_E4fy?3ZlS{Av@cQupFy{c=|iP%GdugzWi_|mJV;wpoR zUrb}txo_)!^<>=P;MZSFy?>?r-16G6z4O;G>D-Tew5vVwSZMkD4POjbytn+Q@QwLd zSm)loUn_X@GY^5ODsW((d;KE~OP)Ee{{`Am!LIXtHy#@9E!D)HHuGjD9+9&Uu*$jT z%Jgt_K4%U1IjPqw=N=w_gW$}P*jUm@h>I4BwH}Vm09;&unlk9z&o|b&&wW7Y+!IGO zoqN|GC+?vs0;JA8aN=p5`<51jdM}NPT>oich{${6I-ma@u;ea5Y~-h*VIp?>AE;PQ z4-p$CV|PC0^Dlsctzqor+k7L1Ridn;jpo*~9qr-CJF*Ps+_S&8<&c6o_Z&dNS)MNh zxU3mt&ON1b|GabVU-0-p$lK$o?%y84xffNtKIgtdt8>2=`pZG*K52!HbAO=h;Qp%m zs`$MnE0!%!tXXELbszjK@a|_FXUaoyATKBiLpGRbAgdsdv7Zbtf z8HgWKGu65`O()K6(Yl9gg$y@8I48Cc?FI*%?8O%sz&C46&BRkH?y%C9wCl=ft}^Ee3B=jF)QwC-=*2Ce(= z`mZ(AZ!21z69+}#so!0c36l6MTK7-@Yu#JD?k>3K?Sfsh3gdH-;Zg7YH**zrno@~8IFCu|{!w>DL)Kn#j^FBs{fFMk zJrun)AQNldKL-`^&fUV+C02o)Nug9BgT+ zsoAn6FH4GEd~vq+Lw-_8RD_t2wMPPmD>G5L0<)4}nSRK2~edk%Wmwp#i|X z2ey1jP#}2r$Dky9zZg*w)T*s-DlsN(Fz=pv+A*qs=;4MgmuDz5k9TkWAI3Ps^m?&3 z=7MiAahJGUOpFpni3I^XHCTW#3S*Rv;J_ys0gM1f03(1AzzARjEFxgeiJwE8!#MHg zZP2v)7aZ1x#X;gkjKK4N0L7ND-czpmtk>jHIjr&S;Yl?-qZWoN7DPmdsE6O+xlW9b zI4AoTNIJyBd4Vg%!ofsgfZrl;;7Ih(m0~V685ueQdi03UqgU~H9w0**(4swF&>m@> zdO{QbA0JYh_z^sWL9t63H)F4c|pRUgrGd?30{UUBO&A08N6I!ZbEKenlO!*Eld_BCnWzm znYUWFI$?EQqA-ys6;fR9Gp%jvK4uruJ&?(CeZVdaicOGkd5$vkxc7P6N>#nL?tP`d zyD;{w{qdMQIdMRfr%qCZOg2sI*Q{43t3uf{@4MPSoPDx&qFz&^PE*BCzBi%NY*%Nf zma=KytJ~p&yptUh?`qyq=c`_x?3p;JIiTLEjAzrl?`{Xpd&qWLQ=uwQteE_8qE%C; z+NO}PY2K?lh%Tuonl<~CnexcVzKOG%O4U}yS~ku5?heqrpKP1>rDnHsZFUe8ZPJt} zGqQu(H1B&lK=Xd`;zXmSSh+fT@nrkNJDNR8S@vQ!&HL^S(7c~KJ5i_ErcBNjOrD!K zswo1G$EJDTLyW-|bN)Mb+ya;DflPn~}UUIFL#6{>zTC{FO1$ix3*?IeH-bm4x`v zP$td$M?F==87rbf0_Tl>c;JofY@yiKk4f|Xp8CL!{LHvWp4Y9un#y(A;#mJ6Ce8a> zZAW(Jtc{ECn?0nismjSqmih-XY2J@qJgV4~DG~E$_qQK9n7<`HC0NX)d4J_>#jeaX z5g{Rhj&pnVuFH)}_7B3E_ip<#!2_S62uxLp!aD8n$Iv;ay+$M^-_rQyHB5&W7 zc=k+varKEl0GxV?1J5IQ^aRI#?mLpkOyJ5dStU-Vwy?uXR*~B!U#}#ROHc6WeH!P& zMjX9GB=?@++j~p?iR9o@Jp8X+ef;j+KU2;7sqo;L$~qfcnq$v)w1+S6$TFCFPcN(4 zb;R6zyI{kGTp0l_YsQ#+kGc2G{@-b-ep|Wsi8{@DYux*5z9zc&B=>%<522t=>ZoJg zd%!`@sV8A!-Rbjj;NBa30}(Ul-xlsYam5Tbtb4D&Oj!3`kA+(! z^Ly>4qvumyZG%2z-TUddaCWxIq+4$z_ufo5-_EXZE{3`H+UEhI^m74A4(8tL&~fQc z1#o$eGV{3i#!P$jGtPe$IAnCoH?ero9A*Z>C}EUX5WrJ|1sJ37OhCzKK==eBfDyn5 zU<5D%7y&m%z?>J4x%X~79q`bn69G5p@?-8j=H5@|%gtpY(AL%4KX7&A)}4EwJ^s~KwkH^9XwhqmGwg`D_cQE*;^D|- zT-J;+_a1Za?fswYh;kKL-TO4CjDzld(h42-e%-;J?LAmlT@}A> znO?w2r+(;R5PhV5{gIjfu21Lc%|&#(B1HX|mK2!q?m=I}+uM7VfgxlI@7^C8Fx&#* z+;B5(-`e>?Fl%|9mvl?K`?0H?r|S0>tTw9cvvxY42Wy}&Z zcD?g7w6Gy()!0W+KtUF`43(4?t(V3^b?56ViVCEO+5#~)p*j;5jPV$_TymRH;!>%r z=jlIHQoCwzOkv3S2d$OIvdR-)_s_UDbhth1L~LbXar^N0_EjfDRemLxn@g%!?TX$U znlsvRuwh+U+;;!9pAXi*zv)CmRp{~%7Y2Dhrl0x39Pa$8XB4NAV z+AEjK+OnHpstqo^d#$Et>9Md1zhYO%1^15`0VCeMISukB;%}@agIX=~?i;ry27dWw zezGt!G6H_1#NpwfbR`xSdby0s6*Dq3GrDbC!A7w-3E-oz$hQz=$@Jxa_~E;6sl3iciivlhU}$kmVxuF;fXjJI*zklrUb--y zmn2N$>7?b&9o@6BQTmYsCkONHbueMxJq3lGdt&ZZoK#;m+@hvv4F6(`LQJn0dt)}g z0mKEkK#fttD6t@brv?i!Mq!MS5gaTh&PR!*VI0N?U<5D%7y*m`M!@Y5z`T36yX0;^ z;2+G)MIgbvd)2M45CZ;v9eh>fSEfhTeCCaN<*3yN7kL%3c7xEk_xncDh(O~$8u&TU z0)!$#%u);+actoyA+b0lL~LRgAZ{KNi+8j}B3YaV`tcA#!0Go$OF<}h4iCwY%&T}d z4|)1~&fNh=Uqby9+l)ql6e;lWQStZN}z;QqZZ!eZcW`%ok0A!M0%FLxU6{wCD}{k}!}&Xk}v z=%d!Wg*yH_8}D8SgVbB9fZ)IT%%0`#rDMP&bo(cG18$RX;N2V5=K#LHKp;TGMq5BY z03tTpY&@S2Mi;gBC}u5~Cg>G>Ex7M53dj#=3>eY(lC^|!!m!qiqiknJR2Um(k7<3* zUpvJum}1U!j!|Ml1;;P~7y*ocJ0YOw%`@@t|L2eY{)gZH{&xTf#l0*m(CcSxO?s<$wD0&wp|}7a#NPwRfAN^j)VV2lMWA=wRMG1%;h^;_sp%=brGV zNV|{9+g1t-i1)rSzQfR;5p7zsCpX3~sB4sk@}*Dij(4gXlso0p@!RT)%ER(3Y1H@) zO}|R1kV`{|&x(!SkBLQ4pjBP1+$v9)7}11aDHifcKSvc{Drb|_=*eqYE`9yV5QJI}7O@;!k$^&$Pu?H~{G%>2_R@Feg z%g0AFAE+7>a=A=1uIf}A$zB&5NVc$Fv7PGD_yg$D#9d9N`YlztV%_+4O`p0M3UAbW zs%lr%WM{_)kKa+hM|LTU=+ga%u@VGB?a`c7SF4JlOKSDIs>4dT=DNB^QJ$SHT{`ip zrcYI`cvTui6_7*|V>quqs@kXA2#MXQIz_&GDRiV=SuI~Ll}y~$bf_v7o3bN`0-rsQ z07^H<+tpR7oyyFKJCInV+@Z*YZe9W`)1*R3?NZk&Uddie7I+L}u*LA*2N$$3N*E;; z1n|^g0mdk7GfGCK@d-u%wcR*)CG|plQ*g~C&1;>RXJZ-`A3Sm~>mAAApk4E_?)UFK z{jxIRjYaZHH;!D%XkFSATzz9?pE~#4OTP#{bhfwfOwv)2V&TTm2M?T2Ym6#iyi+x@ zwMTj`tbwm+8r<2Hd|X(~-*so;@Wr&ZC6)ZG4~NQHQyU`=1nz7Y-r61C6jZaIWN4)J zgS0cT4U0-uog3dxI^zH8{B?H+cb#8-OtjyB`=h(cp-r7JZv~WVu2=W1X%^S;UvF;T zbUdXdP(CmF=J4z9N#71D_uqM0Q`VDtR#eR^9vrSx%ia|q_Lbl2sXX&aLtJ@4!IvN9 zo{FnqywCU5!I3w5v(85z73^ypI@q1s99<_Uxzb+Nw6=Q58-D9A4;<=P^G-yiU}wi* zNqhRK@GAb!3zy3}WXB__{C1o^^Xi)^3h{P++Kr*Au8pT-YXkSNV@)f*YoZBL3J{69&8H`N&_DL+j7H=R*i>S4 zJz04lNynB04!)06=0nEF%e0ebM-dX=G zxz~F{t9PFXML6i)CnxE6_Z#;fd1G%$W&EbfU1jn4m51Ut7pz~ANZe9Vn)kl{#mv2L zBs&KRqOQul=Xh7_IPQIxf`o+Q4s-7bpu}i43tm&@-v1Y6k65bLhP%2ZCc1j(&C_#X z2+wjEOQ|+5hvEX3;H1+qN;DFdjy9uYsWQi=@tP3Y3?GiF4)jD<{@H`vj>GZzA3RW9 zq$e7>>WPN`rA5pV+pW(xN{MQ_Oo z330Kpkq{ugXff^C6H5dm>WhxldeM>Msl=G36gSQLt7zFRt?8V_T5H!i-Dc)o?)^)2 zpKc9516QQ8UY#d$n%iT8b?ME9Qa$=oU0j}{kY9w*MtvOux$gt+`_-$%miOU=U9!A4 z?{p_=hH+x_GF(XfikKS4`J@Fnq1|Yxet;?5U z?!C;M-~R$_s9@Lmz8en>_m=qvY^eg)g z2=P2_%{nkQ1dd&sl#8u4i!)3+0wnj|6LasK#m{#x_dfpCt!0B?qXs4eUuJtkXb5Sc zW^Y7oPxw%4W>v8!5TEuS%&f$;a_?;iaoS6afEmn%QF1caeg$2#1ncy9775e@WtgJ2 zH_m0vcw^zteP=FqU)J0n|ANh5l0?7qWiosGA<|-A3JD1Yqh5Qq`$S=?EP(|53TE>S zU*&9h?Bm`qA^r-=wEHWhZ@4E@L&-mHmiL!06JwzEeSLc0FdmQ`z!UPblCyXl`74rF z@YeE+I*1>7^!lUeKX{G=Zqs7V{M=UVeIjS>{mnTZ9%$AvkiI7dwWJqz#R$#yfiG7A z0}*x0+dx0! z6ctDlwFP2~`)B3M1=oOam#kbfGTHekap?v3Jo*<9_cBw@*?+2}cGcdP!jSb3S}Tub zl_$LJpK)*KaC_E?*vi1-_TlaAt4@fj{7No2msGFX6}>q$XSC&D!@9D#?fz>&AFO|W z(}{$t(A}R5*S2ps6<-^&@7C$ky0v>Hg}hatLcUBz!gjy4S1y;eWjDW68(ez#T20T= zV__A3#Z&J&u3iB3IiYBO~B9N*o>z zYFA=$p_j`jT}=n>)77SB?*0Ex{>wL%ZoOXjK6IXsrym<3AXzKk74r{~h zE*u`P-3VCa-rHUC6bl-&7T7D}nvcB(mrTLj`)9%1$J~2+Cx05~*86=UX+)rN9}WDR zFd#rh0u@RO8*yymCn2#oBt&dt7a(pP6^nPYMk1Ni1O0dip$k4dkF*qoV(0LX49UDm z-oC%5Rx_VmbhNkIxZHDq0Kx6|1a5!DNmyNWg04QB-aQ?67N?$Tz0T*}Gt#XI61Z&% z4y0QXoLa*43{GLcSSf{A%jdNKuX5-r% k#+M|~AG9F2_qO{pjC(&o^6f3|Ewk>aR6~xvdvfppe{lF&o&W#< diff --git a/root/package/firmware/wireless-regdb/patches/501-CN-regd.patch b/root/package/firmware/wireless-regdb/patches/501-CN-regd.patch deleted file mode 100644 index 198d1978..00000000 --- a/root/package/firmware/wireless-regdb/patches/501-CN-regd.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -uprN a/db.txt b/db.txt ---- a/db.txt 2020-01-06 19:33:27.707188000 +0800 -+++ b/db.txt 2020-01-06 19:39:28.663199594 +0800 -@@ -291,15 +291,15 @@ country CL: DFS-JP - (5735 - 5835 @ 80), (20) - - country CN: DFS-FCC -- (2402 - 2482 @ 40), (20) -- (5170 - 5250 @ 80), (23), AUTO-BW -- (5250 - 5330 @ 80), (23), DFS, AUTO-BW -+ (2402 - 2482 @ 40), (30) -+ (5170 - 5250 @ 80), (30), AUTO-BW -+ (5250 - 5330 @ 80), (30), DFS, AUTO-BW - (5735 - 5835 @ 80), (30) - # 60 GHz band channels 1,4: 28dBm, channels 2,3: 44dBm - # ref: http://www.miit.gov.cn/n11293472/n11505629/n11506593/n11960250/n11960606/n11960700/n12330791.files/n12330790.pdf -- (57240 - 59400 @ 2160), (28) -+ (57240 - 59400 @ 2160), (30) - (59400 - 63720 @ 2160), (44) -- (63720 - 65880 @ 2160), (28) -+ (63720 - 65880 @ 2160), (30) - - country CO: DFS-FCC - (2402 - 2482 @ 40), (20) diff --git a/root/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/root/package/kernel/mac80211/files/lib/wifi/mac80211.sh deleted file mode 100644 index bf1dddd5..00000000 --- a/root/package/kernel/mac80211/files/lib/wifi/mac80211.sh +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/sh -. /lib/netifd/mac80211.sh - -append DRIVERS "mac80211" - -lookup_phy() { - [ -n "$phy" ] && { - [ -d /sys/class/ieee80211/$phy ] && return - } - - local devpath - config_get devpath "$device" path - [ -n "$devpath" ] && { - phy="$(mac80211_path_to_phy "$devpath")" - [ -n "$phy" ] && return - } - - local macaddr="$(config_get "$device" macaddr | tr 'A-Z' 'a-z')" - [ -n "$macaddr" ] && { - for _phy in /sys/class/ieee80211/*; do - [ -e "$_phy" ] || continue - - [ "$macaddr" = "$(cat ${_phy}/macaddress)" ] || continue - phy="${_phy##*/}" - return - done - } - phy= - return -} - -find_mac80211_phy() { - local device="$1" - - config_get phy "$device" phy - lookup_phy - [ -n "$phy" -a -d "/sys/class/ieee80211/$phy" ] || { - echo "PHY for wifi device $1 not found" - return 1 - } - config_set "$device" phy "$phy" - - config_get macaddr "$device" macaddr - [ -z "$macaddr" ] && { - config_set "$device" macaddr "$(cat /sys/class/ieee80211/${phy}/macaddress)" - } - - return 0 -} - -check_mac80211_device() { - config_get phy "$1" phy - [ -z "$phy" ] && { - find_mac80211_phy "$1" >/dev/null || return 0 - config_get phy "$1" phy - } - [ "$phy" = "$dev" ] && found=1 -} - -detect_mac80211() { - devidx=0 - config_load wireless - while :; do - config_get type "radio$devidx" type - [ -n "$type" ] || break - devidx=$(($devidx + 1)) - done - - for _dev in /sys/class/ieee80211/*; do - [ -e "$_dev" ] || continue - - dev="${_dev##*/}" - - found=0 - config_foreach check_mac80211_device wifi-device - [ "$found" -gt 0 ] && continue - - mode_band="g" - channel="13" - htmode="" - ht_capab="" - - iw phy "$dev" info | grep -q 'Capabilities:' && htmode=HT40 - - iw phy "$dev" info | grep -q '\* 5... MHz \[' && { - mode_band="a" - channel=$(iw phy "$dev" info | grep '\* 5... MHz \[' | grep '(disabled)' -v -m 1 | sed 's/[^[]*\[\|\].*//g') - iw phy "$dev" info | grep -q 'VHT Capabilities' && htmode="VHT80" - } - - [ -n "$htmode" ] && ht_capab="set wireless.radio${devidx}.htmode=$htmode" - - path="$(mac80211_phy_to_path "$dev")" - if [ -n "$path" ]; then - dev_id="set wireless.radio${devidx}.path='$path'" - else - dev_id="set wireless.radio${devidx}.macaddr=$(cat /sys/class/ieee80211/${dev}/macaddress)" - fi - if [ x$mode_band == x"a" ]; then - ssid_5ghz="-5G" - else - ssid_5ghz="-2.4G" - fi - - uci -q batch <<-EOF - set wireless.radio${devidx}=wifi-device - set wireless.radio${devidx}.type=mac80211 - set wireless.radio${devidx}.channel=${channel} - set wireless.radio${devidx}.hwmode=11${mode_band} - set wireless.radio${devidx}.txpower=22 - set wireless.radio${devidx}.country=CN - ${dev_id} - ${ht_capab} - set wireless.radio${devidx}.disabled=0 - - set wireless.default_radio${devidx}=wifi-iface - set wireless.default_radio${devidx}.device=radio${devidx} - set wireless.default_radio${devidx}.network=lan - set wireless.default_radio${devidx}.mode=ap - set wireless.default_radio${devidx}.ssid=OpenWrt${ssid_5ghz}-$(cat /sys/class/ieee80211/${dev}/macaddress | awk -F ":" '{print $4""$5""$6 }'| tr a-z A-Z) - set wireless.default_radio${devidx}.encryption=none -EOF - uci -q commit wireless - - devidx=$(($devidx + 1)) - done -} diff --git a/root/package/network/config/firewall/patches/fullconenat.patch b/root/package/network/config/firewall/patches/fullconenat.patch deleted file mode 100644 index 825e8c1d..00000000 --- a/root/package/network/config/firewall/patches/fullconenat.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/options.h -+++ b/options.h -@@ -341,6 +341,8 @@ struct fw3_zone - struct list_head masq_src; - struct list_head masq_dest; - -+ bool fullcone; -+ - bool mtu_fix; - - struct list_head cthelpers; ---- a/zones.c -+++ b/zones.c -@@ -77,6 +77,8 @@ const struct fw3_option fw3_zone_opts[] - FW3_LIST("masq_src", network, zone, masq_src), - FW3_LIST("masq_dest", network, zone, masq_dest), - -+ FW3_OPT("fullcone", bool, zone, fullcone), -+ - FW3_OPT("extra", string, zone, extra_src), - FW3_OPT("extra_src", string, zone, extra_src), - FW3_OPT("extra_dest", string, zone, extra_dest), -@@ -709,7 +711,16 @@ print_zone_rule(struct fw3_ipt_handle *h - (mdest = next_addr(mdest, &zone->masq_dest, - handle->family, false)) || first_dest; - first_dest = false) -- { -+ if (zone->fullcone && (access("/usr/lib/iptables/libipt_FULLCONENAT.so", 0) == 0)) { -+ r = fw3_ipt_rule_new(handle); -+ fw3_ipt_rule_src_dest(r, msrc, mdest); -+ fw3_ipt_rule_target(r, "FULLCONENAT"); -+ fw3_ipt_rule_append(r, "zone_%s_postrouting", zone->name); -+ r = fw3_ipt_rule_new(handle); -+ fw3_ipt_rule_src_dest(r, msrc, mdest); -+ fw3_ipt_rule_target(r, "FULLCONENAT"); -+ fw3_ipt_rule_append(r, "zone_%s_prerouting", zone->name); -+ } else { - r = fw3_ipt_rule_new(handle); - fw3_ipt_rule_src_dest(r, msrc, mdest); - fw3_ipt_rule_target(r, "MASQUERADE"); diff --git a/root/package/network/ipv6/6in4/Makefile b/root/package/network/ipv6/6in4/Makefile deleted file mode 100644 index d0f2ad30..00000000 --- a/root/package/network/ipv6/6in4/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# -# Copyright (C) 2010-2015 OpenWrt.org -# Copyright (C) 2018-2019 Ycarus (Yannick Chabanois) -# - Added gateway setting -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=6in4 -PKG_VERSION:=270 -PKG_RELEASE:=2 -PKG_LICENSE:=GPL-2.0 - -include $(INCLUDE_DIR)/package.mk - -define Package/6in4 - SECTION:=net - CATEGORY:=Network - DEPENDS:=@IPV6 +kmod-sit +uclient-fetch - TITLE:=IPv6-in-IPv4 configuration support - MAINTAINER:=Jo-Philipp Wich - PKGARCH:=all -endef - -define Package/6in4/description -Provides support for 6in4 tunnels in /etc/config/network. -Refer to http://wiki.openwrt.org/doc/uci/network for -configuration details. -endef - -define Build/Compile -endef - -define Build/Configure -endef - -define Package/6in4/install - $(INSTALL_DIR) $(1)/lib/netifd/proto - $(INSTALL_BIN) ./files/6in4.sh $(1)/lib/netifd/proto/6in4.sh -endef - -$(eval $(call BuildPackage,6in4)) diff --git a/root/package/network/ipv6/6in4/files/6in4.sh b/root/package/network/ipv6/6in4/files/6in4.sh deleted file mode 100755 index cf17c86d..00000000 --- a/root/package/network/ipv6/6in4/files/6in4.sh +++ /dev/null @@ -1,149 +0,0 @@ -#!/bin/sh -# 6in4.sh - IPv6-in-IPv4 tunnel backend -# Copyright (c) 2010-2015 OpenWrt.org - -[ -n "$INCLUDE_ONLY" ] || { - . /lib/functions.sh - . /lib/functions/network.sh - . ../netifd-proto.sh - init_proto "$@" -} - -proto_6in4_update() { - sh -c ' - timeout=5 - - (while [ $((timeout--)) -gt 0 ]; do - sleep 1 - kill -0 $$ || exit 0 - done; kill -9 $$) 2>/dev/null & - - exec "$@" - ' "$1" "$@" -} - -proto_6in4_add_prefix() { - append "$3" "$1" -} - -proto_6in4_setup() { - local cfg="$1" - local iface="$2" - local link="6in4-$cfg" - - local mtu ttl tos ipaddr peeraddr ip6addr ip6prefix ip6prefixes tunlink tunnelid username password updatekey gateway - json_get_vars mtu ttl tos ipaddr peeraddr ip6addr tunlink tunnelid username password updatekey gateway - json_for_each_item proto_6in4_add_prefix ip6prefix ip6prefixes - - [ -z "$peeraddr" ] && { - proto_notify_error "$cfg" "MISSING_ADDRESS" - proto_block_restart "$cfg" - return - } - - [ -n "$tunlink" ] && ( proto_add_host_dependency "$cfg" "$peeraddr" "$tunlink" ) - - [ -z "$ipaddr" ] && { - local wanif="$tunlink" - if [ -z "$wanif" ] && ! network_find_wan wanif; then - proto_notify_error "$cfg" "NO_WAN_LINK" - return - fi - - if ! network_get_ipaddr ipaddr "$wanif"; then - proto_notify_error "$cfg" "NO_WAN_LINK" - return - fi - } - - proto_init_update "$link" 1 - - [ -n "$ip6addr" ] && { - local local6="${ip6addr%%/*}" - local mask6="${ip6addr##*/}" - [[ "$local6" = "$mask6" ]] && mask6= - proto_add_ipv6_address "$local6" "$mask6" - proto_add_ipv6_route "::" 0 "" "" "" "$local6/$mask6" - } - - [ -n "$gateway" ] && { - proto_add_ipv6_route "::" 0 "$gateway" - } - - for ip6prefix in $ip6prefixes; do - proto_add_ipv6_prefix "$ip6prefix" - proto_add_ipv6_route "::" 0 "" "" "" "$ip6prefix" - done - - proto_add_tunnel - json_add_string mode sit - json_add_int mtu "${mtu:-1280}" - json_add_int ttl "${ttl:-64}" - [ -n "$tos" ] && json_add_string tos "$tos" - json_add_string local "$ipaddr" - json_add_string remote "$peeraddr" - [ -n "$tunlink" ] && json_add_string link "$tunlink" - proto_close_tunnel - - proto_send_update "$cfg" - - [ -n "$tunnelid" -a -n "$username" -a \( -n "$password" -o -n "$updatekey" \) ] && { - [ -n "$updatekey" ] && password="$updatekey" - - local http="http" - local urlget="uclient-fetch" - local urlget_opts="-qO-" - local ca_path="${SSL_CERT_DIR:-/etc/ssl/certs}" - - [ -f /lib/libustream-ssl.so ] && http=https - [ "$http" = "https" -a -z "$(find $ca_path -name "*.0" 2>/dev/null)" ] && { - urlget_opts="$urlget_opts --no-check-certificate" - } - - local url="$http://ipv4.tunnelbroker.net/nic/update?hostname=$tunnelid" - local try=0 - local max=3 - - ( - set -o pipefail - while [ $((++try)) -le $max ]; do - if proto_6in4_update $urlget $urlget_opts --user="$username" --password="$password" "$url" 2>&1 | \ - sed -e 's,^Killed$,timeout,' -e "s,^,update $try/$max: ," | \ - logger -t "$link"; - then - logger -t "$link" "updated" - return 0 - fi - sleep 5 - done - logger -t "$link" "update failed" - ) - } -} - -proto_6in4_teardown() { - local cfg="$1" -} - -proto_6in4_init_config() { - no_device=1 - available=1 - - proto_config_add_string "ipaddr" - proto_config_add_string "ip6addr" - proto_config_add_array "ip6prefix" - proto_config_add_string "peeraddr" - proto_config_add_string "tunlink" - proto_config_add_string "tunnelid" - proto_config_add_string "username" - proto_config_add_string "password" - proto_config_add_string "updatekey" - proto_config_add_string "gateway" - proto_config_add_int "mtu" - proto_config_add_int "ttl" - proto_config_add_string "tos" -} - -[ -n "$INCLUDE_ONLY" ] || { - add_protocol 6in4 -} diff --git a/root/package/network/services/dnsmasq/files/dnsmasq.init b/root/package/network/services/dnsmasq/files/dnsmasq.init deleted file mode 100644 index ddd19a54..00000000 --- a/root/package/network/services/dnsmasq/files/dnsmasq.init +++ /dev/null @@ -1,1134 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2007-2012 OpenWrt.org - -START=19 - -USE_PROCD=1 -PROG=/usr/sbin/dnsmasq - -ADD_LOCAL_DOMAIN=1 -ADD_LOCAL_HOSTNAME=1 -ADD_WAN_FQDN=0 -ADD_LOCAL_FQDN="" - -BASECONFIGFILE="/var/etc/dnsmasq.conf" -BASEHOSTFILE="/tmp/hosts/dhcp" -TRUSTANCHORSFILE="/usr/share/dnsmasq/trust-anchors.conf" -TIMEVALIDFILE="/var/state/dnsmasqsec" -BASEDHCPSTAMPFILE="/var/run/dnsmasq" -RFC6761FILE="/usr/share/dnsmasq/rfc6761.conf" -DHCPSCRIPT="/usr/lib/dnsmasq/dhcp-script.sh" - -DNSMASQ_DHCP_VER=4 - -xappend() { - local value="$1" - - echo "${value#--}" >> $CONFIGFILE_TMP -} - -hex_to_hostid() { - local var="$1" - local hex="${2#0x}" # strip optional "0x" prefix - - if [ -n "${hex//[0-9a-fA-F]/}" ]; then - # is invalid hex literal - return 1 - fi - - # convert into host id - export "$var=$( - printf "%0x:%0x" \ - $(((0x$hex >> 16) % 65536)) \ - $(( 0x$hex % 65536)) - )" - - return 0 -} - -dhcp_calc() { - local ip="$1" - local res=0 - - while [ -n "$ip" ]; do - part="${ip%%.*}" - res="$(($res * 256))" - res="$(($res + $part))" - [ "${ip%.*}" != "$ip" ] && ip="${ip#*.}" || ip= - done - echo "$res" -} - -dhcp_check() { - local ifname="$1" - local stamp="${BASEDHCPSTAMPFILE_CFG}.${ifname}.dhcp" - local rv=0 - - [ -s "$stamp" ] && return $(cat "$stamp") - - # If there's no carrier yet, skip this interface. - # The init script will be called again once the link is up - case "$(devstatus "$ifname" | jsonfilter -e @.carrier)" in - false) return 1;; - esac - - udhcpc -n -q -s /bin/true -t 1 -i "$ifname" >&- && rv=1 || rv=0 - - [ $rv -eq 1 ] && \ - logger -t dnsmasq \ - "found already running DHCP-server on interface '$ifname'" \ - "refusing to start, use 'option force 1' to override" - - echo $rv > "$stamp" - return $rv -} - -log_once() { - pidof dnsmasq >/dev/null || \ - logger -t dnsmasq "$@" -} - -has_handler() { - local file - - for file in /etc/hotplug.d/dhcp/* /etc/hotplug.d/tftp/* /etc/hotplug.d/neigh/*; do - [ -f "$file" ] && return 0 - done - - return 1 -} - -append_bool() { - local section="$1" - local option="$2" - local value="$3" - local default="$4" - local _loctmp - [ -z "$default" ] && default="0" - config_get_bool _loctmp "$section" "$option" "$default" - [ $_loctmp -gt 0 ] && xappend "$value" -} - -append_parm() { - local section="$1" - local option="$2" - local switch="$3" - local default="$4" - local _loctmp - config_get _loctmp "$section" "$option" "$default" - [ -z "$_loctmp" ] && return 0 - xappend "$switch=$_loctmp" -} - -append_server() { - xappend "--server=$1" -} - -append_rev_server() { - xappend "--rev-server=$1" -} - -append_address() { - xappend "--address=$1" -} - -append_ipset() { - xappend "--ipset=$1" -} - -append_interface() { - network_get_device ifname "$1" || ifname="$1" - xappend "--interface=$ifname" -} - -append_listenaddress() { - xappend "--listen-address=$1" -} - -append_notinterface() { - network_get_device ifname "$1" || ifname="$1" - xappend "--except-interface=$ifname" -} - -append_addnhosts() { - xappend "--addn-hosts=$1" -} - -append_bogusnxdomain() { - xappend "--bogus-nxdomain=$1" -} - -append_pxe_service() { - xappend "--pxe-service=$1" -} - -append_interface_name() { - xappend "--interface-name=$1,$2" -} - -filter_dnsmasq() { - local cfg="$1" func="$2" match_cfg="$3" found_cfg - - # use entry when no instance entry set, or if it matches - config_get found_cfg "$cfg" "instance" - if [ -z "$found_cfg" -o "$found_cfg" = "$match_cfg" ]; then - $func $cfg - fi -} - -dhcp_subscrid_add() { - local cfg="$1" - - config_get networkid "$cfg" networkid - [ -n "$networkid" ] || return 0 - - config_get subscriberid "$cfg" subscriberid - [ -n "$subscriberid" ] || return 0 - - xappend "--dhcp-subscrid=$networkid,$subscriberid" - - config_get_bool force "$cfg" force 0 - - dhcp_option_add "$cfg" "$networkid" "$force" -} - -dhcp_remoteid_add() { - local cfg="$1" - - config_get networkid "$cfg" networkid - [ -n "$networkid" ] || return 0 - - config_get remoteid "$cfg" remoteid - [ -n "$remoteid" ] || return 0 - - xappend "--dhcp-remoteid=$networkid,$remoteid" - - config_get_bool force "$cfg" force 0 - - dhcp_option_add "$cfg" "$networkid" "$force" -} - -dhcp_circuitid_add() { - # TODO: DHCPV6 does not have circuitid; catch "option6:" - local cfg="$1" - - config_get networkid "$cfg" networkid - [ -n "$networkid" ] || return 0 - - config_get circuitid "$cfg" circuitid - [ -n "$circuitid" ] || return 0 - - xappend "--dhcp-circuitid=$networkid,$circuitid" - - config_get_bool force "$cfg" force 0 - - dhcp_option_add "$cfg" "$networkid" "$force" -} - -dhcp_userclass_add() { - local cfg="$1" - - config_get networkid "$cfg" networkid - [ -n "$networkid" ] || return 0 - - config_get userclass "$cfg" userclass - [ -n "$userclass" ] || return 0 - - xappend "--dhcp-userclass=$networkid,$userclass" - - config_get_bool force "$cfg" force 0 - - dhcp_option_add "$cfg" "$networkid" "$force" -} - -dhcp_vendorclass_add() { - # TODO: DHCPV6 vendor class has stricter definitions; catch? fixup? - local cfg="$1" - - config_get networkid "$cfg" networkid - [ -n "$networkid" ] || return 0 - - config_get vendorclass "$cfg" vendorclass - [ -n "$vendorclass" ] || return 0 - - xappend "--dhcp-vendorclass=$networkid,$vendorclass" - - config_get_bool force "$cfg" force 0 - - dhcp_option_add "$cfg" "$networkid" "$force" -} - -dhcp_match_add() { - local cfg="$1" - - config_get networkid "$cfg" networkid - [ -n "$networkid" ] || return 0 - - config_get match "$cfg" match - [ -n "$match" ] || return 0 - - xappend "--dhcp-match=$networkid,$match" - - config_get_bool force "$cfg" force 0 - - dhcp_option_add "$cfg" "$networkid" "$force" -} - -dhcp_host_add() { - local cfg="$1" - local hosttag nametime addrs duids macs tags - - config_get_bool force "$cfg" force 0 - - config_get networkid "$cfg" networkid - [ -n "$networkid" ] && dhcp_option_add "$cfg" "$networkid" "$force" - - config_get_bool enable "$cfg" enable 1 - [ "$enable" = "0" ] && return 0 - - config_get name "$cfg" name - config_get ip "$cfg" ip - config_get hostid "$cfg" hostid - - [ -n "$ip" -o -n "$name" -o -n "$hostid" ] || return 0 - - config_get_bool dns "$cfg" dns 0 - [ "$dns" = "1" -a -n "$ip" -a -n "$name" ] && { - echo "$ip $name${DOMAIN:+.$DOMAIN}" >> $HOSTFILE_TMP - } - - config_get mac "$cfg" mac - config_get duid "$cfg" duid - config_get tag "$cfg" tag - config_get gw "$cfg" gw - - if [ -n "$mac" ]; then - # --dhcp-host=00:20:e0:3b:13:af,192.168.0.199,lap - # many MAC are possible to track a laptop ON/OFF dock - for m in $mac; do append macs "$m" ","; done - fi - - if [ $DNSMASQ_DHCP_VER -eq 6 -a -n "$duid" ]; then - # --dhcp-host=id:00:03:00:01:12:00:00:01:02:03,[::beef],lap - # one (virtual) machine gets one DUID per RFC3315 - duids="id:${duid// */}" - fi - - if [ -z "$macs" -a -z "$duids" ]; then - # --dhcp-host=lap,192.168.0.199,[::beef] - [ -n "$name" ] || return 0 - macs="$name" - name="" - fi - - if [ -n "$hostid" ]; then - hex_to_hostid hostid "$hostid" - fi - - if [ -n "$tag" ]; then - for t in $tag; do append tags "$t" ",set:"; done - fi - - if [ -n "$gw" ]; then - append tags "$cfg" ",set:" - fi - - config_get_bool broadcast "$cfg" broadcast 0 - config_get leasetime "$cfg" leasetime - - [ "$broadcast" = "0" ] && broadcast= || broadcast=",set:needs-broadcast" - - hosttag="${networkid:+,set:${networkid}}${tags:+,set:${tags}}$broadcast" - nametime="${name:+,$name}${leasetime:+,$leasetime}" - - if [ $DNSMASQ_DHCP_VER -eq 6 ]; then - addrs="${ip:+,$ip}${hostid:+,[::$hostid]}" - xappend "--dhcp-host=$macs${duids:+,$duids}$hosttag$addrs$nametime" - else - xappend "--dhcp-host=$macs$hosttag${ip:+,$ip}$nametime" - fi - if [ -n "$gw" ]; then - xappend "--dhcp-option=tag:$cfg,option:router,$gw" - fi -} - -dhcp_this_host_add() { - local net="$1" - local ifname="$2" - local mode="$3" - local routerstub routername ifdashname - local lanaddr lanaddr6 lanaddrs6 ulaprefix - - if [ "$mode" -gt 0 ] ; then - ifdashname="${ifname//./-}" - routerstub="$( md5sum /etc/os-release )" - routerstub="router-${routerstub// */}" - routername="$( uci_get system @system[0] hostname $routerstub )" - - if [ "$mode" -gt 1 ] ; then - if [ "$mode" -gt 2 ] ; then - if [ "$mode" -gt 3 ] ; then - append_interface_name "$ifdashname.$routername.$DOMAIN" "$ifname" - fi - - append_interface_name "$routername.$DOMAIN" "$ifname" - fi - - # All IP addresses discovered by dnsmasq will be labeled (except fe80::) - append_interface_name "$routername" "$ifname" - - else - # This uses a static host file entry for only limited addresses. - # Use dnsmasq option "--expandhosts" to enable FQDN on host files. - ulaprefix="$(uci_get network @globals[0] ula_prefix)" - network_get_ipaddr lanaddr "$net" - network_get_ipaddrs6 lanaddrs6 "$net" - - if [ -n "$lanaddr" ] ; then - dhcp_domain_add "" "$routername" "$lanaddr" - fi - - if [ -n "$ulaprefix" -a -n "$lanaddrs6" ] ; then - for lanaddr6 in $lanaddrs6 ; do - case "$lanaddr6" in - "${ulaprefix%%:/*}"*) - dhcp_domain_add "" "$routername" "$lanaddr6" - ;; - esac - done - fi - fi - fi -} - -dhcp_tag_add() { - # NOTE: dnsmasq has explicit "option6:" prefix for DHCPv6 so no collisions - local cfg="$1" - - tag="$cfg" - - [ -n "$tag" ] || return 0 - - config_get_bool force "$cfg" force 0 - [ "$force" = "0" ] && force= - - config_get option "$cfg" dhcp_option - for o in $option; do - xappend "--dhcp-option${force:+-force}=tag:$tag,$o" - done -} - -dhcp_mac_add() { - local cfg="$1" - - config_get networkid "$cfg" networkid - [ -n "$networkid" ] || return 0 - - config_get mac "$cfg" mac - [ -n "$mac" ] || return 0 - - xappend "--dhcp-mac=$networkid,$mac" - - dhcp_option_add "$cfg" "$networkid" -} - -dhcp_boot_add() { - # TODO: BOOTURL is different between DHCPv4 and DHCPv6 - local cfg="$1" - - config_get networkid "$cfg" networkid - - config_get filename "$cfg" filename - [ -n "$filename" ] || return 0 - - config_get servername "$cfg" servername - config_get serveraddress "$cfg" serveraddress - - [ -n "$serveraddress" -a ! -n "$servername" ] && return 0 - - xappend "--dhcp-boot=${networkid:+net:$networkid,}${filename}${servername:+,$servername}${serveraddress:+,$serveraddress}" - - config_get_bool force "$cfg" force 0 - - dhcp_option_add "$cfg" "$networkid" "$force" -} - - -dhcp_add() { - local cfg="$1" - local dhcp6range="::" - local nettag - local tags - - config_get net "$cfg" interface - [ -n "$net" ] || return 0 - - config_get networkid "$cfg" networkid - [ -n "$networkid" ] || networkid="$net" - - network_get_device ifname "$net" || return 0 - - [ "$cachelocal" = "0" ] && network_get_dnsserver dnsserver "$net" && { - DNS_SERVERS="$DNS_SERVERS $dnsserver" - } - - append_bool "$cfg" ignore "--no-dhcp-interface=$ifname" && { - # Many ISP do not have useful names for DHCP customers (your WAN). - dhcp_this_host_add "$net" "$ifname" "$ADD_WAN_FQDN" - return 0 - } - - network_get_subnet subnet "$net" || return 0 - network_get_protocol proto "$net" || return 0 - - # Do not support non-static interfaces for now - [ static = "$proto" ] || return 0 - - # Override interface netmask with dhcp config if applicable - config_get netmask "$cfg" netmask "${subnet##*/}" - - #check for an already active dhcp server on the interface, unless 'force' is set - config_get_bool force "$cfg" force 0 - [ $force -gt 0 ] || dhcp_check "$ifname" || return 0 - - config_get start "$cfg" start 100 - config_get limit "$cfg" limit 150 - config_get leasetime "$cfg" leasetime 12h - config_get options "$cfg" options - config_get_bool dynamicdhcp "$cfg" dynamicdhcp 1 - - config_get dhcpv4 "$cfg" dhcpv4 - config_get dhcpv6 "$cfg" dhcpv6 - - config_get ra "$cfg" ra - config_get ra_management "$cfg" ra_management - config_get ra_preference "$cfg" ra_preference - config_get dns "$cfg" dns - - config_list_foreach "$cfg" "interface_name" append_interface_name "$ifname" - - # Put the router host name on this DHCP served interface address(es) - dhcp_this_host_add "$net" "$ifname" "$ADD_LOCAL_FQDN" - - start="$( dhcp_calc "$start" )" - - add_tag() { - tags="${tags}tag:$1," - } - config_list_foreach "$cfg" tag add_tag - - nettag="${networkid:+set:${networkid},}" - - if [ "$limit" -gt 0 ] ; then - limit=$((limit-1)) - fi - - eval "$(ipcalc.sh "${subnet%%/*}" $netmask $start $limit)" - - if [ "$dynamicdhcp" = "0" ] ; then - END="static" - dhcp6range="::,static" - else - dhcp6range="::1000,::ffff" - fi - - - if [ "$dhcpv4" != "disabled" ] ; then - xappend "--dhcp-range=$tags$nettag$START,$END,$NETMASK,$leasetime${options:+ $options}" - fi - - - if [ $DNSMASQ_DHCP_VER -eq 6 -a "$ra" = "server" ] ; then - # Note: dnsmasq cannot just be a DHCPv6 server (all-in-1) - # and let some other machine(s) send RA pointing to it. - - case $ra_preference in - *high*) - xappend "--ra-param=$ifname,high,0,7200" - ;; - *low*) - xappend "--ra-param=$ifname,low,0,7200" - ;; - *) - # Send UNSOLICITED RA at default interval and live for 2 hours. - # TODO: convert flexible lease time into route life time (only seconds). - xappend "--ra-param=$ifname,0,7200" - ;; - esac - - if [ "$dhcpv6" = "disabled" ] ; then - ra_management="3" - fi - - - case $ra_management in - 0) - # SLACC with DCHP for extended options - xappend "--dhcp-range=$nettag::,constructor:$ifname,ra-stateless,ra-names" - ;; - 2) - # DHCP address and RA only for management redirection - xappend "--dhcp-range=$nettag$dhcp6range,constructor:$ifname,$leasetime" - ;; - 3) - # SLAAC only but dnsmasq attempts to link HOSTNAME, DHCPv4 MAC, and SLAAC - xappend "--dhcp-range=$nettag::,constructor:$ifname,ra-only,ra-names" - ;; - *) - # SLAAC and full DHCP - xappend "--dhcp-range=$nettag$dhcp6range,constructor:$ifname,slaac,ra-names,$leasetime" - ;; - esac - - if [ -n "$dns" ]; then - dnss="" - for d in $dns; do append dnss "[$d]" ","; done - else - dnss="[::]" - fi - - dhcp_option_append "option6:dns-server,$dnss" "$networkid" - fi - - dhcp_option_add "$cfg" "$networkid" 0 - dhcp_option_add "$cfg" "$networkid" 2 -} - -dhcp_option_append() { - local option="$1" - local networkid="$2" - local force="$3" - - xappend "--dhcp-option${force:+-force}=${networkid:+$networkid,}$option" -} - -dhcp_option_add() { - # NOTE: dnsmasq has explicit "option6:" prefix for DHCPv6 so no collisions - local cfg="$1" - local networkid="$2" - local force="$3" - local opt="dhcp_option" - - [ "$force" = "0" ] && force= - [ "$force" = "2" ] && opt="dhcp_option_force" - - local list_len - config_get list_len "$cfg" "${opt}_LENGTH" - - if [ -n "$list_len" ]; then - config_list_foreach "$cfg" "$opt" dhcp_option_append "$networkid" "$force" - else - config_get dhcp_option "$cfg" "$opt" - - [ -n "$dhcp_option" ] && echo "Warning: the 'option $opt' syntax is deprecated, use 'list $opt'" >&2 - - local option - for option in $dhcp_option; do - dhcp_option_append "$option" "$networkid" "$force" - done - fi -} - -dhcp_domain_add() { - local cfg="$1" - local ip name names record - - config_get names "$cfg" name "$2" - [ -n "$names" ] || return 0 - - config_get ip "$cfg" ip "$3" - [ -n "$ip" ] || return 0 - - for name in $names; do - record="${record:+$record }$name" - done - - echo "$ip $record" >> $HOSTFILE_TMP -} - -dhcp_srv_add() { - local cfg="$1" - - config_get srv "$cfg" srv - [ -n "$srv" ] || return 0 - - config_get target "$cfg" target - [ -n "$target" ] || return 0 - - config_get port "$cfg" port - [ -n "$port" ] || return 0 - - config_get class "$cfg" class - config_get weight "$cfg" weight - - local service="$srv,$target,$port${class:+,$class${weight:+,$weight}}" - - xappend "--srv-host=$service" -} - -dhcp_mx_add() { - local cfg="$1" - local domain relay pref - - config_get domain "$cfg" domain - [ -n "$domain" ] || return 0 - - config_get relay "$cfg" relay - [ -n "$relay" ] || return 0 - - config_get pref "$cfg" pref 0 - - local service="$domain,$relay,$pref" - - xappend "--mx-host=$service" -} - -dhcp_cname_add() { - local cfg="$1" - local cname target - - config_get cname "$cfg" cname - [ -n "$cname" ] || return 0 - - config_get target "$cfg" target - [ -n "$target" ] || return 0 - - xappend "--cname=${cname},${target}" -} - -dhcp_hostrecord_add() { - local cfg="$1" - local names addresses record val - - config_get names "$cfg" name "$2" - if [ -z "$names" ]; then - return 0 - fi - - config_get addresses "$cfg" ip "$3" - if [ -z "$addresses" ]; then - return 0 - fi - - for val in $names $addresses; do - record="${record:+$record,}$val" - done - - xappend "--host-record=$record" -} - -dhcp_relay_add() { - local cfg="$1" - local local_addr server_addr interface - - config_get local_addr "$cfg" local_addr - [ -n "$local_addr" ] || return 0 - - config_get server_addr "$cfg" server_addr - [ -n "$server_addr" ] || return 0 - - config_get interface "$cfg" interface - if [ -z "$interface" ]; then - xappend "--dhcp-relay=$local_addr,$server_addr" - else - network_get_device ifname "$interface" || return - xappend "--dhcp-relay=$local_addr,$server_addr,$ifname" - fi -} - -dnsmasq_start() -{ - local cfg="$1" disabled resolvfile user_dhcpscript - - config_get_bool disabled "$cfg" disabled 0 - [ "$disabled" -gt 0 ] && return 0 - - # reset list of DOMAINS and DNS servers (for each dnsmasq instance) - DNS_SERVERS="" - DOMAIN="" - CONFIGFILE="${BASECONFIGFILE}.${cfg}" - CONFIGFILE_TMP="${CONFIGFILE}.$$" - HOSTFILE="${BASEHOSTFILE}.${cfg}" - HOSTFILE_TMP="${HOSTFILE}.$$" - BASEDHCPSTAMPFILE_CFG="${BASEDHCPSTAMPFILE}.${cfg}" - - # before we can call xappend - mkdir -p /var/run/dnsmasq/ - mkdir -p $(dirname $CONFIGFILE) - mkdir -p $(dirname $HOSTFILE) - mkdir -p /var/lib/misc - chown dnsmasq:dnsmasq /var/run/dnsmasq - - echo "# auto-generated config file from /etc/config/dhcp" > $CONFIGFILE_TMP - echo "# auto-generated config file from /etc/config/dhcp" > $HOSTFILE_TMP - - local dnsmasqconffile="/etc/dnsmasq.${cfg}.conf" - if [ ! -r "$dnsmasqconffile" ]; then - dnsmasqconffile=/etc/dnsmasq.conf - fi - - # if we did this last, we could override auto-generated config - [ -f "${dnsmasqconffile}" ] && { - xappend "--conf-file=${dnsmasqconffile}" - } - - $PROG --version | grep -osqE "^Compile time options:.* DHCPv6( |$)" && DHCPv6CAPABLE=1 || DHCPv6CAPABLE=0 - - - if [ -x /usr/sbin/odhcpd -a -x /etc/init.d/odhcpd ] ; then - local odhcpd_is_main odhcpd_is_enabled - config_get odhcpd_is_main odhcpd maindhcp 0 - /etc/init.d/odhcpd enabled && odhcpd_is_enabled=1 || odhcpd_is_enabled=0 - - - if [ "$odhcpd_is_enabled" -eq 0 -a "$DHCPv6CAPABLE" -eq 1 ] ; then - # DHCP V4 and V6 in DNSMASQ - DNSMASQ_DHCP_VER=6 - elif [ "$odhcpd_is_main" -gt 0 ] ; then - # ODHCPD is doing it all - DNSMASQ_DHCP_VER=0 - else - # You have ODHCPD but use DNSMASQ for DHCPV4 - DNSMASQ_DHCP_VER=4 - fi - - elif [ "$DHCPv6CAPABLE" -eq 1 ] ; then - # DHCP V4 and V6 in DNSMASQ - DNSMASQ_DHCP_VER=6 - else - DNSMASQ_DHCP_VER=4 - fi - - # Allow DHCP/DHCPv6 to be handled by ISC DHCPD - if [ -x /usr/sbin/dhcpd ] ; then - if [ -x /etc/init.d/dhcpd ] ; then - /etc/init.d/dhcpd enabled && DNSMASQ_DHCP_VER=0 - fi - if [ -x /etc/init.d/dhcpd6 -a "$DNSMASQ_DHCP_VER" -gt 0 ] ; then - /etc/init.d/dhcpd6 enabled && DNSMASQ_DHCP_VER=4 - fi - fi - - append_bool "$cfg" authoritative "--dhcp-authoritative" - append_bool "$cfg" nodaemon "--no-daemon" - append_bool "$cfg" domainneeded "--domain-needed" - append_bool "$cfg" filterwin2k "--filterwin2k" - append_bool "$cfg" nohosts "--no-hosts" - append_bool "$cfg" nonegcache "--no-negcache" - append_bool "$cfg" strictorder "--strict-order" - append_bool "$cfg" logqueries "--log-queries=extra" - append_bool "$cfg" noresolv "--no-resolv" - append_bool "$cfg" localise_queries "--localise-queries" - append_bool "$cfg" readethers "--read-ethers" - append_bool "$cfg" dbus "--enable-dbus" - append_bool "$cfg" expandhosts "--expand-hosts" - config_get tftp_root "$cfg" "tftp_root" - [ -n "$tftp_root" ] && mkdir -p "$tftp_root" && append_bool "$cfg" enable_tftp "--enable-tftp" - append_bool "$cfg" tftp_no_fail "--tftp-no-fail" - append_bool "$cfg" nonwildcard "--bind-dynamic" 1 - append_bool "$cfg" fqdn "--dhcp-fqdn" - append_bool "$cfg" proxydnssec "--proxy-dnssec" - append_bool "$cfg" localservice "--local-service" - append_bool "$cfg" logdhcp "--log-dhcp" - append_bool "$cfg" quietdhcp "--quiet-dhcp" - append_bool "$cfg" sequential_ip "--dhcp-sequential-ip" - append_bool "$cfg" allservers "--all-servers" - append_bool "$cfg" noping "--no-ping" - - append_parm "$cfg" logfacility "--log-facility" - - append_parm "$cfg" cachesize "--cache-size" - append_parm "$cfg" dnsforwardmax "--dns-forward-max" - append_parm "$cfg" port "--port" - append_parm "$cfg" ednspacket_max "--edns-packet-max" - append_parm "$cfg" dhcpleasemax "--dhcp-lease-max" - append_parm "$cfg" "queryport" "--query-port" - append_parm "$cfg" "minport" "--min-port" - append_parm "$cfg" "maxport" "--max-port" - append_parm "$cfg" "domain" "--domain" - append_parm "$cfg" "local" "--server" - config_list_foreach "$cfg" "listen_address" append_listenaddress - config_list_foreach "$cfg" "server" append_server - config_list_foreach "$cfg" "rev_server" append_rev_server - config_list_foreach "$cfg" "address" append_address - config_list_foreach "$cfg" "ipset" append_ipset - [ -n "$BOOT" ] || { - config_list_foreach "$cfg" "interface" append_interface - config_list_foreach "$cfg" "notinterface" append_notinterface - } - config_list_foreach "$cfg" "addnhosts" append_addnhosts - config_list_foreach "$cfg" "bogusnxdomain" append_bogusnxdomain - append_parm "$cfg" "leasefile" "--dhcp-leasefile" "/tmp/dhcp.leases" - append_parm "$cfg" "serversfile" "--servers-file" - append_parm "$cfg" "tftp_root" "--tftp-root" - append_parm "$cfg" "dhcp_boot" "--dhcp-boot" - append_parm "$cfg" "local_ttl" "--local-ttl" - append_parm "$cfg" "pxe_prompt" "--pxe-prompt" - config_list_foreach "$cfg" "pxe_service" append_pxe_service - config_get DOMAIN "$cfg" domain - - config_get_bool ADD_LOCAL_DOMAIN "$cfg" add_local_domain 1 - config_get_bool ADD_LOCAL_HOSTNAME "$cfg" add_local_hostname 1 - config_get ADD_LOCAL_FQDN "$cfg" add_local_fqdn "" - config_get ADD_WAN_FQDN "$cfg" add_wan_fqdn 0 - - if [ -z "$ADD_LOCAL_FQDN" ] ; then - # maintain support for previous UCI - ADD_LOCAL_FQDN="$ADD_LOCAL_HOSTNAME" - fi - - config_get_bool readethers "$cfg" readethers - [ "$readethers" = "1" -a \! -e "/etc/ethers" ] && touch /etc/ethers - - config_get user_dhcpscript $cfg dhcpscript - if has_handler || [ -n "$user_dhcpscript" ]; then - xappend "--dhcp-script=$DHCPSCRIPT" - fi - - config_get leasefile $cfg leasefile "/tmp/dhcp.leases" - [ -n "$leasefile" -a \! -e "$leasefile" ] && touch "$leasefile" - config_get_bool cachelocal "$cfg" cachelocal 1 - - config_get_bool noresolv "$cfg" noresolv 0 - if [ "$noresolv" != "1" ]; then - config_get resolvfile "$cfg" resolvfile "/tmp/resolv.conf.auto" - # So jail doesn't complain if file missing - [ -n "$resolvfile" -a \! -e "$resolvfile" ] && touch "$resolvfile" - fi - - [ -n "$resolvfile" ] && xappend "--resolv-file=$resolvfile" - - config_get hostsfile "$cfg" dhcphostsfile - [ -e "$hostsfile" ] && xappend "--dhcp-hostsfile=$hostsfile" - - local rebind - config_get_bool rebind "$cfg" rebind_protection 1 - [ $rebind -gt 0 ] && { - log_once \ - "DNS rebinding protection is active," \ - "will discard upstream RFC1918 responses!" - xappend "--stop-dns-rebind" - - local rebind_localhost - config_get_bool rebind_localhost "$cfg" rebind_localhost 0 - [ $rebind_localhost -gt 0 ] && { - log_once "Allowing 127.0.0.0/8 responses" - xappend "--rebind-localhost-ok" - } - - append_rebind_domain() { - log_once "Allowing RFC1918 responses for domain $1" - xappend "--rebind-domain-ok=$1" - } - - config_list_foreach "$cfg" rebind_domain append_rebind_domain - } - - config_get_bool dnssec "$cfg" dnssec 0 - [ "$dnssec" -gt 0 ] && { - xappend "--conf-file=$TRUSTANCHORSFILE" - xappend "--dnssec" - [ -x /etc/init.d/sysntpd ] && { - /etc/init.d/sysntpd enabled - [ "$?" -ne 0 -o "$(uci_get system.ntp.enabled)" = "1" ] && { - [ -f "$TIMEVALIDFILE" ] || xappend "--dnssec-no-timecheck" - } - } - append_bool "$cfg" dnsseccheckunsigned "--dnssec-check-unsigned" - } - - config_get addmac "$cfg" addmac 0 - [ "$addmac" != "0" ] && { - [ "$addmac" = "1" ] && addmac= - xappend "--add-mac${addmac:+="$addmac"}" - } - - dhcp_option_add "$cfg" "" 0 - dhcp_option_add "$cfg" "" 2 - - xappend "--dhcp-broadcast=tag:needs-broadcast" - - xappend "--addn-hosts=$(dirname $HOSTFILE)" - - config_get dnsmasqconfdir "$cfg" confdir "/tmp/dnsmasq.d" - xappend "--conf-dir=$dnsmasqconfdir" - dnsmasqconfdir="${dnsmasqconfdir%%,*}" - [ ! -d "$dnsmasqconfdir" ] && mkdir -p $dnsmasqconfdir - xappend "--user=dnsmasq" - xappend "--group=dnsmasq" - echo >> $CONFIGFILE_TMP - - config_get_bool enable_tftp "$cfg" enable_tftp 0 - [ "$enable_tftp" -gt 0 ] && { - config_get tftp_root "$cfg" tftp_root - append EXTRA_MOUNT $tftp_root - } - - config_foreach filter_dnsmasq host dhcp_host_add "$cfg" - echo >> $CONFIGFILE_TMP - config_foreach filter_dnsmasq boot dhcp_boot_add "$cfg" - config_foreach filter_dnsmasq mac dhcp_mac_add "$cfg" - config_foreach filter_dnsmasq tag dhcp_tag_add "$cfg" - config_foreach filter_dnsmasq vendorclass dhcp_vendorclass_add "$cfg" - config_foreach filter_dnsmasq userclass dhcp_userclass_add "$cfg" - config_foreach filter_dnsmasq circuitid dhcp_circuitid_add "$cfg" - config_foreach filter_dnsmasq remoteid dhcp_remoteid_add "$cfg" - config_foreach filter_dnsmasq subscrid dhcp_subscrid_add "$cfg" - config_foreach filter_dnsmasq match dhcp_match_add "$cfg" - config_foreach filter_dnsmasq domain dhcp_domain_add "$cfg" - config_foreach filter_dnsmasq hostrecord dhcp_hostrecord_add "$cfg" - [ -n "$BOOT" ] || config_foreach filter_dnsmasq relay dhcp_relay_add "$cfg" - - echo >> $CONFIGFILE_TMP - config_foreach filter_dnsmasq srvhost dhcp_srv_add "$cfg" - config_foreach filter_dnsmasq mxhost dhcp_mx_add "$cfg" - echo >> $CONFIGFILE_TMP - - config_get_bool boguspriv "$cfg" boguspriv 1 - [ "$boguspriv" -gt 0 ] && { - xappend "--bogus-priv" - [ -r "$RFC6761FILE" ] && xappend "--conf-file=$RFC6761FILE" - } - - if [ "$DNSMASQ_DHCP_VER" -gt 4 ] ; then - # Enable RA feature for when/if it is constructed, - # and RA is selected per interface pool (RA, DHCP, or both), - # but no one (should) want RA broadcast in syslog - [ -n "$BOOT" ] || config_foreach filter_dnsmasq dhcp dhcp_add "$cfg" - xappend "--enable-ra" - xappend "--quiet-ra" - append_bool "$cfg" quietdhcp "--quiet-dhcp6" - - elif [ "$DNSMASQ_DHCP_VER" -gt 0 ] ; then - [ -n "$BOOT" ] || config_foreach filter_dnsmasq dhcp dhcp_add "$cfg" - fi - - - echo >> $CONFIGFILE_TMP - config_foreach filter_dnsmasq cname dhcp_cname_add "$cfg" - echo >> $CONFIGFILE_TMP - - echo >> $CONFIGFILE_TMP - mv -f $CONFIGFILE_TMP $CONFIGFILE - mv -f $HOSTFILE_TMP $HOSTFILE - - [ "$resolvfile" = "/tmp/resolv.conf.auto" ] && { - rm -f /tmp/resolv.conf - [ $ADD_LOCAL_DOMAIN -eq 1 ] && [ -n "$DOMAIN" ] && { - echo "search $DOMAIN" >> /tmp/resolv.conf - } - DNS_SERVERS="$DNS_SERVERS 127.0.0.1" - for DNS_SERVER in $DNS_SERVERS ; do - echo "nameserver $DNS_SERVER" >> /tmp/resolv.conf - done - } - - procd_open_instance $cfg - procd_set_param command $PROG -C $CONFIGFILE -k -x /var/run/dnsmasq/dnsmasq."${cfg}".pid - procd_set_param file $CONFIGFILE - [ -n "$user_dhcpscript" ] && procd_set_param env USER_DHCPSCRIPT="$user_dhcpscript" - procd_set_param respawn - - procd_add_jail dnsmasq ubus log - procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE $RFC6761FILE /etc/passwd /etc/group /etc/TZ /dev/null /dev/urandom $dnsmasqconffile $dnsmasqconfdir $resolvfile $user_dhcpscript /etc/hosts /etc/ethers /sbin/hotplug-call $EXTRA_MOUNT $DHCPSCRIPT - procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile - - procd_close_instance -} - -dnsmasq_stop() -{ - local cfg="$1" resolvfile - - config_get resolvfile "$cfg" "resolvfile" - - #relink /tmp/resolve.conf only for main instance - [ "$resolvfile" = "/tmp/resolv.conf.auto" ] && { - [ -f /tmp/resolv.conf ] && { - rm -f /tmp/resolv.conf - ln -s "$resolvfile" /tmp/resolv.conf - } - } - - rm -f ${BASEDHCPSTAMPFILE}.${cfg}.*.dhcp -} - -add_interface_trigger() -{ - local interface ignore - - config_get interface "$1" interface - config_get_bool ignore "$1" ignore 0 - - [ -n "$interface" -a $ignore -eq 0 ] && procd_add_interface_trigger "interface.*" "$interface" /etc/init.d/dnsmasq reload -} - -service_triggers() -{ - procd_add_reload_trigger "dhcp" "system" - - config_load dhcp - config_foreach add_interface_trigger dhcp - config_foreach add_interface_trigger relay -} - -boot() -{ - BOOT=1 - start "$@" -} - -start_service() { - local instance="$1" - local instance_found=0 - - . /lib/functions/network.sh - - config_cb() { - local type="$1" - local name="$2" - if [ "$type" = "dnsmasq" ]; then - if [ -n "$instance" -a "$instance" = "$name" ]; then - instance_found=1 - fi - fi - } - - config_load dhcp - - if [ -n "$instance" ]; then - [ "$instance_found" -gt 0 ] || return - dnsmasq_start "$instance" - else - config_foreach dnsmasq_start dnsmasq - fi -} - -reload_service() { - rc_procd start_service "$@" - procd_send_signal dnsmasq "$@" -} - -stop_service() { - local instance="$1" - local instance_found=0 - - config_cb() { - local type="$1" - local name="$2" - if [ "$type" = "dnsmasq" ]; then - if [ -n "$instance" -a "$instance" = "$name" ]; then - instance_found=1 - fi - fi - } - - config_load dhcp - - if [ -n "$instance" ]; then - [ "$instance_found" -gt 0 ] || return - dnsmasq_stop "$instance" - else - config_foreach dnsmasq_stop dnsmasq - fi -} diff --git a/root/package/network/utils/iperf3/Makefile b/root/package/network/utils/iperf3/Makefile deleted file mode 100644 index 1a7f3c83..00000000 --- a/root/package/network/utils/iperf3/Makefile +++ /dev/null @@ -1,84 +0,0 @@ -# -# Copyright (C) 2007-2010 OpenWrt.org -# Copyright (C) 2019 Ycarus (Yannick Chabanois) -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=iperf -PKG_SOURCE_VERSION:=40e7c05440583f229edd6b6ca05c5d97b66fcf15 -PKG_VERSION:=3.6-$(PKG_SOURCE_VERSION) -PKG_RELEASE:=2 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/esnet/iperf.git - -PKG_MAINTAINER:=Yannick Chabanois -PKG_LICENSE:=BSD-3-Clause - -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 - -PKG_FIXUP:=autoreconf - -include $(INCLUDE_DIR)/package.mk - -DISABLE_NLS:= - -define Package/iperf3/default - SECTION:=net - CATEGORY:=Network - TITLE:=Internet Protocol bandwidth measuring tool - URL:=https://github.com/esnet/iperf -endef - -define Package/iperf3 -$(call Package/iperf3/default) - VARIANT:=nossl -endef - -define Package/iperf3-ssl -$(call Package/iperf3/default) - TITLE+= with iperf_auth support - VARIANT:=ssl - DEPENDS:= +libopenssl -endef - -TARGET_CFLAGS += -D_GNU_SOURCE -CONFIGURE_ARGS += --disable-shared - -ifeq ($(BUILD_VARIANT),ssl) - CONFIGURE_ARGS += --with-openssl="$(STAGING_DIR)/usr" -else - CONFIGURE_ARGS += --without-openssl -endif - -MAKE_FLAGS += noinst_PROGRAMS= - -define Package/iperf3/description - Iperf is a modern alternative for measuring TCP and UDP bandwidth - performance, allowing the tuning of various parameters and - characteristics. -endef - -# autoreconf fails if the README file isn't present -define Build/Prepare - $(call Build/Prepare/Default) - touch $(PKG_BUILD_DIR)/README -endef - -define Package/iperf3/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/iperf3 $(1)/usr/bin/ -endef - -define Package/iperf3-ssl/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/iperf3 $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,iperf3)) -$(eval $(call BuildPackage,iperf3-ssl)) diff --git a/root/package/system/fstools/patches/100-disable-lazy-init.patch b/root/package/system/fstools/patches/100-disable-lazy-init.patch deleted file mode 100644 index c3092570..00000000 --- a/root/package/system/fstools/patches/100-disable-lazy-init.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libfstools/rootdisk.c b/libfstools/rootdisk.c -index dd00c1b..f3b87fc 100644 ---- a/libfstools/rootdisk.c -+++ b/libfstools/rootdisk.c -@@ -270,7 +270,7 @@ static int rootdisk_volume_init(struct volume *v) - if (rootdisk_use_f2fs(p)) - snprintf(str, sizeof(str), "mkfs.f2fs -q -l rootfs_data %s", v->blk); - else -- snprintf(str, sizeof(str), "mkfs.ext4 -q -L rootfs_data %s", v->blk); -+ snprintf(str, sizeof(str), "mkfs.ext4 -q -E lazy_itable_init=0,lazy_journal_init=0 -L rootfs_data %s", v->blk); - ret = system(str); - break; - default: diff --git a/root/package/utils/wmt/Makefile b/root/package/utils/wmt/Makefile deleted file mode 100644 index dffd032e..00000000 --- a/root/package/utils/wmt/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (C) 2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=wmt -PKG_VERSION:=1.0.0 -PKG_RELEASE:=1 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/abbradar/wmt -PKG_SOURCE_VERSION:=2127e23dd94df960b12f3ffff806bcf41ebbf4b8 -PKG_MAINTAINER:=Nikolay Amiantov - -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/$(PKG_NAME) - SECTION:=utils - CATEGORY:=Utilities - TITLE:=wmt utility for MT6625L - DEPENDS:=kmod-mt6625l-wlan-gen2 - MAINTAINER:=Jinkai li -endef - -define Package/$(PKG_NAME)/description - Utility for loading MT6625L firmware. -endef - -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/stp_uart_launcher $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/wmt_loader $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/wmt_loopback $(1)/usr/bin/ - $(INSTALL_DIR) $(1)/system/etc/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/config/WMT_SOC.cfg $(1)/system/etc/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/config/WMT_SOC.cfg $(1)/system/etc/firmware/WMT.cfg - $(INSTALL_DIR) $(1)/etc/firmware - $(CP) -r $(PKG_BUILD_DIR)/firmware/* $(1)/etc/firmware/ - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/wmt.init $(1)/etc/init.d/wmt - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(INSTALL_BIN) ./files/wmt.defaults $(1)/etc/uci-defaults/8803-wmt -endef - -$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/root/package/utils/wmt/files/wmt.defaults b/root/package/utils/wmt/files/wmt.defaults deleted file mode 100644 index ff619a29..00000000 --- a/root/package/utils/wmt/files/wmt.defaults +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -if [ -z "$(uci -q get ucitrack.@wmt[0])" ]; then - uci -q batch <<-EOF - set ucitrack.@wmt[-1]=wmt - set ucitrack.@wmt[-1].init=wmt - add_list ucitrack.@wireless[0].affects=wmt - commit ucitrack - EOF -fi -exit 0 diff --git a/root/package/utils/wmt/files/wmt.init b/root/package/utils/wmt/files/wmt.init deleted file mode 100644 index bf4580e3..00000000 --- a/root/package/utils/wmt/files/wmt.init +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/sh /etc/rc.common - -START=69 - -check_mtk_device() { - config_get phy "$1" phy - [ "$phy" = "mtkp2p0" ] && { - [ "$(uci -q get wireless.$1.disabled)" = "1" ] || apmode="$1" - [ -z "$(uci -q get wireless.default_$1.ifname)" ] && { - uci -q batch <<-EOF - set wireless.default_$1.ifname=mtkap0 - set wireless.default_$1.bss_load_update_period=0 - rename wireless.$1=ap - rename wireless.default_$1=default_ap - set wireless.default_$1.device=ap - EOF - } - } - [ "$phy" = "mtkphy0" ] && { - [ "$(uci -q get wireless.$1.disabled)" = "1" ] || wlanmode="$1" - [ "$(uci -q get wireless.default_$1.mode)" = "ap" ] && { - uci -q batch <<-EOF - set wireless.default_$1.mode=sta - EOF - } - [ -z "$(uci -q get wireless.default_$1.ifname)" ] && { - uci -q batch <<-EOF - set wireless.default_$1.ifname=mtkwlan0 - set wireless.default_$1.bss_load_update_period=0 - rename wireless.$1=client - rename wireless.default_$1=default_client - set wireless.default_$1.device=client - EOF - } - } -} - -find_radio() { - config_load wireless - apmode="" - wlanmode="" - config_foreach check_mtk_device wifi-device - uci -q commit wireless -} - -start_ap() { - echo A > /dev/wmtWifi - # Those are recommended by vendor to avoid chip lockup. - tc qdisc add dev mtkap0 root handle 1: htb default 11 - tc class add dev mtkap0 parent 1:1 classid 1:2 htb rate 8Mbit ceil 4Mbit prio 2 - - find_radio - if [ -n "$apmode" ]; then - config_get_bool disabled "$apmode" disabled - [ "$disabled" = "1" ] || wifi up "$apmode" 2>/dev/null - fi -} - -start_wlan() { - echo 1 > /dev/wmtWifi - # Those are recommended by vendor to avoid chip lockup. - tc qdisc add dev mtkap0 root handle 1: htb default 11 - tc class add dev mtkap0 parent 1:1 classid 1:2 htb rate 8Mbit ceil 4Mbit prio 2 - - find_radio - if [ -n "$wlanmode" ]; then - config_get_bool disabled "$wlanmode" disabled - [ "$disabled" = "1" ] || wifi up "$wlanmode" 2>/dev/null - fi -} - -stop_apwlan() { - find_radio - [ -n "$apmode" ] && wifi down "$apmode" 2>/dev/null - [ -n "$wlanmode" ] && wifi down "$wlanmode" 2>/dev/null - echo 0 > /dev/wmtWifi - -} - -start() { - find_radio - - [ -c /dev/stpwmt ] || /usr/bin/wmt_loader 2>&1 - /usr/bin/stp_uart_launcher -p /etc/firmware 2>&1 | logger -t stp_uart_launcher & - echo "$!" > /var/run/stp_uart_launcher.pid - sleep 3 - if [ -c /dev/wmtWifi ]; then - [ -n "$apmode" ] && start_ap - [ -n "$wlanmode" ] && start_wlan - [ -z "$apmode" ] && [ -z "$wlanmode" ] && start_ap - return 0 - else - return 1 - fi -} - -stop() { - find_radio - - if [ -c /dev/wmtWifi ]; then - stop_apwlan - stp_pid="$(cat /var/run/stp_uart_launcher.pid 2>/dev/null)" - if [ -n "$stp_pid" ]; then - kill "$stp_pid" - rm /var/run/stp_uart_launcher.pid - fi - fi -} - -reload() { - find_radio - - if [ -c /dev/wmtWifi ]; then - stop_apwlan - [ -n "$apmode" ] && start_ap - [ -n "$wlanmode" ] && start_wlan - [ -z "$apmode" ] && [ -z "$wlanmode" ] && start_ap - fi -} diff --git a/root/rules.mk b/root/rules.mk deleted file mode 100644 index f79340b1..00000000 --- a/root/rules.mk +++ /dev/null @@ -1,430 +0,0 @@ -# -# Copyright (C) 2006-2010 OpenWrt.org -# Copyright (C) 2016 LEDE Project -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -ifneq ($(__rules_inc),1) -__rules_inc=1 - -ifeq ($(DUMP),) - -include $(TOPDIR)/.config -endif -include $(TOPDIR)/include/debug.mk -include $(TOPDIR)/include/verbose.mk - -ifneq ($(filter check,$(MAKECMDGOALS)),) -CHECK:=1 -DUMP:=1 -endif - -export TMP_DIR:=$(TOPDIR)/tmp -export TMPDIR:=$(TMP_DIR) - -qstrip=$(strip $(subst ",,$(1))) -#")) - -empty:= -space:= $(empty) $(empty) -comma:=, -merge=$(subst $(space),,$(1)) -confvar=$(shell echo '$(foreach v,$(1),$(v)=$(subst ','\'',$($(v))))' | $(STAGING_DIR_HOST)/bin/mkhash md5) -strip_last=$(patsubst %.$(lastword $(subst .,$(space),$(1))),%,$(1)) - -paren_left = ( -paren_right = ) -chars_lower = a b c d e f g h i j k l m n o p q r s t u v w x y z -chars_upper = A B C D E F G H I J K L M N O P Q R S T U V W X Y Z - -define sep - -endef - -define newline - - -endef - -__tr_list = $(join $(join $(1),$(foreach char,$(1),$(comma))),$(2)) -__tr_head_stripped = $(subst $(space),,$(foreach cv,$(call __tr_list,$(1),$(2)),$$$(paren_left)subst$(cv)$(comma))) -__tr_head = $(subst $(paren_left)subst,$(paren_left)subst$(space),$(__tr_head_stripped)) -__tr_tail = $(subst $(space),,$(foreach cv,$(1),$(paren_right))) -__tr_template = $(__tr_head)$$(1)$(__tr_tail) - -$(eval toupper = $(call __tr_template,$(chars_lower),$(chars_upper))) -$(eval tolower = $(call __tr_template,$(chars_upper),$(chars_lower))) - -version_abbrev = $(if $(if $(CHECK),,$(DUMP)),$(1),$(shell printf '%.8s' $(1))) - -_SINGLE=export MAKEFLAGS=$(space); -CFLAGS:= -ARCH:=$(subst i486,i386,$(subst i586,i386,$(subst i686,i386,$(call qstrip,$(CONFIG_ARCH))))) -ARCH_PACKAGES:=$(call qstrip,$(CONFIG_TARGET_ARCH_PACKAGES)) -BOARD:=$(call qstrip,$(CONFIG_TARGET_BOARD)) -SUBTARGET:=$(call qstrip,$(CONFIG_TARGET_SUBTARGET)) -TARGET_OPTIMIZATION:=$(call qstrip,$(CONFIG_TARGET_OPTIMIZATION)) -export EXTRA_OPTIMIZATION:=$(filter-out -fno-plt,$(call qstrip,$(CONFIG_EXTRA_OPTIMIZATION))) -TARGET_SUFFIX=$(call qstrip,$(CONFIG_TARGET_SUFFIX)) -BUILD_SUFFIX:=$(call qstrip,$(CONFIG_BUILD_SUFFIX)) -SUBDIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR}) -BUILD_SUBDIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR}) -NPROC:=$(shell sysctl -n hw.ncpu 2>/dev/null || nproc) -export SHELL:=/usr/bin/env bash - -IS_PACKAGE_BUILD := $(if $(filter package/%,$(BUILD_SUBDIR)),1) - -OPTIMIZE_FOR_CPU=$(subst i386,i486,$(ARCH)) - -ifneq (,$(findstring $(ARCH) , aarch64 aarch64_be powerpc )) - FPIC:=-fPIC -else - FPIC:=-fpic -endif - -HOST_FPIC:=-fPIC - -ARCH_SUFFIX:=$(call qstrip,$(CONFIG_CPU_TYPE)) -GCC_ARCH:= - -ifneq ($(ARCH_SUFFIX),) - ARCH_SUFFIX:=_$(ARCH_SUFFIX) -endif -ifneq ($(filter -march=armv%,$(TARGET_OPTIMIZATION)),) - GCC_ARCH:=$(patsubst -march=%,%,$(filter -march=armv%,$(TARGET_OPTIMIZATION))) -endif -ifdef CONFIG_HAS_SPE_FPU - TARGET_SUFFIX:=$(TARGET_SUFFIX)spe -endif -ifdef CONFIG_MIPS64_ABI - ifneq ($(CONFIG_MIPS64_ABI_O32),y) - ARCH_SUFFIX:=$(ARCH_SUFFIX)_$(call qstrip,$(CONFIG_MIPS64_ABI)) - endif -endif - -DEFAULT_SUBDIR_TARGETS:=clean download prepare compile update refresh prereq dist distcheck configure check check-depends - -define DefaultTargets -$(foreach t,$(DEFAULT_SUBDIR_TARGETS) $(1), - .$(t): - $(t): .$(t) - .PHONY: $(t) .$(t) -) -endef - -DL_DIR:=$(if $(call qstrip,$(CONFIG_DOWNLOAD_FOLDER)),$(call qstrip,$(CONFIG_DOWNLOAD_FOLDER)),$(TOPDIR)/dl) -OUTPUT_DIR:=$(if $(call qstrip,$(CONFIG_BINARY_FOLDER)),$(call qstrip,$(CONFIG_BINARY_FOLDER)),$(TOPDIR)/bin) -BIN_DIR:=$(OUTPUT_DIR)/targets/$(BOARD)/$(SUBTARGET) -INCLUDE_DIR:=$(TOPDIR)/include -SCRIPT_DIR:=$(TOPDIR)/scripts -BUILD_DIR_BASE:=$(TOPDIR)/build_dir -ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) - GCCV:=$(call qstrip,$(CONFIG_GCC_VERSION)) - LIBC:=$(call qstrip,$(CONFIG_LIBC)) - REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-openwrt-linux$(if $(TARGET_SUFFIX),-$(TARGET_SUFFIX)) - GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-openwrt-linux - DIR_SUFFIX:=_$(LIBC)$(if $(CONFIG_arm),_eabi) - BIN_DIR:=$(BIN_DIR)$(if $(CONFIG_USE_MUSL),,-$(LIBC)) - TARGET_DIR_NAME = target-$(ARCH)$(ARCH_SUFFIX)$(DIR_SUFFIX)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX)) - TOOLCHAIN_DIR_NAME = toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)$(DIR_SUFFIX) -else - ifeq ($(CONFIG_NATIVE_TOOLCHAIN),) - GNU_TARGET_NAME=$(call qstrip,$(CONFIG_TARGET_NAME)) - else - GNU_TARGET_NAME=$(shell gcc -dumpmachine) - endif - REAL_GNU_TARGET_NAME=$(GNU_TARGET_NAME) - LIBC:=$(call qstrip,$(CONFIG_LIBC)) - TARGET_DIR_NAME:=target-$(GNU_TARGET_NAME)_$(LIBC)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX)) - TOOLCHAIN_DIR_NAME:=toolchain-$(GNU_TARGET_NAME) -endif - -ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_TARGET_uml)),) - ifeq ($(CONFIG_GCC_USE_IREMAP),y) - iremap = -iremap$(1):$(2) - else - iremap = -f$(if $(CONFIG_REPRODUCIBLE_DEBUG_INFO),file,macro)-prefix-map=$(1)=$(2) - endif -endif - -PACKAGE_DIR:=$(BIN_DIR)/packages -PACKAGE_DIR_ALL:=$(TOPDIR)/staging_dir/packages/$(BOARD) -BUILD_DIR:=$(BUILD_DIR_BASE)/$(TARGET_DIR_NAME) -STAGING_DIR:=$(TOPDIR)/staging_dir/$(TARGET_DIR_NAME) -BUILD_DIR_TOOLCHAIN:=$(BUILD_DIR_BASE)/$(TOOLCHAIN_DIR_NAME) -TOOLCHAIN_DIR:=$(TOPDIR)/staging_dir/$(TOOLCHAIN_DIR_NAME) -STAMP_DIR:=$(BUILD_DIR)/stamp -STAMP_DIR_HOST=$(BUILD_DIR_HOST)/stamp -TARGET_ROOTFS_DIR?=$(if $(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(BUILD_DIR)) -TARGET_DIR:=$(TARGET_ROOTFS_DIR)/root-$(BOARD) -STAGING_DIR_ROOT:=$(STAGING_DIR)/root-$(BOARD) -STAGING_DIR_IMAGE:=$(STAGING_DIR)/image -BUILD_LOG_DIR:=$(if $(call qstrip,$(CONFIG_BUILD_LOG_DIR)),$(call qstrip,$(CONFIG_BUILD_LOG_DIR)),$(TOPDIR)/logs) -PKG_INFO_DIR := $(STAGING_DIR)/pkginfo - -BUILD_DIR_HOST:=$(if $(IS_PACKAGE_BUILD),$(BUILD_DIR_BASE)/hostpkg,$(BUILD_DIR_BASE)/host) -STAGING_DIR_HOST:=$(TOPDIR)/staging_dir/host -STAGING_DIR_HOSTPKG:=$(TOPDIR)/staging_dir/hostpkg - -TARGET_PATH:=$(subst $(space),:,$(filter-out .,$(filter-out ./,$(subst :,$(space),$(PATH))))) -TARGET_INIT_PATH:=$(call qstrip,$(CONFIG_TARGET_INIT_PATH)) -TARGET_INIT_PATH:=$(if $(TARGET_INIT_PATH),$(TARGET_INIT_PATH),/usr/sbin:/sbin:/usr/bin:/bin) -TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)$(if $(CONFIG_DEBUG), -g3) $(call qstrip,$(CONFIG_EXTRA_OPTIMIZATION)) -TARGET_CXXFLAGS = $(TARGET_CFLAGS) -TARGET_ASFLAGS_DEFAULT = $(TARGET_CFLAGS) -TARGET_ASFLAGS = $(TARGET_ASFLAGS_DEFAULT) -ifneq ($(CONFIG_EXTERNAL_TOOLCHAIN),) -LIBGCC_S_PATH=$(realpath $(wildcard $(call qstrip,$(CONFIG_LIBGCC_ROOT_DIR))/$(call qstrip,$(CONFIG_LIBGCC_FILE_SPEC)))) -LIBGCC_S=$(if $(LIBGCC_S_PATH),-L$(dir $(LIBGCC_S_PATH)) -lgcc_s) -LIBGCC_A=$(realpath $(lastword $(wildcard $(dir $(LIBGCC_S_PATH))/gcc/*/*/libgcc.a))) -else -LIBGCC_A=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc.a)) -LIBGCC_S=$(if $(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so),-L$(TOOLCHAIN_DIR)/lib -lgcc_s,$(LIBGCC_A)) -endif - -ifeq ($(CONFIG_ARCH_64BIT),y) - LIB_SUFFIX:=64 -endif - -ifndef DUMP - ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) - -include $(TOOLCHAIN_DIR)/info.mk - export GCC_HONOUR_COPTS:=0 - TARGET_CROSS:=$(if $(TARGET_CROSS),$(TARGET_CROSS),$(OPTIMIZE_FOR_CPU)-openwrt-linux$(if $(TARGET_SUFFIX),-$(TARGET_SUFFIX))-) - TARGET_CFLAGS+= -fhonour-copts -Wno-error=unused-but-set-variable -Wno-error=unused-result - TARGET_CPPFLAGS+= -I$(TOOLCHAIN_DIR)/usr/include - ifeq ($(CONFIG_USE_MUSL),y) - TARGET_CPPFLAGS+= -I$(TOOLCHAIN_DIR)/include/fortify - endif - TARGET_CPPFLAGS+= -I$(TOOLCHAIN_DIR)/include - TARGET_LDFLAGS+= -L$(TOOLCHAIN_DIR)/usr/lib -L$(TOOLCHAIN_DIR)/lib - TARGET_PATH:=$(TOOLCHAIN_DIR)/bin:$(TARGET_PATH) - else - ifeq ($(CONFIG_NATIVE_TOOLCHAIN),) - TARGET_CROSS:=$(call qstrip,$(CONFIG_TOOLCHAIN_PREFIX)) - TOOLCHAIN_ROOT_DIR:=$(call qstrip,$(CONFIG_TOOLCHAIN_ROOT)) - TOOLCHAIN_BIN_DIRS:=$(patsubst ./%,$(TOOLCHAIN_ROOT_DIR)/%,$(call qstrip,$(CONFIG_TOOLCHAIN_BIN_PATH))) - TOOLCHAIN_INC_DIRS:=$(patsubst ./%,$(TOOLCHAIN_ROOT_DIR)/%,$(call qstrip,$(CONFIG_TOOLCHAIN_INC_PATH))) - TOOLCHAIN_LIB_DIRS:=$(patsubst ./%,$(TOOLCHAIN_ROOT_DIR)/%,$(call qstrip,$(CONFIG_TOOLCHAIN_LIB_PATH))) - ifneq ($(TOOLCHAIN_BIN_DIRS),) - TARGET_PATH:=$(subst $(space),:,$(TOOLCHAIN_BIN_DIRS)):$(TARGET_PATH) - endif - ifneq ($(TOOLCHAIN_INC_DIRS),) - TARGET_CPPFLAGS+= $(patsubst %,-I%,$(TOOLCHAIN_INC_DIRS)) - endif - ifneq ($(TOOLCHAIN_LIB_DIRS),) - TARGET_LDFLAGS+= $(patsubst %,-L%,$(TOOLCHAIN_LIB_DIRS)) - endif - TARGET_PATH:=$(TOOLCHAIN_DIR)/bin:$(TARGET_PATH) - endif - endif -endif -TARGET_PATH_PKG:=$(STAGING_DIR)/host/bin:$(STAGING_DIR_HOSTPKG)/bin:$(TARGET_PATH) - -ifeq ($(CONFIG_SOFT_FLOAT),y) - SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft - ifeq ($(CONFIG_arm),y) - TARGET_CFLAGS+= -mfloat-abi=soft - else - TARGET_CFLAGS+= -msoft-float - endif -else - SOFT_FLOAT_CONFIG_OPTION:= - ifeq ($(CONFIG_arm),y) - TARGET_CFLAGS+= -mfloat-abi=hard - endif -endif - -export PATH:=$(TARGET_PATH) -export STAGING_DIR STAGING_DIR_HOST STAGING_DIR_HOSTPKG -export SH_FUNC:=. $(INCLUDE_DIR)/shell.sh; - -PKG_CONFIG:=$(STAGING_DIR_HOST)/bin/pkg-config - -export PKG_CONFIG - -HOSTCC:=gcc -HOSTCXX:=g++ -HOST_CPPFLAGS:=-I$(STAGING_DIR_HOST)/include $(if $(IS_PACKAGE_BUILD),-I$(STAGING_DIR_HOSTPKG)/include -I$(STAGING_DIR)/host/include) -HOST_CFLAGS:=-O2 $(HOST_CPPFLAGS) -HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib $(if $(IS_PACKAGE_BUILD),-L$(STAGING_DIR_HOSTPKG)/lib -L$(STAGING_DIR)/host/lib) - -ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) - TARGET_AR:=$(TARGET_CROSS)gcc-ar - TARGET_RANLIB:=$(TARGET_CROSS)gcc-ranlib - TARGET_NM:=$(TARGET_CROSS)gcc-nm -else - TARGET_AR:=$(TARGET_CROSS)ar - TARGET_RANLIB:=$(TARGET_CROSS)ranlib - TARGET_NM:=$(TARGET_CROSS)nm -endif - -BUILD_KEY=$(TOPDIR)/key-build - -FAKEROOT:=$(STAGING_DIR_HOST)/bin/fakeroot - -TARGET_CC:=$(TARGET_CROSS)gcc -TARGET_CXX:=$(TARGET_CROSS)g++ -KPATCH:=$(SCRIPT_DIR)/patch-kernel.sh -SED:=$(STAGING_DIR_HOST)/bin/sed -i -e -ESED:=$(STAGING_DIR_HOST)/bin/sed -E -i -e -CP:=cp -fpR -LN:=ln -sf -XARGS:=xargs -r - -BASH:=bash -TAR:=tar -FIND:=find -PATCH:=patch -PYTHON:=python - -INSTALL_BIN:=install -m0755 -INSTALL_SUID:=install -m4755 -INSTALL_DIR:=install -d -m0755 -INSTALL_DATA:=install -m0644 -INSTALL_CONF:=install -m0600 - -TARGET_CC_NOCACHE:=$(TARGET_CC) -TARGET_CXX_NOCACHE:=$(TARGET_CXX) -HOSTCC_NOCACHE:=$(HOSTCC) -HOSTCXX_NOCACHE:=$(HOSTCXX) -export TARGET_CC_NOCACHE -export TARGET_CXX_NOCACHE -export HOSTCC_NOCACHE -export HOSTCXX_NOCACHE - -ifneq ($(CONFIG_CCACHE),) - TARGET_CC:= ccache_cc - TARGET_CXX:= ccache_cxx - HOSTCC:= ccache $(HOSTCC) - HOSTCXX:= ccache $(HOSTCXX) - export CCACHE_BASEDIR:=$(TOPDIR) - export CCACHE_DIR:=$(if $(call qstrip,$(CONFIG_CCACHE_DIR)),$(call qstrip,$(CONFIG_CCACHE_DIR)),$(TOPDIR)/.ccache) - export CCACHE_COMPILERCHECK:=%compiler% -dumpmachine; %compiler% -dumpversion -endif - -TARGET_CONFIGURE_OPTS = \ - AR="$(TARGET_AR)" \ - AS="$(TARGET_CC) -c $(TARGET_ASFLAGS)" \ - LD=$(TARGET_CROSS)ld \ - NM="$(TARGET_NM)" \ - CC="$(TARGET_CC)" \ - GCC="$(TARGET_CC)" \ - CXX="$(TARGET_CXX)" \ - RANLIB="$(TARGET_RANLIB)" \ - STRIP=$(TARGET_CROSS)strip \ - OBJCOPY=$(TARGET_CROSS)objcopy \ - OBJDUMP=$(TARGET_CROSS)objdump \ - SIZE=$(TARGET_CROSS)size - -# strip an entire directory -ifneq ($(CONFIG_NO_STRIP),) - RSTRIP:=: - STRIP:=: -else - ifneq ($(CONFIG_USE_STRIP),) - STRIP:=$(TARGET_CROSS)strip $(call qstrip,$(CONFIG_STRIP_ARGS)) - else - ifneq ($(CONFIG_USE_SSTRIP),) - STRIP:=$(STAGING_DIR_HOST)/bin/sstrip $(call qstrip,$(CONFIG_SSTRIP_ARGS)) - endif - endif - RSTRIP= \ - export CROSS="$(TARGET_CROSS)" \ - $(if $(PKG_BUILD_ID),KEEP_BUILD_ID=1) \ - $(if $(CONFIG_KERNEL_KALLSYMS),NO_RENAME=1) \ - $(if $(CONFIG_KERNEL_PROFILING),KEEP_SYMBOLS=1); \ - NM="$(TARGET_CROSS)nm" \ - STRIP="$(STRIP)" \ - STRIP_KMOD="$(SCRIPT_DIR)/strip-kmod.sh" \ - PATCHELF="$(STAGING_DIR_HOST)/bin/patchelf" \ - $(SCRIPT_DIR)/rstrip.sh -endif - -ifeq ($(CONFIG_IPV6),y) - DISABLE_IPV6:= -else - DISABLE_IPV6:=--disable-ipv6 -endif - -TAR_OPTIONS:=-xf - - -ifeq ($(CONFIG_BUILD_LOG),y) - BUILD_LOG:=1 -endif - -export BISON_PKGDATADIR:=$(STAGING_DIR_HOST)/share/bison -export M4:=$(STAGING_DIR_HOST)/bin/m4 - -define shvar -V_$(subst .,_,$(subst -,_,$(subst /,_,$(1)))) -endef - -define shexport -export $(call shvar,$(1))=$$(call $(1)) -endef - -# Execute commands under flock -# $(1) => The shell expression. -# $(2) => The lock name. If not given, the global lock will be used. -ifneq ($(wildcard $(STAGING_DIR_HOST)/bin/flock),) - define locked - SHELL= \ - flock \ - $(TMP_DIR)/.$(if $(2),$(strip $(2)),global).flock \ - -c '$(subst ','\'',$(1))' - endef -else - locked=$(1) -endif - -# Recursively copy paths into another directory, purge dangling -# symlinks before. -# $(1) => File glob expression -# $(2) => Destination directory -define file_copy - for src_dir in $(sort $(foreach d,$(wildcard $(1)),$(dir $(d)))); do \ - ( cd $$src_dir; find -type f -or -type d ) | \ - ( cd $(2); while :; do \ - read FILE; \ - [ -z "$$FILE" ] && break; \ - [ -L "$$FILE" ] || continue; \ - echo "Removing symlink $(2)/$$FILE"; \ - rm -f "$$FILE"; \ - done; ); \ - done; \ - $(CP) $(1) $(2) -endef - -# Calculate sha256sum of any plain file within a given directory -# $(1) => Input directory -# $(2) => If set, recurse into subdirectories -define sha256sums - (cd $(1); find . $(if $(2),,-maxdepth 1) -type f -not -name 'sha256sums' -printf "%P\n" | sort | \ - xargs -r $(STAGING_DIR_HOST)/bin/mkhash -n sha256 | sed -ne 's!^\(.*\) \(.*\)$$!\1 *\2!p' > sha256sums) -endef - -# file extension -ext=$(word $(words $(subst ., ,$(1))),$(subst ., ,$(1))) - -all: -FORCE: ; -.PHONY: FORCE - -check: FORCE - @true - -val.%: - @$(if $(filter undefined,$(origin $*)),\ - echo "$* undefined" >&2, \ - echo '$(subst ','"'"',$($*))' \ - ) - -var.%: - @$(if $(filter undefined,$(origin $*)),\ - echo "$* undefined" >&2, \ - echo "$*='"'$(subst ','"'\"'\"'"',$($*))'"'" \ - ) - -endif #__rules_inc diff --git a/root/target/linux/bcm27xx/patches-5.4/990-xhci-quirks-add-link-TRB-quirk-VL805.patch b/root/target/linux/bcm27xx/patches-5.4/990-xhci-quirks-add-link-TRB-quirk-VL805.patch deleted file mode 100644 index 0cceec21..00000000 --- a/root/target/linux/bcm27xx/patches-5.4/990-xhci-quirks-add-link-TRB-quirk-VL805.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 5d9d9ba7547ad27d76dd36791f54a57ff555ff8a Mon Sep 17 00:00:00 2001 -From: Jonathan Bell -Date: Mon, 26 Oct 2020 14:03:35 +0000 -Subject: [PATCH] xhci: quirks: add link TRB quirk for VL805 - -The VL805 controller can't cope with the TR Dequeue Pointer for an endpoint -being set to a Link TRB. The hardware-maintained endpoint context ends up -stuck at the address of the Link TRB, leading to erroneous ring expansion -events whenever the enqueue pointer wraps to the dequeue position. - -If the search for the end of the current TD and ring cycle state lands on -a Link TRB, move to the next segment. - -See: https://github.com/raspberrypi/linux/issues/3919 - -Signed-off-by: Jonathan Bell ---- - drivers/usb/host/xhci-pci.c | 1 + - drivers/usb/host/xhci-ring.c | 10 ++++++++++ - drivers/usb/host/xhci.h | 1 + - 3 files changed, 12 insertions(+) - -diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index 5238fa29ea978..b975e6803d485 100644 ---- a/drivers/usb/host/xhci-pci.c -+++ b/drivers/usb/host/xhci-pci.c -@@ -251,6 +251,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) - pdev->device == 0x3483) { - xhci->quirks |= XHCI_LPM_SUPPORT; - xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; -+ xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; - } - - if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && -diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c -index d99e636f3844c..8149abff857c2 100644 ---- a/drivers/usb/host/xhci-ring.c -+++ b/drivers/usb/host/xhci-ring.c -@@ -624,6 +624,16 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, - - } while (!cycle_found || !td_last_trb_found); - -+ /* -+ * Quirk: the xHC does not correctly parse link TRBs if the HW Dequeue -+ * pointer is set to one. Advance to the next TRB (and next segment). -+ */ -+ if (xhci->quirks & XHCI_AVOID_DQ_ON_LINK && trb_is_link(new_deq)) { -+ if (link_trb_toggles_cycle(new_deq)) -+ state->new_cycle_state ^= 0x1; -+ next_trb(xhci, ep_ring, &new_seg, &new_deq); -+ } -+ - state->new_deq_seg = new_seg; - state->new_deq_ptr = new_deq; - -diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index 2033bb8683033..90ccc71231c1a 100644 ---- a/drivers/usb/host/xhci.h -+++ b/drivers/usb/host/xhci.h -@@ -1874,6 +1874,7 @@ struct xhci_hcd { - #define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34) - #define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35) - #define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(36) -+#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(37) - - unsigned int num_active_eps; - unsigned int limit_active_eps; diff --git a/root/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/root/target/linux/ipq40xx/base-files/etc/board.d/01_leds deleted file mode 100755 index a512a4d0..00000000 --- a/root/target/linux/ipq40xx/base-files/etc/board.d/01_leds +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2015 OpenWrt.org -# - -. /lib/functions/uci-defaults.sh - -board_config_update - -board=$(board_name) - -case "$board" in -alfa-network,ap120c-ac) - ucidef_set_led_netdev "wan" "WAN" "amber:wan" "eth1" - ;; -asus,rt-ac58u) - ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1" - ucidef_set_led_switch "lan" "LAN" "blue:lan" "switch0" "0x1e" - ;; -avm,fritzbox-4040) - ucidef_set_led_wlan "wlan" "WLAN" "green:wlan" "phy0tpt" "phy1tpt" - ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1" - ucidef_set_led_switch "lan" "LAN" "green:lan" "switch0" "0x1e" - ;; -avm,fritzbox-7530 |\ -glinet,gl-b1300) - ucidef_set_led_wlan "wlan" "WLAN" "green:wlan" "phy0tpt" - ;; -edgecore,oap100) - ucidef_set_led_wlan "wlan2g" "WLAN2G" "blue:wlan2g" "phy0tpt" - ucidef_set_led_wlan "wlan5g" "WLAN5G" "blue:wlan5g" "phy1tpt" - ;; -engenius,eap1300) - ucidef_set_led_netdev "lan" "LAN" "blue:lan" "eth0" - ucidef_set_led_wlan "wlan2g" "WLAN2G" "blue:wlan2g" "phy0tpt" - ucidef_set_led_wlan "wlan5g" "WLAN5G" "yellow:wlan5g" "phy1tpt" - ucidef_set_led_default "mesh" "MESH" "blue:mesh" "0" - ;; -engenius,eap2200) - ucidef_set_led_netdev "lan1" "LAN1" "blue:lan1" "eth0" - ucidef_set_led_netdev "lan2" "LAN2" "blue:lan2" "eth1" - ;; -engenius,ens620ext) - ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan2g" "phy0tpt" - ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wlan5g" "phy1tpt" - ucidef_set_led_netdev "lan1" "LAN1" "green:lan1" "eth0" - ucidef_set_led_netdev "lan2" "LAN2" "green:lan2" "eth1" - ;; -pangu,l1000) -ucidef_set_led_default "power" "POWER" "${boardname}:blue:power" "1" -ucidef_set_led_wlan "wlan2g" "WLAN2G" "${boardname}:blue:wlan2g" "phy0tpt" -ucidef_set_led_wlan "wlan5g" "WLAN5G" "${boardname}:blue:wlan5g" "phy1tpt" -ucidef_set_led_switch "wan" "WAN" "${boardname}:blue:wan" "switch0" "0x20" - ;; -mobipromo,cm520-79f) - ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1" - ucidef_set_led_switch "lan1" "LAN1" "blue:lan1" "switch0" "0x10" - ucidef_set_led_switch "lan2" "LAN2" "blue:lan2" "switch0" "0x08" - ;; -pangu,l1000) - ucidef_set_led_default "power" "POWER" "blue:power" "1" - ucidef_set_led_wlan "wlan2g" "WLAN2G" "blue:wlan2g" "phy0tpt" - ucidef_set_led_wlan "wlan5g" "WLAN5G" "blue:wlan5g" "phy1tpt" - ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1" - ;; -p2w,r619ac |\ -p2w,r619ac-128m) - ucidef_set_led_wlan "wlan2g" "WLAN2G" "blue:wlan2g" "phy0tpt" - ucidef_set_led_wlan "wlan5g" "WLAN5G" "blue:wlan5g" "phy1tpt" - ;; -netgear,ex6100v2 |\ -netgear,ex6150v2) - ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:router" "phy0tpt" - ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:client" "phy1tpt" - ;; -qxwlan,e2600ac-c1 |\ -qxwlan,e2600ac-c2) - ucidef_set_led_wlan "wlan2g" "WLAN0" "green:wlan0" "phy0tpt" - ucidef_set_led_wlan "wlan5g" "WLAN1" "green:wlan1" "phy1tpt" - ;; -zyxel,nbg6617 |\ -zyxel,wre6606) - ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan2g" "phy0tpt" - ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wlan5g" "phy1tpt" - ;; -esac - -board_config_flush - -exit 0 \ No newline at end of file diff --git a/root/target/linux/ipq40xx/base-files/etc/board.d/02_network b/root/target/linux/ipq40xx/base-files/etc/board.d/02_network deleted file mode 100755 index 3ffab649..00000000 --- a/root/target/linux/ipq40xx/base-files/etc/board.d/02_network +++ /dev/null @@ -1,190 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2015 The Linux Foundation. All rights reserved. -# Copyright (c) 2011-2015 OpenWrt.org -# - -. /lib/functions/uci-defaults.sh -. /lib/functions/system.sh - -ipq40xx_setup_interfaces() -{ - local board="$1" - - case "$board" in - 8dev,habanero-dvk|\ - 8dev,jalapeno|\ - alfa-network,ap120c-ac|\ - engenius,emr3500|\ - engenius,ens620ext|\ - luma,wrtq-329acn|\ - plasmacloud,pa1200|\ - plasmacloud,pa2200) - ucidef_set_interfaces_lan_wan "eth0" "eth1" - ;; - aruba,ap-303|\ - aruba,ap-365|\ - avm,fritzrepeater-1200|\ - dlink,dap-2610 |\ - engenius,eap1300|\ - engenius,emd1|\ - meraki,mr33|\ - netgear,ex6100v2|\ - netgear,ex6150v2|\ - zyxel,wre6606) - ucidef_set_interface_lan "eth0" - ;; - aruba,ap-303h) - ucidef_set_interfaces_lan_wan "eth0" "eth1" - ucidef_add_switch "switch0" \ - "0u@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "0u@eth1" "5:wan" - ;; - asus,map-ac2200|\ - cilab,meshpoint-one|\ - edgecore,ecw5211|\ - edgecore,oap100|\ - openmesh,a42|\ - openmesh,a62) - ucidef_set_interfaces_lan_wan "eth1" "eth0" - ;; - asus,rt-ac58u|\ - zyxel,nbg6617)|\ - p2w,r619ac-128m)|\ - p2w,r619ac) - ucidef_set_interfaces_lan_wan "eth0" "eth1" - ucidef_add_switch "switch0" \ - "0u@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" - ;; - avm,fritzbox-4040|\ - linksys,ea6350v3|\ - linksys,ea8300|\ - pangu,l1000|\ - linksys,mr8300) - ucidef_set_interfaces_lan_wan "eth0" "eth1" - ucidef_add_switch "switch0" \ - "0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan" - ;; - avm,fritzbox-7530) - ucidef_add_switch "switch0" \ - "0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan" - ;; - avm,fritzrepeater-3000) - ucidef_add_switch "switch0" \ - "0u@eth0" "4:lan:1" "5:lan:2" - ;; - compex,wpj419|\ - compex,wpj428|\ - engenius,eap2200) - ucidef_set_interface_lan "eth0 eth1" - ;; - buffalo,wtr-m2133hp) - ucidef_set_interfaces_lan_wan "eth0" "eth1" - ucidef_add_switch "switch0" \ - "0u@eth0" "2:lan:3" "3:lan:2" "4:lan:1" - ;; - cellc,rtl30vw) - ucidef_set_interface_lan "eth0" - ucidef_add_switch "switch0" \ - "0u@eth0" "3:lan" "4:lan" - ;; - devolo,magic-2-wifi-next) - ucidef_set_interface_lan "eth0 eth1 eth2" - ;; - ezviz,cs-w3-wd1200g-eup) - ucidef_set_interfaces_lan_wan "eth0" "eth1" - ucidef_add_switch "switch0" \ - "0u@eth0" "2:lan:3" "3:lan:2" "4:lan:1" "0u@eth1" "5:wan" - ;; - glinet,gl-b1300 |\ - glinet,gl-s1300) - ucidef_set_interfaces_lan_wan "eth0" "eth1" - ucidef_add_switch "switch0" \ - "0u@eth0" "3:lan" "4:lan" - ;; - mobipromo,cm520-79f) - ucidef_add_switch "switch0" \ - "0u@eth0" "3:lan:2" "4:lan:1" - ucidef_set_interface_wan "eth1" - ;; - qxwlan,e2600ac-c1 |\ - qxwlan,e2600ac-c2) - ucidef_set_interfaces_lan_wan "eth0" "eth1" - ucidef_add_switch "switch0" \ - "0u@eth0" "3:lan" "4:lan" "0u@eth1" "5:wan" - ;; - unielec,u4019-32m) - ucidef_set_interfaces_lan_wan "eth0" "eth1" - ucidef_add_switch "switch0" \ - "0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "0u@eth1" "5:wan" - ;; - *) - echo "Unsupported hardware. Network interfaces not initialized" - ;; - esac -} - -ipq40xx_setup_macs() -{ - local board="$1" - local lan_mac="" - local wan_mac="" - local label_mac="" - - case "$board" in - 8dev,habanero-dvk) - label_mac=$(mtd_get_mac_binary "ART" 0x1006) - ;; - asus,rt-ac58u|\ - p2w,r619ac-128m|\ - p2w,r619ac) - CI_UBIPART=UBI_DEV - wan_mac=$(mtd_get_mac_binary_ubi Factory 0x1006) - lan_mac=$(mtd_get_mac_binary_ubi Factory 0x5006) - label_mac=$wan_mac - ;; - cilab,meshpoint-one) - label_mac=$(mtd_get_mac_binary "ART" 0x1006) - ;; - devolo,magic-2-wifi-next) - lan_mac=$(mtd_get_mac_ascii APPSBLENV MacAddress0) - label_mac=$lan_mac - ;; - dlink,dap-2610) - lan_mac=$(mtd_get_mac_ascii bdcfg lanmac) - label_mac=$lan_mac - ;; - engenius,eap2200|\ - engenius,emd1) - lan_mac=$(mtd_get_mac_ascii 0:APPSBLENV ethaddr) - label_mac=$lan_mac - ;; - engenius,emr3500) - wan_mac=$(mtd_get_mac_ascii 0:APPSBLENV wanaddr) - lan_mac=$(mtd_get_mac_ascii 0:APPSBLENV ethaddr) - label_mac=$wan_mac - ;; - engenius,ens620ext) - wan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr) - lan_mac=$(macaddr_add "$wan_mac" 1) - ;; - ezviz,cs-w3-wd1200g-eup) - label_mac=$(mtd_get_mac_binary "ART" 0x6) - ;; - linksys,ea6350v3) - wan_mac=$(mtd_get_mac_ascii devinfo hw_mac_addr) - lan_mac=$(macaddr_add "$wan_mac" 1) - ;; - esac - - [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac - [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" $wan_mac - [ -n "$label_mac" ] && ucidef_set_label_macaddr $label_mac -} - -board_config_update -board=$(board_name) -ipq40xx_setup_interfaces $board -ipq40xx_setup_macs $board -board_config_flush - -exit 0 \ No newline at end of file diff --git a/root/target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches b/root/target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches deleted file mode 100755 index a483fbc0..00000000 --- a/root/target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -. /lib/functions/uci-defaults.sh - -board_config_update - -board=$(board_name) - -case "$board" in -cellc,rtl30vw) - ucidef_add_gpio_switch "w_disable" "W_DISABLE mPCIE pin" "398" "1" - ucidef_add_gpio_switch "pmd_resin_n" "PMD_RESIN_N pin" "399" "1" - ucidef_add_gpio_switch "mcpie_vcc" "LTE power" "400" "0" - ucidef_add_gpio_switch "usb_vcc" "USB power" "401" "0" - ;; -cilab,meshpoint-one) - ucidef_add_gpio_switch "poe_passtrough" "POE passtrough enable" "413" "1" - ;; -compex,wpj428) - ucidef_add_gpio_switch "sim_card_select" "SIM card select" "3" "0" - ;; -esac - -board_config_flush - -exit 0 \ No newline at end of file diff --git a/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata deleted file mode 100644 index 003734d0..00000000 --- a/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ /dev/null @@ -1,276 +0,0 @@ -#!/bin/sh - -[ -e /lib/firmware/$FIRMWARE ] && exit 0 - -. /lib/functions/caldata.sh - -board=$(board_name) - -case "$FIRMWARE" in -"ath10k/cal-pci-0000:01:00.0.bin") - case "$board" in - meraki,mr33) - caldata_extract_ubi "ART" 0x9000 0x844 - caldata_valid "4408" || caldata_extract "ART" 0x9000 0x844 - ath10k_patch_mac $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) +1) - ;; - esac - ;; -"ath10k/pre-cal-pci-0000:01:00.0.bin") - case "$board" in - asus,map-ac2200) - caldata_extract_ubi "Factory" 0x9000 0x2f20 - ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \ - /lib/firmware/ath10k/QCA9888/hw2.0/board.bin - ;; - avm,fritzrepeater-3000) - /usr/bin/fritz_cal_extract -i 1 -s 0x3D000 -e 0x212 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader0") || \ - /usr/bin/fritz_cal_extract -i 1 -s 0x3C800 -e 0x212 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader0") || \ - /usr/bin/fritz_cal_extract -i 1 -s 0x3C000 -e 0x212 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader0") || \ - /usr/bin/fritz_cal_extract -i 1 -s 0x3D000 -e 0x212 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") || \ - /usr/bin/fritz_cal_extract -i 1 -s 0x3C800 -e 0x212 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") || \ - /usr/bin/fritz_cal_extract -i 1 -s 0x3C000 -e 0x212 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") - ;; - buffalo,wtr-m2133hp) - caldata_extract "ART" 0x9000 0x2f20 - ath10k_patch_mac $(mtd_get_mac_binary ORGDATA 0x32) - ;; - engenius,eap2200 |\ - openmesh,a62 |\ - plasmacloud,pa2200) - caldata_extract "0:ART" 0x9000 0x2f20 - ;; - linksys,ea8300 |\ - linksys,mr8300) - caldata_extract "ART" 0x9000 0x2f20 - # OEM assigns 4 sequential MACs - ath10k_patch_mac $(macaddr_setbit_la $(macaddr_add "$(cat /sys/class/net/eth0/address)" 4)) - ;; - pangu,l1000) - caldata_extract "ART" 0x5000 0x2f20 - ath10k_patch_mac $(macaddr_add "$(cat /sys/class/net/eth0/address)" 3) - ;; - esac - ;; -"ath10k/pre-cal-ahb-a000000.wifi.bin") - case "$board" in - 8dev,habanero-dvk |\ - 8dev,jalapeno |\ - alfa-network,ap120c-ac |\ - cilab,meshpoint-one |\ - ezviz,cs-w3-wd1200g-eup |\ - glinet,gl-b1300 |\ - glinet,gl-s1300 |\ - linksys,ea6350v3 |\ - mobipromo,cm520-79f |\ - p2w,r619ac-128m |\ - p2w,r619ac |\ - qcom,ap-dk01.1-c1) - caldata_extract "ART" 0x1000 0x2f20 - ;; - aruba,ap-303 |\ - aruba,ap-303h |\ - aruba,ap-365) - caldata_extract "ART" 0x1000 0x2f20 - ath10k_patch_mac $(mtd_get_mac_binary mfginfo 0x1D) - ;; - asus,map-ac2200) - caldata_extract_ubi "Factory" 0x1000 0x2f20 - ;; - asus,rt-ac58u) - CI_UBIPART=UBI_DEV - caldata_extract_ubi "Factory" 0x1000 0x2f20 - ;; - avm,fritzbox-4040) - /usr/bin/fritz_cal_extract -i 1 -s 0x400 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader_config") - ;; - avm,fritzbox-7530 |\ - avm,fritzrepeater-1200 |\ - avm,fritzrepeater-3000) - /usr/bin/fritz_cal_extract -i 1 -s 0x3C000 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader0") || \ - /usr/bin/fritz_cal_extract -i 1 -s 0x3C800 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader0") || \ - /usr/bin/fritz_cal_extract -i 1 -s 0x3D000 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader0") || \ - /usr/bin/fritz_cal_extract -i 1 -s 0x3C000 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") || \ - /usr/bin/fritz_cal_extract -i 1 -s 0x3C800 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") || \ - /usr/bin/fritz_cal_extract -i 1 -s 0x3D000 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") - ;; - buffalo,wtr-m2133hp) - caldata_extract "ART" 0x1000 0x2f20 - ath10k_patch_mac $(mtd_get_mac_binary ORGDATA 0x26) - ;; - cellc,rtl30vw |\ - compex,wpj419 |\ - compex,wpj428 |\ - edgecore,ecw5211 |\ - edgecore,oap100 |\ - engenius,eap1300 |\ - engenius,eap2200 |\ - luma,wrtq-329acn|\ - openmesh,a42 |\ - openmesh,a62 |\ - plasmacloud,pa1200 |\ - plasmacloud,pa2200 |\ - qxwlan,e2600ac-c1 |\ - qxwlan,e2600ac-c2 |\ - unielec,u4019-32m) - caldata_extract "0:ART" 0x1000 0x2f20 - ;; - devolo,magic-2-wifi-next) - caldata_extract "ART" 0x1000 0x2f20 - ath10k_patch_mac $(mtd_get_mac_ascii APPSBLENV WiFiMacAddress0) - ;; - dlink,dap-2610) - caldata_extract "ART" 0x1000 0x2f20 - ath10k_patch_mac $(mtd_get_mac_ascii bdcfg wlanmac) - ;; - engenius,emd1) - caldata_extract "0:ART" 0x1000 0x2f20 - ath10k_patch_mac $(mtd_get_mac_ascii 0:APPSBLENV wlanaddr) - ;; - engenius,emr3500) - caldata_extract "0:ART" 0x1000 0x2f20 - ath10k_patch_mac $(mtd_get_mac_ascii 0:APPSBLENV ethaddr) - ;; - engenius,ens620ext) - caldata_extract "ART" 0x1000 0x2f20 - ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +2) - ;; - linksys,ea8300 |\ - linksys,mr8300) - caldata_extract "ART" 0x1000 0x2f20 - ath10k_patch_mac $(macaddr_add "$(cat /sys/class/net/eth0/address)" 2) - ;; - pangu,l1000) - caldata_extract "ART" 0x1000 0x2f20 - ath10k_patch_mac $(macaddr_add "$(cat /sys/class/net/eth0/address)" 2) - ;; - meraki,mr33) - caldata_extract_ubi "ART" 0x1000 0x2f20 - caldata_valid "202f" || caldata_extract "ART" 0x1000 0x2f20 - ath10k_patch_mac $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) +2) - ;; - netgear,ex6100v2 |\ - netgear,ex6150v2) - caldata_extract "ART" 0x1000 0x2f20 - ath10k_patch_mac $(mtd_get_mac_binary dnidata 0x0) - ;; - zyxel,nbg6617 |\ - zyxel,wre6606) - caldata_extract "ART" 0x1000 0x2f20 - ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -2) - ;; - esac - ;; -"ath10k/pre-cal-ahb-a800000.wifi.bin") - case "$board" in - 8dev,habanero-dvk |\ - 8dev,jalapeno |\ - alfa-network,ap120c-ac |\ - cilab,meshpoint-one |\ - ezviz,cs-w3-wd1200g-eup |\ - glinet,gl-b1300 |\ - glinet,gl-s1300 |\ - linksys,ea6350v3 |\ - p2w,r619ac-128m |\ - p2w,r619ac |\ - mobipromo,cm520-79f |\ - qcom,ap-dk01.1-c1) - caldata_extract "ART" 0x5000 0x2f20 - ;; - aruba,ap-303 |\ - aruba,ap-303h |\ - aruba,ap-365) - caldata_extract "ART" 0x5000 0x2f20 - ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary mfginfo 0x1D) +1) - ;; - asus,map-ac2200) - caldata_extract_ubi "Factory" 0x5000 0x2f20 - ;; - asus,rt-ac58u) - CI_UBIPART=UBI_DEV - caldata_extract_ubi "Factory" 0x5000 0x2f20 - ;; - avm,fritzbox-4040) - /usr/bin/fritz_cal_extract -i 1 -s 0x400 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader_config") - ;; - avm,fritzbox-7530 |\ - avm,fritzrepeater-1200 |\ - avm,fritzrepeater-3000) - /usr/bin/fritz_cal_extract -i 1 -s 0x3C800 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader0") || \ - /usr/bin/fritz_cal_extract -i 1 -s 0x3D000 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader0") || \ - /usr/bin/fritz_cal_extract -i 1 -s 0x3C000 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader0") || \ - /usr/bin/fritz_cal_extract -i 1 -s 0x3C800 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") || \ - /usr/bin/fritz_cal_extract -i 1 -s 0x3D000 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") || \ - /usr/bin/fritz_cal_extract -i 1 -s 0x3C000 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1") - ;; - buffalo,wtr-m2133hp) - caldata_extract "ART" 0x5000 0x2f20 - ath10k_patch_mac $(mtd_get_mac_binary ORGDATA 0x2c) - ;; - cellc,rtl30vw |\ - compex,wpj419 |\ - compex,wpj428 |\ - edgecore,ecw5211 |\ - edgecore,oap100 |\ - engenius,eap1300 |\ - engenius,eap2200 |\ - luma,wrtq-329acn|\ - openmesh,a42 |\ - openmesh,a62 |\ - plasmacloud,pa1200 |\ - plasmacloud,pa2200 |\ - qxwlan,e2600ac-c1 |\ - qxwlan,e2600ac-c2 |\ - unielec,u4019-32m) - caldata_extract "0:ART" 0x5000 0x2f20 - ;; - devolo,magic-2-wifi-next) - caldata_extract "ART" 0x5000 0x2f20 - ath10k_patch_mac $(mtd_get_mac_ascii APPSBLENV WiFiMacAddress1) - ;; - dlink,dap-2610) - caldata_extract "ART" 0x5000 0x2f20 - ath10k_patch_mac $(mtd_get_mac_ascii bdcfg wlanmac_a) - ;; - engenius,emd1) - caldata_extract "0:ART" 0x5000 0x2f20 - ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:APPSBLENV wlanaddr) +1) - ;; - engenius,emr3500) - caldata_extract "0:ART" 0x5000 0x2f20 - ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:APPSBLENV ethaddr) +1) - ;; - engenius,ens620ext) - caldata_extract "ART" 0x5000 0x2f20 - ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +3) - ;; - linksys,ea8300 |\ - linksys,mr8300) - caldata_extract "ART" 0x5000 0x2f20 - ath10k_patch_mac $(macaddr_add "$(cat /sys/class/net/eth0/address)" 3) - ;; - pangu,l1000) - caldata_extract "ART" 0x1000 0x2f20 - ath10k_patch_mac $(macaddr_add "$(cat /sys/class/net/eth0/address)" 2) - ;; - meraki,mr33) - caldata_extract_ubi "ART" 0x5000 0x2f20 - caldata_valid "202f" || caldata_extract "ART" 0x5000 0x2f20 - ath10k_patch_mac $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) +3) - ;; - netgear,ex6100v2 |\ - netgear,ex6150v2) - caldata_extract "ART" 0x5000 0x2f20 - ath10k_patch_mac $(mtd_get_mac_binary dnidata 0xc) - ;; - zyxel,nbg6617 |\ - zyxel,wre6606) - caldata_extract "ART" 0x5000 0x2f20 - ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -1) - ;; - esac - ;; -*) - exit 1 - ;; -esac \ No newline at end of file diff --git a/root/target/linux/ipq40xx/base-files/etc/hotplug.d/net/21_adjust_network b/root/target/linux/ipq40xx/base-files/etc/hotplug.d/net/21_adjust_network deleted file mode 100755 index 2caf2494..00000000 --- a/root/target/linux/ipq40xx/base-files/etc/hotplug.d/net/21_adjust_network +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -[ -f /lib/adjust_network.sh ] && { - . /lib/adjust_network.sh - - adjust_eth_queue -} \ No newline at end of file diff --git a/root/target/linux/ipq40xx/base-files/etc/init.d/adjust_network b/root/target/linux/ipq40xx/base-files/etc/init.d/adjust_network deleted file mode 100755 index 6089259e..00000000 --- a/root/target/linux/ipq40xx/base-files/etc/init.d/adjust_network +++ /dev/null @@ -1,205 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - -START=99 -STOP=98 - -rps_flow_cnt=4096 -core_count=$(grep -c processor /proc/cpuinfo) -rps_sock_flow_ent=`expr $core_count \* $rps_flow_cnt` -queue_cores="0 1 2" -queue_irq_cores="1 2" -wifi_core="3" -usb_core="0" - -############### util functions ############### - -to_hex_list() { - local cores=$1 - local converted="" - for core in $(echo $cores | awk '{print}') - do - local hex="$(gen_hex_mask "$core")" - converted="$converted $hex" - done - echo `echo $converted | sed 's/^ *//'` -} - -gen_hex_mask() { - local cores=$1 - local mask=0 - for core in $(echo $cores | awk '{print}') - do - local bit="$((1 << $core))" - let "mask = mask + bit" - done - local hex="$(printf %x "$mask")" - echo "$hex" -} - -val_at_index() { - local values=$1 - local idx=$2 - echo `echo $values | awk -v i=$idx '{print $i}'` -} - -size_of_list() { - local list=$1 - local spaces=`echo $list | grep -o ' ' | wc -l` - echo `expr $spaces + 1` -} - -set_core_mask() { - local file=$1 - local cores=$2 - local mask="$(gen_hex_mask "$cores")" - echo $mask > $file -} - -set_core_mask_round() { - local files=$1 - local cores=$2 - local step_size=$3 - [ ! -n "$3" ] && step_size=1 - - local core_count="$(size_of_list "$cores")" - local counter=0 - local idx=1 - local roof=`expr $core_count \* $step_size` - for file in $(echo $files | awk '{print}') - do - let "idx = counter / step_size + 1" - local core="$(val_at_index "$cores" $idx)" - set_core_mask $file $core - let "counter = counter + 1" - [ $counter -ge $roof ] && counter=0 - done -} - -############### assign network queues ############### - -set_interface_round() { - local interface=$1 - local cores=$2 - local step_size=$3 - [ ! -n "$3" ] && step_size=1 - - echo "using round mask for interface: $interface, step size: $step_size" - set_core_mask_round "$(ls /sys/class/net/$interface/queues/tx-*/xps_cpus)" "$cores" $step_size - set_core_mask_round "$(ls /sys/class/net/$interface/queues/rx-*/rps_cpus)" "$cores" $step_size - - for file in /sys/class/net/$interface/queues/rx-[0-9]*/rps_flow_cnt - do - echo $rps_flow_cnt > $file - done -} - -set_interface() { - local interface=$1 - local cores=$2 - - echo "using cores: $cores for interface: $interface" - - for file in /sys/class/net/$interface/queues/rx-[0-9]*/rps_cpus - do - set_core_mask $file "$cores" - echo $rps_flow_cnt > `dirname $file`/rps_flow_cnt - done - - for file in /sys/class/net/$interface/queues/tx-[0-9]*/xps_cpus - do - set_core_mask $file "$cores" - done -} - -set_interface_queues() { - echo "using cpu: $queue_cores for network queues" - for dev in /sys/class/net/eth* - do - [ -d "$dev" ] || continue - - local interface=`basename $dev` - - set_interface $interface "$queue_cores" - done - - for dev in /sys/class/net/wlan* - do - [ -d "$dev" ] || continue - - local interface=`basename $dev` - - set_interface $interface "$queue_cores" - done - - for dev in /sys/class/net/eth* - do - local eth=`basename $dev` - echo "enabling offload on $eth" - ethtool -K $eth rx-checksum on >/dev/null 2>&1 - ethtool -K $eth tx-checksum-ip-generic on >/dev/null 2>&1 || ( - ethtool -K $eth tx-checksum-ipv4 on >/dev/null 2>&1 - ethtool -K $eth tx-checksum-ipv6 on >/dev/null 2>&1) - ethtool -K $eth tx-scatter-gather on >/dev/null 2>&1 - ethtool -K $eth gso on >/dev/null 2>&1 - ethtool -K $eth gro on >/dev/null 2>&1 - ethtool -K $eth lro on >/dev/null 2>&1 - ethtool -K $eth tso on >/dev/null 2>&1 - ethtool -K $eth ufo on >/dev/null 2>&1 - done - - echo $rps_sock_flow_ent > /proc/sys/net/core/rps_sock_flow_entries - sysctl -w net.core.rps_sock_flow_entries=$rps_sock_flow_ent -} - -############### assign interrupts ############### -set_irq_cores() { - local mask="$(gen_hex_mask "$2")" - echo "set mask $mask for irq: $1" - echo $mask > "/proc/irq/$1/smp_affinity" -} - -set_irq_pattern() { - local name_pattern="$1" - local cores="$2" - - for irq in `grep "$name_pattern" /proc/interrupts | cut -d: -f1 | sed 's, *,,'` - do - set_irq_cores $irq "$cores" - done -} - -set_irq_interleave() { - local name_pattern=$1 - local cores=$2 - local step_size=$3 - - local files="" - for irq in `grep "$name_pattern" /proc/interrupts | cut -d: -f1 | sed 's, *,,'` - do - files="$files\ - /proc/irq/$irq/smp_affinity" - done - - set_core_mask_round "$files" "$cores" "$step_size" -} - -set_irqs() { - #dma - set_irq_pattern bam_dma "$usb_core" - - #ethernet - set_irq_interleave eth_tx "$queue_irq_cores" 4 - set_irq_interleave eth_rx "$queue_irq_cores" 1 - - #pcie - set_irq_pattern pcie "$wifi_core" - - #usb - set_irq_pattern usb "$usb_core" -} - -start() { - set_interface_queues - set_irqs -} \ No newline at end of file diff --git a/root/target/linux/ipq40xx/base-files/etc/init.d/bootcount b/root/target/linux/ipq40xx/base-files/etc/init.d/bootcount deleted file mode 100755 index 68c5fc11..00000000 --- a/root/target/linux/ipq40xx/base-files/etc/init.d/bootcount +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh /etc/rc.common - -START=99 - -boot() { - case $(board_name) in - alfa-network,ap120c-ac) - [ -n "$(fw_printenv bootcount changed 2>/dev/null)" ] &&\ - echo -e "bootcount\nchanged\n" | /usr/sbin/fw_setenv -s - - ;; - linksys,ea6350v3|\ - linksys,ea8300) - mtd resetbc s_env || true - ;; - esac -} \ No newline at end of file diff --git a/root/target/linux/ipq40xx/base-files/etc/inittab b/root/target/linux/ipq40xx/base-files/etc/inittab deleted file mode 100755 index 3181021a..00000000 --- a/root/target/linux/ipq40xx/base-files/etc/inittab +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (c) 2013 The Linux Foundation. All rights reserved. -::sysinit:/etc/init.d/rcS S boot -::shutdown:/etc/init.d/rcS K shutdown -ttyMSM0::askfirst:/usr/libexec/login.sh -ttyMSM1::askfirst:/usr/libexec/login.sh diff --git a/root/target/linux/ipq40xx/base-files/etc/uci-defaults/04_led_migration b/root/target/linux/ipq40xx/base-files/etc/uci-defaults/04_led_migration deleted file mode 100755 index c4f82b35..00000000 --- a/root/target/linux/ipq40xx/base-files/etc/uci-defaults/04_led_migration +++ /dev/null @@ -1,19 +0,0 @@ -. /lib/functions/migrations.sh - -board=$(board_name) - -case "$board" in -engenius,emr3500) - migrate_leds "emr3500:=" - ;; -engenius,ens620ext|\ -zyxel,nbg6617) - migrate_leds ":wlan2G=:wlan2g" ":wlan5G=:wlan5g" - ;; -esac - -remove_devicename_leds - -migrations_apply system - -exit 0 diff --git a/root/target/linux/ipq40xx/base-files/lib/adjust_network.sh b/root/target/linux/ipq40xx/base-files/lib/adjust_network.sh deleted file mode 100755 index d4829b09..00000000 --- a/root/target/linux/ipq40xx/base-files/lib/adjust_network.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh -# this scripts is used for adjust cpu's choice of interrupts. -# - -################################################ -# Adjust smp_affinity of edma -# Globals: -# None -# Arguments: -# None -# Returns: -# None -# Remark: -# execute only once on start-up. -################################################ -adjust_edma_smp_affinity() { - grep -q edma_eth_ /proc/interrupts || return 0 - local nr=`cat /proc/cpuinfo | grep processor | wc -l` - local cpu=0 - local tx_irq_num - - for tx_num in `seq 0 1 15` ; do - cpu=`printf "%x" $((1<<((tx_num/4+0)%nr)))` - tx_irq_num=`grep -m1 edma_eth_tx$tx_num /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '` - [ -n "$tx_irq_num" ] && echo $cpu > /proc/irq/$tx_irq_num/smp_affinity - done - - for rx_num in `seq 0 1 7` ; do - cpu=`printf "%x" $((1<<((rx_num/2)%nr)))` - rx_irq_num=`grep -m1 edma_eth_rx$rx_num /proc/interrupts | cut -d ':' -f 1 | tail -n1 | tr -d ' '` - [ -n "$rx_irq_num" ] && echo $cpu > /proc/irq/$rx_irq_num/smp_affinity - done -} - -################################################ -# Adjust smp_affinity of ath10k for 2G and 5G -# Globals: -# None -# Arguments: -# None -# Returns: -# None -# Remark: -# execute only once on start-up. -################################################ -adjust_radio_smp_affinity() { - local irqs="`grep -E 'ath10k' /proc/interrupts | cut -d ':' -f 1 | tr -d ' '`" - local nr=`cat /proc/cpuinfo | grep processor | wc -l` - local idx=2 - - for irq in $irqs; do - cpu=`printf "%x" $((1<<((idx)%nr)))` - echo $cpu > /proc/irq/$irq/smp_affinity - idx=$((idx+1)) - done -} - -################################################ -# Adjust queue of eth -# Globals: -# None -# Arguments: -# None -# Returns: -# None -# Remark: -# Each network reboot needs to be executed. -################################################ -adjust_eth_queue() { - local nr=`cat /proc/cpuinfo | grep processor | wc -l` - local idx=0 - - for epath in /sys/class/net/eth[0-9]*; do - test -e $epath || break - echo $epath | grep -q "\." && continue - eth=`basename $epath` - idx=0 - for exps in /sys/class/net/$eth/queues/rx-[0-9]*/rps_cpus; do - test -e $exps || break - cpu=`printf "%x" $((1<<((idx+1)%nr)))` - idx=$((idx+1)) - echo $cpu > $exps - echo 256 > `dirname $exps`/rps_flow_cnt - done - which ethtool >/dev/null 2>&1 && ethtool -K $eth gro off - done - - echo 1024 > /proc/sys/net/core/rps_sock_flow_entries -} \ No newline at end of file diff --git a/root/target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh b/root/target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh deleted file mode 100755 index b1e814cb..00000000 --- a/root/target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh +++ /dev/null @@ -1,35 +0,0 @@ -. /lib/functions.sh - -preinit_set_mac_address() { - case $(board_name) in - asus,map-ac2200) - base_mac=$(mtd_get_mac_binary_ubi Factory 0x1006) - ip link set dev eth0 address $(macaddr_add "$base_mac" +1) - ip link set dev eth1 address $(macaddr_add "$base_mac" +3) - ;; - ezviz,cs-w3-wd1200g-eup) - ip link set dev eth0 address $(mtd_get_mac_binary "ART" 0x6) - ip link set dev eth1 address $(mtd_get_mac_binary "ART" 0x0) - ;; - engenius,eap2200) - base_mac=$(cat /sys/class/net/eth0/address) - ip link set dev eth1 address $(macaddr_add "${base_mac}" +1) - ;; - linksys,ea8300|\ - linksys,mr8300) - base_mac=$(mtd_get_mac_ascii devinfo hw_mac_addr) - ip link set dev eth0 address "${base_mac}" - ip link set dev eth1 address $(macaddr_add "${base_mac}" 1) - ;; - meraki,mr33) - mac_lan=$(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) - [ -n "$mac_lan" ] && ip link set dev eth0 address "$mac_lan" - ;; - zyxel,nbg6617) - base_mac=$(cat /sys/class/net/eth0/address) - ip link set dev eth0 address $(macaddr_add "$base_mac" +2) - ip link set dev eth1 address $(macaddr_add "$base_mac" +3) - esac -} - -boot_hook_add preinit_main preinit_set_mac_address \ No newline at end of file diff --git a/root/target/linux/ipq40xx/base-files/lib/preinit/06_set_preinit_iface_ipq40xx.sh b/root/target/linux/ipq40xx/base-files/lib/preinit/06_set_preinit_iface_ipq40xx.sh deleted file mode 100755 index 5f476051..00000000 --- a/root/target/linux/ipq40xx/base-files/lib/preinit/06_set_preinit_iface_ipq40xx.sh +++ /dev/null @@ -1,22 +0,0 @@ -set_preinit_iface() { - . /lib/functions.sh - - case $(board_name) in - aruba,ap-303| \ - asus,rt-ac58u| \ - avm,fritzbox-4040| \ - ezviz,cs-w3-wd1200g-eup| \ - glinet,gl-b1300| \ - linksys,ea8300| \ - linksys,mr8300| \ - meraki,mr33| \ - zyxel,nbg6617) - ifname=eth0 - ;; - devolo,magic-2-wifi-next) - ifname=eth1 - ;; - esac -} - -boot_hook_add preinit_main set_preinit_iface \ No newline at end of file diff --git a/root/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh b/root/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh deleted file mode 100755 index c7ee381f..00000000 --- a/root/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh +++ /dev/null @@ -1,122 +0,0 @@ -linksys_get_target_firmware() { - local cur_boot_part mtd_ubi0 - - cur_boot_part="$(/usr/sbin/fw_printenv -n boot_part)" - if [ -z "${cur_boot_part}" ]; then - mtd_ubi0=$(cat /sys/devices/virtual/ubi/ubi0/mtd_num) - case "$(grep -E "^mtd${mtd_ubi0}:" /proc/mtd | cut -d '"' -f 2)" in - kernel|rootfs) - cur_boot_part=1 - ;; - alt_kernel|alt_rootfs) - cur_boot_part=2 - ;; - esac - >&2 printf "Current boot_part='%s' selected from ubi0/mtd_num='%s'" \ - "${cur_boot_part}" "${mtd_ubi0}" - fi - - # OEM U-Boot for EA6350v3, EA8300 and MR8300; bootcmd= - # if test $auto_recovery = no; - # then bootipq; - # elif test $boot_part = 1; - # then run bootpart1; - # else run bootpart2; - # fi - - case "$cur_boot_part" in - 1) - fw_setenv -s - <<-EOF - boot_part 2 - auto_recovery yes - EOF - printf "alt_kernel" - return - ;; - 2) - fw_setenv -s - <<-EOF - boot_part 1 - auto_recovery yes - EOF - printf "kernel" - return - ;; - *) - return - ;; - esac -} - -linksys_get_root_magic() { - (get_image "$@" | dd skip=786432 bs=4 count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2>/dev/null -} - -platform_do_upgrade_linksys() { - local magic_long="$(get_magic_long "$1")" - - local rm_oem_fw_vols="squashfs ubifs" # from OEM [alt_]rootfs UBI - local vol - - mkdir -p /var/lock - local part_label="$(linksys_get_target_firmware)" - touch /var/lock/fw_printenv.lock - - if [ -z "$part_label" ]; then - echo "cannot find target partition" - exit 1 - fi - - local target_mtd=$(find_mtd_part "$part_label") - - [ "$magic_long" = "73797375" ] && { - CI_KERNPART="$part_label" - if [ "$part_label" = "kernel" ]; then - CI_UBIPART="rootfs" - else - CI_UBIPART="alt_rootfs" - fi - - local mtdnum="$(find_mtd_index "$CI_UBIPART")" - if [ ! "$mtdnum" ]; then - echo "cannot find ubi mtd partition $CI_UBIPART" - return 1 - fi - - local ubidev="$(nand_find_ubi "$CI_UBIPART")" - if [ ! "$ubidev" ]; then - ubiattach -m "$mtdnum" - sync - ubidev="$(nand_find_ubi "$CI_UBIPART")" - fi - - if [ "$ubidev" ]; then - for vol in $rm_oem_fw_vols; do - ubirmvol "/dev/$ubidev" -N "$vol" 2>/dev/null - done - fi - - # complete std upgrade - nand_upgrade_tar "$1" - } - - [ "$magic_long" = "27051956" ] && { - # This magic is for a uImage (which is a sysupgrade image) - # check firmwares' rootfs types - local oldroot="$(linksys_get_root_magic "$target_mtd")" - local newroot="$(linksys_get_root_magic "$1")" - - if [ "$newroot" = "55424923" ] && [ "$oldroot" = "55424923" ]; then - # we're upgrading from a firmware with UBI to one with UBI - # erase everything to be safe - # - Is that really needed? Won't remove (or comment) the if, - # because it may be needed in a future device. - #mtd erase $part_label - #get_image "$1" | mtd -n write - $part_label - echo "writing \"$1\" UBI image to \"$part_label\" (UBI)..." - get_image "$1" | mtd write - "$part_label" - else - echo "writing \"$1\" image to \"$part_label\"" - get_image "$1" | mtd write - "$part_label" - fi - } -} \ No newline at end of file diff --git a/root/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh b/root/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh deleted file mode 100755 index 8e02186e..00000000 --- a/root/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh +++ /dev/null @@ -1,106 +0,0 @@ -# The U-Boot loader of the OpenMesh devices requires image sizes and -# checksums to be provided in the U-Boot environment. -# The OpenMesh devices come with 2 main partitions - while one is active -# sysupgrade will flash the other. The boot order is changed to boot the -# newly flashed partition. If the new partition can't be booted due to -# upgrade failures the previously used partition is loaded. - -platform_do_upgrade_openmesh() { - local tar_file="$1" - local restore_backup - local primary_kernel_mtd - - local setenv_script="/tmp/fw_env_upgrade" - - local kernel_mtd="$(find_mtd_index $PART_NAME)" - local kernel_offset="$(cat /sys/class/mtd/mtd${kernel_mtd}/offset)" - local total_size="$(cat /sys/class/mtd/mtd${kernel_mtd}/size)" - - # detect to which flash region the new image is written to. - # - # 1. check what is the mtd index for the first flash region on this - # device - # 2. check if the target partition ("inactive") has the mtd index of - # the first flash region - # - # - when it is: the new bootseq will be 1,2 and the first region is - # modified - # - when it isnt: bootseq will be 2,1 and the second region is - # modified - # - # The detection has to be done via the hardcoded mtd partition because - # the current boot might be done with the fallback region. Let us - # assume that the current bootseq is 1,2. The bootloader detected that - # the image in flash region 1 is corrupt and thus switches to flash - # region 2. The bootseq in the u-boot-env is now still the same and - # the sysupgrade code can now only rely on the actual mtd indexes and - # not the bootseq variable to detect the currently booted flash - # region/image. - # - # In the above example, an implementation which uses bootseq ("1,2") to - # detect the currently booted image would assume that region 1 is booted - # and then overwrite the variables for the wrong flash region (aka the - # one which isn't modified). This could result in a device which doesn't - # boot anymore to Linux until it was reflashed with ap51-flash. - local next_boot_part="1" - case "$(board_name)" in - openmesh,a42) - primary_kernel_mtd=8 - ;; - openmesh,a62) - primary_kernel_mtd=10 - ;; - *) - echo "failed to detect primary kernel mtd partition for board" - return 1 - ;; - esac - [ "$kernel_mtd" = "$primary_kernel_mtd" ] || next_boot_part="2" - - local board_dir=$(tar tf $tar_file | grep -m 1 '^sysupgrade-.*/$') - board_dir=${board_dir%/} - - local kernel_length=$(tar xf $tar_file ${board_dir}/kernel -O | wc -c) - local rootfs_length=$(tar xf $tar_file ${board_dir}/root -O | wc -c) - # rootfs without EOF marker - rootfs_length=$((rootfs_length-4)) - - local kernel_md5=$(tar xf $tar_file ${board_dir}/kernel -O | md5sum); kernel_md5="${kernel_md5%% *}" - # md5 checksum of rootfs with EOF marker - local rootfs_md5=$(tar xf $tar_file ${board_dir}/root -O | dd bs=1 count=$rootfs_length | md5sum); rootfs_md5="${rootfs_md5%% *}" - - # - # add tar support to get_image() to use default_do_upgrade() instead? - # - - # take care of restoring a saved config - [ -n "$UPGRADE_BACKUP" ] && restore_backup="${MTD_CONFIG_ARGS} -j ${UPGRADE_BACKUP}" - - mtd -q erase inactive - tar xf $tar_file ${board_dir}/root -O | mtd -n -p $kernel_length $restore_backup write - $PART_NAME - tar xf $tar_file ${board_dir}/kernel -O | mtd -n write - $PART_NAME - - # prepare new u-boot env - if [ "$next_boot_part" = "1" ]; then - echo "bootseq 1,2" > $setenv_script - else - echo "bootseq 2,1" > $setenv_script - fi - - printf "kernel_size_%i 0x%08x\n" $next_boot_part $kernel_length >> $setenv_script - printf "vmlinux_start_addr 0x%08x\n" ${kernel_offset} >> $setenv_script - printf "vmlinux_size 0x%08x\n" ${kernel_length} >> $setenv_script - printf "vmlinux_checksum %s\n" ${kernel_md5} >> $setenv_script - - printf "rootfs_size_%i 0x%08x\n" $next_boot_part $((total_size-kernel_length)) >> $setenv_script - printf "rootfs_start_addr 0x%08x\n" $((kernel_offset+kernel_length)) >> $setenv_script - printf "rootfs_size 0x%08x\n" ${rootfs_length} >> $setenv_script - printf "rootfs_checksum %s\n" ${rootfs_md5} >> $setenv_script - - # store u-boot env changes - mkdir -p /var/lock - fw_setenv -s $setenv_script || { - echo "failed to update U-Boot environment" - return 1 - } -} diff --git a/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh deleted file mode 100644 index 3a5b8218..00000000 --- a/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh +++ /dev/null @@ -1,128 +0,0 @@ -PART_NAME=firmware -REQUIRE_IMAGE_METADATA=1 - -RAMFS_COPY_BIN='fw_printenv fw_setenv' -RAMFS_COPY_DATA='/etc/fw_env.config /var/lock/fw_printenv.lock' - -platform_check_image() { - case "$(board_name)" in - asus,rt-ac58u) - CI_UBIPART="UBI_DEV" - local ubidev=$(nand_find_ubi $CI_UBIPART) - local asus_root=$(nand_find_volume $ubidev jffs2) - - [ -n "$asus_root" ] || return 0 - - cat << EOF -jffs2 partition is still present. -There's probably no space left -to install the filesystem. - -You need to delete the jffs2 partition first: -# ubirmvol /dev/ubi0 --name=jffs2 - -Once this is done. Retry. -EOF - return 1 - ;; - esac - return 0; -} - -askey_do_upgrade() { - local tar_file="$1" - - local board_dir=$(tar tf $tar_file | grep -m 1 '^sysupgrade-.*/$') - board_dir=${board_dir%/} - - tar Oxf $tar_file ${board_dir}/root | mtd write - rootfs - - nand_do_upgrade "$1" -} - -zyxel_do_upgrade() { - local tar_file="$1" - - local board_dir=$(tar tf $tar_file | grep -m 1 '^sysupgrade-.*/$') - board_dir=${board_dir%/} - - tar Oxf $tar_file ${board_dir}/kernel | mtd write - kernel - - if [ -n "$UPGRADE_BACKUP" ]; then - tar Oxf $tar_file ${board_dir}/root | mtd -j "$UPGRADE_BACKUP" write - rootfs - else - tar Oxf $tar_file ${board_dir}/root | mtd write - rootfs - fi -} - -platform_do_upgrade() { - case "$(board_name)" in - pangu,l1000 |\ - 8dev,jalapeno |\ - aruba,ap-303 |\ - aruba,ap-303h |\ - aruba,ap-365 |\ - avm,fritzbox-7530 |\ - avm,fritzrepeater-1200 |\ - avm,fritzrepeater-3000 |\ - buffalo,wtr-m2133hp |\ - cilab,meshpoint-one |\ - edgecore,ecw5211 |\ - edgecore,oap100 |\ - engenius,eap2200 |\ - luma,wrtq-329acn |\ - mobipromo,cm520-79f |\ - qxwlan,e2600ac-c2) - nand_do_upgrade "$1" - ;; - alfa-network,ap120c-ac) - part="$(awk -F 'ubi.mtd=' '{printf $2}' /proc/cmdline | sed -e 's/ .*$//')" - if [ "$part" = "rootfs1" ]; then - fw_setenv active 2 || exit 1 - CI_UBIPART="rootfs2" - else - fw_setenv active 1 || exit 1 - CI_UBIPART="rootfs1" - fi - nand_do_upgrade "$1" - ;; - asus,map-ac2200) - CI_KERNPART="linux" - nand_do_upgrade "$1" - ;; - asus,rt-ac58u) - CI_UBIPART="UBI_DEV" - CI_KERNPART="linux" - nand_do_upgrade "$1" - ;; - cellc,rtl30vw) - CI_UBIPART="ubifs" - askey_do_upgrade "$1" - ;; - compex,wpj419) - nand_do_upgrade "$1" - ;; - linksys,ea6350v3 |\ - linksys,ea8300 |\ - linksys,mr8300) - platform_do_upgrade_linksys "$1" - ;; - meraki,mr33) - CI_KERNPART="part.safe" - nand_do_upgrade "$1" - ;; - openmesh,a42 |\ - openmesh,a62 |\ - plasmacloud,pa1200 |\ - plasmacloud,pa2200) - PART_NAME="inactive" - platform_do_upgrade_dualboot_datachk "$1" - ;; - zyxel,nbg6617) - zyxel_do_upgrade "$1" - ;; - *) - default_do_upgrade "$1" - ;; - esac -} \ No newline at end of file diff --git a/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-l1000.dts b/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-l1000.dts deleted file mode 100644 index abea83f9..00000000 --- a/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-l1000.dts +++ /dev/null @@ -1,394 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT - * - * Copyright (c) 2018 Peng Zhang - * - */ - -#include "qcom-ipq4019.dtsi" -#include -#include -#include - -/ { - - model = "ANTROUTERGZ1000"; - compatible = "pangu,l1000", "qcom,ipq4019"; - - - memory { - device_type = "memory"; - reg = <0x80000000 0x20000000>; /* 512MB */ - }; - - aliases { - sdhc1 = &sdhci; - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; - }; - - chosen { - bootargs-append = " root=/dev/ubiblock0_1 rootfstype=squashfs"; - }; - - soc { - rng@22000 { - status = "okay"; - }; - - mdio@90000 { - status = "okay"; - pinctrl-0 = <&mdio_pins>; - pinctrl-names = "default"; - reset-gpios = <&tlmm 47 GPIO_ACTIVE_LOW>; - reset-delay-us = <2000>; - }; - - ess-psgmii@98000 { - status = "okay"; - }; - - tcsr@1949000 { - compatible = "qcom,tcsr"; - reg = <0x1949000 0x100>; - qcom,wifi_glb_cfg = ; - }; - - tcsr@194b000 { - /* select hostmode */ - compatible = "qcom,tcsr"; - reg = <0x194b000 0x100>; - qcom,usb-hsphy-mode-select = ; - status = "okay"; - }; - - ess_tcsr@1953000 { - compatible = "qcom,tcsr"; - reg = <0x1953000 0x1000>; - qcom,ess-interface-select = ; - }; - - tcsr@1957000 { - compatible = "qcom,tcsr"; - reg = <0x1957000 0x100>; - qcom,wifi_noc_memtype_m0_m2 = ; - }; - - usb2@60f8800 { - status = "okay"; - }; - - usb3@8af8800 { - status = "okay"; - }; - - crypto@8e3a000 { - status = "okay"; - }; - - watchdog@b017000 { - status = "okay"; - }; - - ess-switch@c000000 { - status = "okay"; - switch_lan_bmp = <0x18>; - switch_wan_bmp = <0x20>; - }; - - i2c@78b7000 { /* BLSP1 QUP2 */ - pinctrl-0 = <&i2c_0_pins>; - pinctrl-names = "default"; - - status = "okay"; - }; - - edma@c080000 { - status = "okay"; - }; - }; - - keys { - compatible = "gpio-keys"; - - reset { - label = "reset"; - gpios = <&tlmm 18 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; - - leds { - compatible = "gpio-leds"; - - power: status { - label = "blue:status"; - gpios = <&tlmm 3 GPIO_ACTIVE_LOW>; - }; - - wlan2g { - label = "blue:wlan2g"; - gpios = <&tlmm 1 GPIO_ACTIVE_LOW>; - }; - - wlan5g { - label = "bule:wlan5g"; - gpios = <&tlmm 2 GPIO_ACTIVE_LOW>; - }; - - wan { - label = "bule:wan"; - gpios = <&tlmm 4 GPIO_ACTIVE_LOW>; - }; - usb { - label = "bule::usb"; - gpios = <&tlmm 5 GPIO_ACTIVE_LOW>; - trigger-sources = <&usb2>, <&usb3>; - linux,default-trigger = "usbport"; - }; - }; -}; - -&vqmmc { - status = "okay"; -}; - -&sdhci { - status = "okay"; - pinctrl-0 = <&sd_pins>; - pinctrl-names = "default"; - cd-gpios = <&tlmm 22 GPIO_ACTIVE_LOW>; - vqmmc-supply = <&vqmmc>; -}; - -&blsp_dma { - status = "okay"; -}; - -&cryptobam { - status = "okay"; -}; - -&blsp1_spi1 { - pinctrl-0 = <&spi_0_pins>; - pinctrl-names = "default"; - status = "okay"; - cs-gpios = <&tlmm 12 GPIO_ACTIVE_HIGH>; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <24000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - SBL1@0 { - label = "SBL1"; - reg = <0x0 0x40000>; - read-only; - }; - - MIBIB@40000 { - label = "MIBIB"; - reg = <0x40000 0x20000>; - }; - - QSEE@60000 { - label = "QSEE"; - reg = <0x60000 0x60000>; - read-only; - }; - - CDT@c0000 { - label = "CDT"; - reg = <0xc0000 0x10000>; - read-only; - }; - - DDRPARAMS@d0000 { - label = "DDRPARAMS"; - reg = <0xd0000 0x10000>; - read-only; - }; - - APPSBLENV@e0000 { - label = "APPSBLENV"; - reg = <0xe0000 0x10000>; - }; - - APPSBL@f0000 { - label = "APPSBL"; - reg = <0xf0000 0x80000>; - }; - - ART@170000 { - label = "ART"; - reg = <0x170000 0x10000>; - }; - }; - }; -}; - -&nand { - pinctrl-0 = <&nand_pins>; - pinctrl-names = "default"; - status = "okay"; - - nand@0 { - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - rootfs@0 { - label = "rootfs"; - reg = <0x0 0x8000000>; - }; - }; - }; -}; - -&qpic_bam { - status = "okay"; -}; - -&blsp1_uart1 { - pinctrl-0 = <&serial_pins>; - pinctrl-names = "default"; - status = "okay"; -}; - -&blsp1_uart2 { - pinctrl-0 = <&serial_1_pins>; - pinctrl-names = "default"; - status = "okay"; -}; - -&tlmm { - serial_pins: serial_pinmux { - mux { - pins = "gpio16", "gpio17"; - function = "blsp_uart0"; - bias-disable; - }; - }; - - mdio_pins: mdio_pinmux { - mux_1 { - pins = "gpio6"; - function = "mdio"; - bias-pull-up; - }; - mux_2 { - pins = "gpio7"; - function = "mdc"; - bias-pull-up; - }; - }; - - serial_1_pins: serial1_pinmux { - mux { - pins = "gpio8", "gpio9", - "gpio10", "gpio11"; - function = "blsp_uart1"; - bias-disable; - }; - }; - - i2c_0_pins: i2c-0-pinmux { - mux { - pins = "gpio20", "gpio21"; - function = "blsp_i2c0"; - bias-disable; - }; - }; - - spi_0_pins: spi_0_pinmux { - pinmux { - function = "blsp_spi0"; - pins = "gpio13", "gpio14", "gpio15"; - }; - pinmux_cs { - function = "gpio"; - pins = "gpio12"; - }; - pinconf { - pins = "gpio13", "gpio14", "gpio15"; - drive-strength = <12>; - bias-disable; - }; - pinconf_cs { - pins = "gpio12"; - drive-strength = <2>; - bias-disable; - output-high; - }; - }; - - nand_pins: nand_pins { - pullups { - pins = "gpio52", "gpio53", "gpio58", - "gpio59"; - function = "qpic"; - bias-pull-up; - }; - - pulldowns { - pins = "gpio54", "gpio55", "gpio56", - "gpio57", "gpio60", "gpio61", - "gpio62", "gpio63", "gpio64", - "gpio65", "gpio66", "gpio67", - "gpio68", "gpio69"; - function = "qpic"; - bias-pull-down; - }; - }; - - sd_pins: sd_pins { - pinmux { - function = "sdio"; - pins = "gpio23", "gpio24", "gpio25", "gpio26", - "gpio28", "gpio29", "gpio30", "gpio31"; - drive-strength = <10>; - }; - - pinmux_sd_clk { - function = "sdio"; - pins = "gpio27"; - drive-strength = <16>; - }; - - pinmux_sd7 { - function = "sdio"; - pins = "gpio32"; - drive-strength = <10>; - bias-disable; - }; - }; -}; - -&usb2_hs_phy { - status = "okay"; -}; - -&usb3_hs_phy { - status = "okay"; -}; - -&usb3_ss_phy { - status = "okay"; -}; - -&wifi0 { - status = "okay"; - qcom,ath10k-calibration-variant = "PANGU-L1000"; -}; - -&wifi1 { - status = "okay"; - qcom,ath10k-calibration-variant = "PANGU-L1000"; -}; diff --git a/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac-128m.dts b/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac-128m.dts deleted file mode 100644 index b51378a7..00000000 --- a/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac-128m.dts +++ /dev/null @@ -1,18 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - -#include "qcom-ipq4019-r619ac.dtsi" - -/ { - model = "P&W R619AC 128M"; - compatible = "p2w,r619ac-128m"; - - chosen { - bootargs-append = " root=/dev/ubiblock0_1 rootfstype=squashfs"; - }; -}; - -&rootfs_part1 { - reg = <0x0 0x8000000>; -}; - -/delete-node/ &rootfs_part2; diff --git a/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dts b/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dts deleted file mode 100644 index 31010dd1..00000000 --- a/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dts +++ /dev/null @@ -1,12 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - -#include "qcom-ipq4019-r619ac.dtsi" - -/ { - model = "P&W R619AC"; - compatible = "p2w,r619ac"; - - chosen { - bootargs-append = " root=/dev/ubiblock0_1 rootfstype=squashfs"; - }; -}; diff --git a/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi b/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi deleted file mode 100644 index 42a186f6..00000000 --- a/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-r619ac.dtsi +++ /dev/null @@ -1,322 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - -#include "qcom-ipq4019.dtsi" -#include -#include -#include - -/ { - aliases { - led-boot = &led_sys; - led-failsafe = &led_sys; - led-running = &led_sys; - led-upgrade = &led_sys; - label-mac-device = &gmac0; - }; - - soc { - rng@22000 { - status = "okay"; - }; - - mdio@90000 { - status = "okay"; - pinctrl-0 = <&mdio_pins>; - pinctrl-names = "default"; - }; - - ess-psgmii@98000 { - status = "okay"; - }; - - tcsr@1949000 { - compatible = "qcom,tcsr"; - reg = <0x1949000 0x100>; - qcom,wifi_glb_cfg = ; - }; - - tcsr@194b000 { - compatible = "qcom,tcsr"; - reg = <0x194b000 0x100>; - qcom,usb-hsphy-mode-select = ; - }; - - ess_tcsr@1953000 { - compatible = "qcom,tcsr"; - reg = <0x1953000 0x1000>; - qcom,ess-interface-select = ; - }; - - tcsr@1957000 { - compatible = "qcom,tcsr"; - reg = <0x1957000 0x100>; - qcom,wifi_noc_memtype_m0_m2 = ; - }; - - usb2@60f8800 { - status = "okay"; - }; - - usb3@8af8800 { - status = "okay"; - }; - - crypto@8e3a000 { - status = "okay"; - }; - - watchdog@b017000 { - status = "okay"; - }; - - ess-switch@c000000 { - status = "okay"; - }; - - edma@c080000 { - status = "okay"; - }; - }; - - leds { - compatible = "gpio-leds"; - pinctrl-0 = <&led_pins>; - pinctrl-names = "default"; - - led_sys: sys { - label = "blue:sys"; - gpios = <&tlmm 39 GPIO_ACTIVE_HIGH>; - }; - - wlan2g { - label = "blue:wlan2g"; - gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "phy0tpt"; - }; - - wlan5g { - label = "blue:wlan5g"; - gpios = <&tlmm 50 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "phy1tpt"; - }; - }; - - keys { - compatible = "gpio-keys"; - - reset { - label = "reset"; - gpios = <&tlmm 18 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; -}; - -&blsp_dma { - status = "okay"; -}; - -&blsp1_spi1 { - status = "okay"; - - flash@0 { - reg = <0>; - compatible = "jedec,spi-nor"; - spi-max-frequency = <24000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "SBL1"; - reg = <0x0 0x40000>; - read-only; - }; - - partition@40000 { - label = "MIBIB"; - reg = <0x40000 0x20000>; - read-only; - }; - - partition@60000 { - label = "QSEE"; - reg = <0x60000 0x60000>; - read-only; - }; - - partition@c0000 { - label = "CDT"; - reg = <0xc0000 0x10000>; - read-only; - }; - - partition@d0000 { - label = "DDRPARAMS"; - reg = <0xd0000 0x10000>; - read-only; - }; - - partition@e0000 { - label = "APPSBLENV"; - reg = <0xe0000 0x10000>; - read-only; - }; - - partition@f0000 { - label = "APPSBL"; - reg = <0xf0000 0x80000>; - read-only; - }; - - partition@1 { - label = "Bootloader"; - reg = <0x0 0x170000>; - read-only; - }; - - partition@170000 { - label = "ART"; - reg = <0x170000 0x10000>; - read-only; - }; - - partition@180000 { - label = "unused"; - reg = <0x180000 0xe80000>; - }; - }; - }; -}; - -&blsp1_uart1 { - pinctrl-0 = <&serial_0_pins>; - pinctrl-names = "default"; - status = "okay"; -}; - -&cryptobam { - status = "okay"; -}; - -&nand { - status = "okay"; - - nand@0 { - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - rootfs_part1: partition@0 { - label = "rootfs"; - reg = <0x0 0x4000000>; - }; - - rootfs_part2: partition@4000000 { - label = "unused1"; - reg = <0x4000000 0x4000000>; - }; - }; - }; -}; - -&qpic_bam { - status = "okay"; -}; - -&sdhci { - pinctrl-0 = <&sd_0_pins>; - pinctrl-names = "default"; - vqmmc-supply = <&vqmmc>; - status = "okay"; -}; - -&tlmm { - mdio_pins: mdio_pinmux { - mux_1 { - pins = "gpio6"; - function = "mdio"; - bias-pull-up; - }; - - mux_2 { - pins = "gpio7"; - function = "mdc"; - bias-pull-up; - }; - }; - - sd_0_pins: sd_0_pinmux { - mux_1 { - pins = "gpio23", "gpio24", "gpio25", "gpio26", "gpio28"; - function = "sdio"; - drive-strength = <10>; - }; - - mux_2 { - pins = "gpio27"; - function = "sdio"; - drive-strength = <16>; - }; - }; - - serial_0_pins: serial0-pinmux { - mux { - pins = "gpio16", "gpio17"; - function = "blsp_uart0"; - bias-disable; - }; - }; - - led_pins: led_pinmux { - mux { - pins = "gpio32", "gpio39", "gpio50"; - function = "gpio"; - bias-pull-up; - output-low; - }; - - mux_1 { - pins = "gpio52"; - function = "gpio"; - bias-pull-up; - output-high; - }; - - mux_2 { - pins = "gpio61"; - function = "gpio"; - bias-pull-down; - output-high; - }; - }; -}; - -&usb3_ss_phy { - status = "okay"; -}; - -&usb3_hs_phy { - status = "okay"; -}; - -&usb2_hs_phy { - status = "okay"; -}; - -&vqmmc { - status = "okay"; -}; - -&wifi0 { - status = "okay"; - qcom,ath10k-calibration-variant = "R619AC"; -}; - -&wifi1 { - status = "okay"; - qcom,ath10k-calibration-variant = "R619AC"; -}; diff --git a/root/target/linux/ipq40xx/image/Makefile b/root/target/linux/ipq40xx/image/Makefile deleted file mode 100644 index 673d60a0..00000000 --- a/root/target/linux/ipq40xx/image/Makefile +++ /dev/null @@ -1,867 +0,0 @@ -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/image.mk - -DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID -DEVICE_VARS += RAS_BOARD RAS_ROOTFS_SIZE RAS_VERSION -DEVICE_VARS += WRGG_DEVNAME WRGG_SIGNATURE - -define Device/Default - PROFILES := Default - KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts) - KERNEL_INITRAMFS_PREFIX := $$(IMG_PREFIX)-$(1)-initramfs - KERNEL_PREFIX := $$(IMAGE_PREFIX) - KERNEL_LOADADDR := 0x80208000 - DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1))) - SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) - IMAGES := sysupgrade.bin - IMAGE/sysupgrade.bin = sysupgrade-tar | append-metadata - IMAGE/sysupgrade.bin/squashfs := -endef - -define Device/FitImage - KERNEL_SUFFIX := -fit-uImage.itb - KERNEL = kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb - KERNEL_NAME := Image -endef - -define Device/FitImageLzma - KERNEL_SUFFIX := -fit-uImage.itb - KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb - KERNEL_NAME := Image -endef - -define Device/FitzImage - KERNEL_SUFFIX := -fit-zImage.itb - KERNEL = kernel-bin | fit none $$(DTS_DIR)/$$(DEVICE_DTS).dtb - KERNEL_NAME := zImage -endef - -define Device/UbiFit - KERNEL_IN_UBI := 1 - IMAGES := nand-factory.ubi nand-sysupgrade.bin - IMAGE/nand-factory.ubi := append-ubi - IMAGE/nand-sysupgrade.bin := sysupgrade-tar | append-metadata -endef - -define Device/DniImage - $(call Device/FitzImage) - NETGEAR_BOARD_ID := - NETGEAR_HW_ID := - IMAGES += factory.img - IMAGE/factory.img := append-kernel | pad-offset 64k 64 | append-uImage-fakehdr filesystem | append-rootfs | pad-rootfs | netgear-dni - IMAGE/sysupgrade.bin := append-kernel | pad-offset 64k 64 | append-uImage-fakehdr filesystem | \ - append-rootfs | pad-rootfs | append-metadata | check-size -endef - -define Build/append-rootfshdr - mkimage -A $(LINUX_KARCH) \ - -O linux -T filesystem \ - -C lzma -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ - -n root.squashfs -d $(IMAGE_ROOTFS) $@.new - dd if=$@.new bs=64 count=1 >> $(IMAGE_KERNEL) -endef - -define Build/mkmylofw_32m - $(eval device_id=$(word 1,$(1))) - $(eval revision=$(word 2,$(1))) - - let \ - size="$$(stat -c%s $@)" \ - pad="$(subst k,* 1024,$(BLOCKSIZE))" \ - pad="(pad - (size % pad)) % pad" \ - newsize='size + pad'; \ - $(STAGING_DIR_HOST)/bin/mkmylofw \ - -B WPE72 -i 0x11f6:$(device_id):0x11f6:$(device_id) -r $(revision) \ - -s 0x2000000 -p0x180000:$$newsize:al:0x80208000:"OpenWrt":$@ \ - $@.new - @mv $@.new $@ -endef - -define Build/qsdk-ipq-factory-nand-askey - $(TOPDIR)/scripts/mkits-qsdk-ipq-image.sh $@.its\ - askey_kernel $(IMAGE_KERNEL) \ - askey_fs $(IMAGE_ROOTFS) \ - ubifs $@ - PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f $@.its $@.new - @mv $@.new $@ -endef - -define Build/SenaoFW - -$(STAGING_DIR_HOST)/bin/mksenaofw \ - -n $(BOARD_NAME) -r $(VENDOR_ID) -p $(1) \ - -c $(DATECODE) -w $(2) -x $(CW_VER) -t 0 \ - -e $@ \ - -o $@.new - @cp $@.new $@ -endef - -define Build/wrgg-image - mkwrggimg -i $@ \ - -o $@.new \ - -d "$(WRGG_DEVNAME)" \ - -s "$(WRGG_SIGNATURE)" \ - -v "" -m "" -B "" - mv $@.new $@ -endef - -define Device/8dev_habanero-dvk - $(call Device/FitImageLzma) - DEVICE_VENDOR := 8devices - DEVICE_MODEL := Habanero DVK - IMAGE_SIZE := 30976k - SOC := qcom-ipq4019 - DEVICE_PACKAGES := ipq-wifi-8dev_habanero-dvk - IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | append-rootfs | pad-rootfs | append-metadata | check-size -endef -TARGET_DEVICES += 8dev_habanero-dvk - -define Device/8dev_jalapeno-common - $(call Device/FitImage) - $(call Device/UbiFit) - BLOCKSIZE := 128k - PAGESIZE := 2048 - SOC := qcom-ipq4018 -endef - -define Device/8dev_jalapeno - $(call Device/8dev_jalapeno-common) - DEVICE_VENDOR := 8devices - DEVICE_MODEL := Jalapeno -endef -TARGET_DEVICES += 8dev_jalapeno - -define Device/alfa-network_ap120c-ac - $(call Device/FitImage) - $(call Device/UbiFit) - DEVICE_VENDOR := ALFA Network - DEVICE_MODEL := AP120C-AC - SOC := qcom-ipq4018 - DEVICE_PACKAGES := kmod-usb-acm \ - kmod-tpm-i2c-atmel uboot-envtools - BLOCKSIZE := 128k - PAGESIZE := 2048 - IMAGE_SIZE := 65536k - IMAGES := nand-factory.bin nand-sysupgrade.bin - IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand -endef -TARGET_DEVICES += alfa-network_ap120c-ac - -define Device/aruba_glenmorangie - $(call Device/FitImageLzma) - DEVICE_VENDOR := Aruba - SOC := qcom-ipq4029 - DEVICE_PACKAGES := ipq-wifi-aruba_ap-303 -endef - -define Device/aruba_ap-303 - $(call Device/aruba_glenmorangie) - DEVICE_MODEL := AP-303 -endef -TARGET_DEVICES += aruba_ap-303 - -define Device/aruba_ap-303h - $(call Device/aruba_glenmorangie) - DEVICE_MODEL := AP-303H -endef -TARGET_DEVICES += aruba_ap-303h - -define Device/aruba_ap-365 - $(call Device/aruba_glenmorangie) - DEVICE_MODEL := AP-365 - DEVICE_PACKAGES += kmod-hwmon-ad7418 -endef -TARGET_DEVICES += aruba_ap-365 - -define Device/asus_map-ac2200 - $(call Device/FitImageLzma) - DEVICE_VENDOR := ASUS - DEVICE_MODEL := Lyra (MAP-AC2200) - SOC := qcom-ipq4019 - DEVICE_PACKAGES := ath10k-firmware-qca9888-ct kmod-ath3k -endef -TARGET_DEVICES += asus_map-ac2200 - -define Device/asus_rt-ac58u - $(call Device/FitImageLzma) - DEVICE_VENDOR := ASUS - DEVICE_MODEL := RT-AC58U - SOC := qcom-ipq4018 - BLOCKSIZE := 128k - PAGESIZE := 2048 - DTB_SIZE := 65536 - IMAGE_SIZE := 20439364 - FILESYSTEMS := squashfs -# Someone - in their infinite wisdom - decided to put the firmware -# version in front of the image name \03\00\00\04 => Version 3.0.0.4 -# Since u-boot works with strings we either need another fixup step -# to add a version... or we are very careful not to add '\0' into that -# string and call it a day.... Yeah, we do the latter! - UIMAGE_NAME:=$(shell echo -e '\03\01\01\01RT-AC58U') - DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers \ - kmod-usb-ledtrig-usbport -endef -TARGET_DEVICES += asus_rt-ac58u - -define Device/avm_fritzbox-4040 - $(call Device/FitImageLzma) - DEVICE_VENDOR := AVM - DEVICE_MODEL := FRITZ!Box 4040 - SOC := qcom-ipq4018 - BOARD_NAME := fritz4040 - IMAGE_SIZE := 29056k - UBOOT_PATH := $(STAGING_DIR_IMAGE)/uboot-fritz4040.bin - UBOOT_PARTITION_SIZE := 524288 - IMAGES += eva.bin - IMAGE/eva.bin := append-uboot | pad-to $$$$(UBOOT_PARTITION_SIZE) | append-kernel | append-rootfs | pad-rootfs - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size - DEVICE_PACKAGES := fritz-tffs fritz-caldata -endef -TARGET_DEVICES += avm_fritzbox-4040 - -define Device/avm_fritzbox-7530 - $(call Device/FitImageLzma) - DEVICE_VENDOR := AVM - DEVICE_MODEL := FRITZ!Box 7530 - SOC := qcom-ipq4019 - DEVICE_PACKAGES := fritz-caldata fritz-tffs-nand -endef -TARGET_DEVICES += avm_fritzbox-7530 - -define Device/avm_fritzrepeater-1200 - $(call Device/FitImageLzma) - DEVICE_VENDOR := AVM - DEVICE_MODEL := FRITZ!Repeater 1200 - SOC := qcom-ipq4019 - DEVICE_PACKAGES := fritz-caldata fritz-tffs-nand ipq-wifi-avm_fritzrepeater-1200 -endef -TARGET_DEVICES += avm_fritzrepeater-1200 - -define Device/avm_fritzrepeater-3000 - $(call Device/FitImageLzma) - DEVICE_VENDOR := AVM - DEVICE_MODEL := FRITZ!Repeater 3000 - SOC := qcom-ipq4019 - DEVICE_PACKAGES := ath10k-firmware-qca9984-ct fritz-caldata fritz-tffs-nand -endef -TARGET_DEVICES += avm_fritzrepeater-3000 - -define Device/buffalo_wtr-m2133hp - $(call Device/FitImage) - $(call Device/UbiFit) - DEVICE_VENDOR := Buffalo - DEVICE_MODEL := WTR-M2133HP - SOC := qcom-ipq4019 - DEVICE_PACKAGES := uboot-envtools ath10k-firmware-qca9984-ct ipq-wifi-buffalo_wtr-m2133hp - BLOCKSIZE := 128k - PAGESIZE := 2048 -endef -TARGET_DEVICES += buffalo_wtr-m2133hp - -define Device/cellc_rtl30vw - KERNEL_SUFFIX := -fit-uImage.itb - KERNEL_INITRAMFS = kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb - KERNEL = kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb | uImage lzma | pad-to 2048 - KERNEL_NAME := Image - KERNEL_IN_UBI := - IMAGES := nand-factory.bin nand-sysupgrade.bin - IMAGE/nand-factory.bin := append-rootfshdr | append-ubi | qsdk-ipq-factory-nand-askey - IMAGE/nand-sysupgrade.bin := append-rootfshdr | sysupgrade-tar | append-metadata - DEVICE_VENDOR := Cell C - DEVICE_MODEL := RTL30VW - SOC := qcom-ipq4019 - DEVICE_DTS_CONFIG := config@5 - KERNEL_INSTALL := 1 - KERNEL_SIZE := 4096k - IMAGE_SIZE := 57344k - BLOCKSIZE := 128k - PAGESIZE := 2048 - DEVICE_PACKAGES := kmod-usb-net-qmi-wwan kmod-usb-serial-option uqmi ipq-wifi-cellc_rtl30vw -endef -TARGET_DEVICES += cellc_rtl30vw - -define Device/cilab_meshpoint-one - $(call Device/8dev_jalapeno-common) - DEVICE_VENDOR := Crisis Innovation Lab - DEVICE_MODEL := MeshPoint.One - DEVICE_PACKAGES := kmod-i2c-gpio kmod-iio-bmp280-i2c kmod-hwmon-ina2xx kmod-rtc-pcf2127 -endef -TARGET_DEVICES += cilab_meshpoint-one - -define Device/compex_wpj419 - $(call Device/FitImage) - $(call Device/UbiFit) - DEVICE_VENDOR := Compex - DEVICE_MODEL := WPJ419 - SOC := qcom-ipq4019 - DEVICE_DTS_CONFIG := config@12 - KERNEL_INSTALL := 1 - BLOCKSIZE := 128k - PAGESIZE := 2048 - FILESYSTEMS := squashfs -endef -TARGET_DEVICES += compex_wpj419 - -define Device/compex_wpj428 - $(call Device/FitImage) - DEVICE_VENDOR := Compex - DEVICE_MODEL := WPJ428 - SOC := qcom-ipq4028 - DEVICE_DTS_CONFIG := config@4 - BLOCKSIZE := 64k - IMAGE_SIZE := 31232k - KERNEL_SIZE := 4096k - IMAGES += cpximg-6a04.bin - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata - IMAGE/cpximg-6a04.bin := append-kernel | append-rootfs | pad-rootfs | mkmylofw_32m 0x8A2 3 - DEVICE_PACKAGES := kmod-gpio-beeper -endef -TARGET_DEVICES += compex_wpj428 - -define Device/devolo_magic-2-wifi-next - $(call Device/FitImage) - DEVICE_VENDOR := devolo - DEVICE_MODEL := Magic 2 WiFi next - SOC := qcom-ipq4018 - KERNEL_SIZE := 4096k - - # If the bootloader sees 0xDEADC0DE and this trailer at the 64k boundary of a TFTP image - # it will bootm it, just like we want for the initramfs. - KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb | pad-to 64k |\ - append-string -e '\xDE\xAD\xC0\xDE{"fl_initramfs":""}\x00' - - IMAGE_SIZE := 26624k - IMAGES := sysupgrade.bin - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata - DEVICE_PACKAGES := ipq-wifi-devolo_magic-2-wifi-next uboot-envtools -endef -TARGET_DEVICES += devolo_magic-2-wifi-next - -define Device/dlink_dap-2610 - $(call Device/FitImageLzma) - DEVICE_VENDOR := D-Link - DEVICE_MODEL := DAP-2610 - SOC := qcom-ipq4018 - DEVICE_DTS_CONFIG := config@ap.dk01.1-c1 - BLOCKSIZE := 64k - WRGG_DEVNAME := /dev/mtdblock/8 - WRGG_SIGNATURE := wapac30_dkbs_dap2610 - IMAGE_SIZE := 14080k - IMAGES += factory.bin - # Bootloader expects a special 160 byte header which is added by - # wrgg-image. - # Factory image size must be larger than 6MB, and size in wrgg header must - # match actual factory image size to be flashable from D-Link http server. - # Bootloader verifies checksum of wrgg image before booting, thus jffs2 - # cannot be part of the wrgg image. This is solved in the factory image by - # having the rootfs at the end of the image (without pad-rootfs). And in - # the sysupgrade image only the kernel is included in the wrgg checksum, - # but this is not flashable from the D-link http server. - # append-rootfs must start on an erase block boundary. - IMAGE/factory.bin := append-kernel | pad-offset 6144k 160 | append-rootfs | wrgg-image | check-size - IMAGE/sysupgrade.bin := append-kernel | wrgg-image | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size | append-metadata - DEVICE_PACKAGES := ipq-wifi-dlink_dap2610 -endef -TARGET_DEVICES += dlink_dap-2610 - -define Device/edgecore_ecw5211 - $(call Device/FitImage) - $(call Device/UbiFit) - DEVICE_VENDOR := Edgecore - DEVICE_MODEL := ECW5211 - SOC := qcom-ipq4018 - BLOCKSIZE := 128k - PAGESIZE := 2048 - DEVICE_PACKAGES := kmod-tpm-i2c-atmel kmod-usb-acm uboot-envtools -endef -TARGET_DEVICES += edgecore_ecw5211 - -define Device/edgecore_oap100 - $(call Device/FitImage) - $(call Device/UbiFit) - DEVICE_VENDOR := Edgecore - DEVICE_MODEL := OAP100 - SOC := qcom-ipq4019 - BLOCKSIZE := 128k - PAGESIZE := 2048 - IMAGES := nand-sysupgrade.bin - DEVICE_DTS_CONFIG := config@ap.dk07.1-c1 - DEVICE_PACKAGES := ipq-wifi-edgecore_oap100 kmod-usb-acm kmod-usb-net kmod-usb-net-cdc-qmi uqmi -endef -TARGET_DEVICES += edgecore_oap100 - -define Device/engenius_eap1300 - $(call Device/FitImage) - DEVICE_VENDOR := EnGenius - DEVICE_MODEL := EAP1300 - DEVICE_DTS_CONFIG := config@4 - BOARD_NAME := eap1300 - SOC := qcom-ipq4018 - KERNEL_SIZE := 5120k - IMAGE_SIZE := 25344k - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata -endef -TARGET_DEVICES += engenius_eap1300 - -define Device/engenius_eap2200 - $(call Device/FitImage) - $(call Device/UbiFit) - DEVICE_VENDOR := EnGenius - DEVICE_MODEL := EAP2200 - SOC := qcom-ipq4019 - BLOCKSIZE := 128k - PAGESIZE := 2048 - DEVICE_PACKAGES := ath10k-firmware-qca9888-ct ipq-wifi-engenius_eap2200 -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers -endef -TARGET_DEVICES += engenius_eap2200 - -define Device/engenius_emd1 - $(call Device/FitImage) - DEVICE_VENDOR := EnGenius - DEVICE_MODEL := EMD1 - DEVICE_DTS_CONFIG := config@4 - SOC := qcom-ipq4018 - IMAGE_SIZE := 30720k - IMAGES += factory.bin - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata - IMAGE/factory.bin := qsdk-ipq-factory-nor | check-size -endef -TARGET_DEVICES += engenius_emd1 - -define Device/engenius_emr3500 - $(call Device/FitImage) - DEVICE_VENDOR := EnGenius - DEVICE_MODEL := EMR3500 - DEVICE_DTS_CONFIG := config@4 - SOC := qcom-ipq4018 - KERNEL_SIZE := 4096k - IMAGE_SIZE := 30720k - IMAGES += factory.bin - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata - IMAGE/factory.bin := qsdk-ipq-factory-nor | check-size -endef -TARGET_DEVICES += engenius_emr3500 - -define Device/engenius_ens620ext - $(call Device/FitImage) - DEVICE_VENDOR := EnGenius - DEVICE_MODEL := ENS620EXT - SOC := qcom-ipq4018 - DEVICE_DTS_CONFIG := config@4 - BLOCKSIZE := 64k - PAGESIZE := 256 - BOARD_NAME := ENS620EXT - VENDOR_ID := 0x0101 - PRODUCT_ID := 0x79 - PRODUCT_ID_NEW := 0xA4 - DATECODE := 190507 - FW_VER := 3.1.2 - FW_VER_NEW := 3.5.6 - CW_VER := 1.8.99 - IMAGE_SIZE := 21312k - KERNEL_SIZE := 5120k - FILESYSTEMS := squashfs - IMAGES += factory_30.bin factory_35.bin - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size | append-metadata - IMAGE/factory_30.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size | SenaoFW $$$$(PRODUCT_ID) $$$$(FW_VER) - IMAGE/factory_35.bin := qsdk-ipq-factory-nor | check-size | SenaoFW $$$$(PRODUCT_ID_NEW) $$$$(FW_VER_NEW) -endef -TARGET_DEVICES += engenius_ens620ext - -define Device/ezviz_cs-w3-wd1200g-eup - $(call Device/FitImage) - DEVICE_VENDOR := EZVIZ - DEVICE_MODEL := CS-W3-WD1200G - DEVICE_VARIANT := EUP - DEVICE_DTS_CONFIG := config@4 - IMAGE_SIZE := 14848k - SOC := qcom-ipq4018 - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | \ - append-metadata - DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers \ - ipq-wifi-ezviz_cs-w3-wd1200g-eup -endef -TARGET_DEVICES += ezviz_cs-w3-wd1200g-eup - -define Device/glinet_gl-b1300 - $(call Device/FitImage) - DEVICE_VENDOR := GL.iNet - DEVICE_MODEL := GL-B1300 - BOARD_NAME := gl-b1300 - SOC := qcom-ipq4029 - KERNEL_SIZE := 4096k - IMAGE_SIZE := 26624k - IMAGE/sysupgrade.bin := append-kernel |append-rootfs | pad-rootfs | append-metadata -endef -TARGET_DEVICES += glinet_gl-b1300 - -define Device/glinet_gl-s1300 - $(call Device/FitImage) - DEVICE_VENDOR := GL.iNet - DEVICE_MODEL := GL-S1300 - SOC := qcom-ipq4029 - KERNEL_SIZE := 4096k - IMAGE_SIZE := 26624k - IMAGES := sysupgrade.bin - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata - DEVICE_PACKAGES := ipq-wifi-glinet_gl-s1300 kmod-fs-ext4 kmod-mmc kmod-spi-dev -endef -TARGET_DEVICES += glinet_gl-s1300 - -define Device/linksys_ea6350v3 - # The Linksys EA6350v3 has a uboot bootloader that does not - # support either booting lzma kernel images nor booting UBI - # partitions. This uboot, however, supports raw kernel images and - # gzipped images. - # - # As for the time of writing this, the device will boot the kernel - # from a fixed address with a fixed length of 3MiB. Also, the - # device has a hard-coded kernel command line that requieres the - # rootfs and alt_rootfs to be in mtd11 and mtd13 respectively. - # Oh... and the kernel partition overlaps with the rootfs - # partition (the same for alt_kernel and alt_rootfs). - # - # If you are planing re-partitioning the device, you may want to - # keep those details in mind: - # 1. The kernel adresses you should honor are 0x00000000 and - # 0x02800000 respectively. - # 2. The kernel size (plus the dtb) cannot exceed 3.00MiB in size. - # 3. You can use 'zImage', but not a raw 'Image' packed with lzma. - # 4. The kernel command line from uboot is harcoded to boot with - # rootfs either in mtd11 or mtd13. - $(call Device/FitzImage) - DEVICE_VENDOR := Linksys - DEVICE_MODEL := EA6350 - DEVICE_VARIANT := v3 - SOC := qcom-ipq4018 - BLOCKSIZE := 128k - PAGESIZE := 2048 - KERNEL_SIZE := 3072k - IMAGE_SIZE := 37888k - UBINIZE_OPTS := -E 5 - IMAGES += factory.bin - IMAGE/factory.bin := append-kernel | append-uImage-fakehdr filesystem | pad-to $$$$(KERNEL_SIZE) | append-ubi | linksys-image type=EA6350v3 - DEVICE_PACKAGES := uboot-envtools -endef -TARGET_DEVICES += linksys_ea6350v3 - -define Device/linksys_ea8300 - $(call Device/FitzImage) - DEVICE_VENDOR := Linksys - DEVICE_MODEL := EA8300 - SOC := qcom-ipq4019 - KERNEL_SIZE := 3072k - IMAGE_SIZE := 87040k - BLOCKSIZE := 128k - PAGESIZE := 2048 - UBINIZE_OPTS := -E 5 # EOD marks to "hide" factory sig at EOF - IMAGES += factory.bin - IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | linksys-image type=EA8300 - DEVICE_PACKAGES := uboot-envtools ath10k-firmware-qca9888-ct ipq-wifi-linksys_ea8300 kmod-usb-ledtrig-usbport -endef -TARGET_DEVICES += linksys_ea8300 - -define Device/linksys_mr8300 - $(call Device/FitzImage) - DEVICE_VENDOR := Linksys - DEVICE_MODEL := MR8300 - SOC := qcom-ipq4019 - KERNEL_SIZE := 3072k - IMAGE_SIZE := 87040k - BLOCKSIZE := 128k - PAGESIZE := 2048 - UBINIZE_OPTS := -E 5 # EOD marks to "hide" factory sig at EOF - IMAGES += factory.bin - IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | linksys-image type=MR8300 - DEVICE_PACKAGES := uboot-envtools ath10k-firmware-qca9888-ct ipq-wifi-linksys_mr8300-v0 kmod-usb-ledtrig-usbport -endef -TARGET_DEVICES += linksys_mr8300 - -define Device/luma_wrtq-329acn - $(call Device/FitImage) - DEVICE_VENDOR := Luma Home - DEVICE_MODEL := WRTQ-329ACN - SOC := qcom-ipq4018 - DEVICE_PACKAGES := ipq-wifi-luma_wrtq-329acn kmod-ath3k kmod-eeprom-at24 kmod-i2c-gpio uboot-envtools - IMAGE_SIZE := 76632k - BLOCKSIZE := 128k - PAGESIZE := 2048 -endef -TARGET_DEVICES += luma_wrtq-329acn - -define Device/meraki_mr33 - $(call Device/FitImage) - DEVICE_VENDOR := Cisco Meraki - DEVICE_MODEL := MR33 - SOC := qcom-ipq4029 - BLOCKSIZE := 128k - PAGESIZE := 2048 - DEVICE_PACKAGES := -swconfig ath10k-firmware-qca9887-ct -endef -TARGET_DEVICES += meraki_mr33 - -define Device/mobipromo_cm520-79f - $(call Device/FitzImage) - $(call Device/UbiFit) - DEVICE_VENDOR := MobiPromo - DEVICE_MODEL := CM520-79F - SOC := qcom-ipq4019 - BLOCKSIZE := 128k - PAGESIZE := 2048 - DEVICE_PACKAGES := ipq-wifi-mobipromo_cm520-79f kmod-usb-ledtrig-usbport -endef -TARGET_DEVICES += mobipromo_cm520-79f - -define Device/netgear_ex61x0v2 - $(call Device/DniImage) - DEVICE_VENDOR := NETGEAR - DEVICE_DTS_CONFIG := config@4 - NETGEAR_BOARD_ID := EX6150v2series - NETGEAR_HW_ID := 29765285+16+0+128+2x2 - IMAGE_SIZE := 14400k - SOC := qcom-ipq4018 -endef - -define Device/netgear_ex6100v2 - $(call Device/netgear_ex61x0v2) - DEVICE_MODEL := EX6100 - DEVICE_VARIANT := v2 -endef -TARGET_DEVICES += netgear_ex6100v2 - -define Device/netgear_ex6150v2 - $(call Device/netgear_ex61x0v2) - DEVICE_MODEL := EX6150 - DEVICE_VARIANT := v2 -endef -TARGET_DEVICES += netgear_ex6150v2 - -define Device/openmesh_a42 - $(call Device/FitImageLzma) - DEVICE_VENDOR := OpenMesh - DEVICE_MODEL := A42 - SOC := qcom-ipq4018 - DEVICE_DTS_CONFIG := config@om.a42 - BLOCKSIZE := 64k - KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb | pad-to $$(BLOCKSIZE) - IMAGE_SIZE := 15616k - IMAGES += factory.bin - IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=A42 - IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata - DEVICE_PACKAGES := uboot-envtools -endef -TARGET_DEVICES += openmesh_a42 - -define Device/openmesh_a62 - $(call Device/FitImageLzma) - DEVICE_VENDOR := OpenMesh - DEVICE_MODEL := A62 - SOC := qcom-ipq4019 - DEVICE_DTS_CONFIG := config@om.a62 - BLOCKSIZE := 64k - KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb | pad-to $$(BLOCKSIZE) - IMAGE_SIZE := 15552k - IMAGES += factory.bin - IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=A62 - IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata - DEVICE_PACKAGES := ath10k-firmware-qca9888-ct uboot-envtools -endef -TARGET_DEVICES += openmesh_a62 - -define Device/plasmacloud_pa1200 - $(call Device/FitImageLzma) - DEVICE_VENDOR := Plasma Cloud - DEVICE_MODEL := PA1200 - SOC := qcom-ipq4018 - DEVICE_DTS_CONFIG := config@pc.pa1200 - BLOCKSIZE := 64k - KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb | pad-to $$(BLOCKSIZE) - IMAGE_SIZE := 15616k - IMAGES += factory.bin - IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=PA1200 - IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata - DEVICE_PACKAGES := uboot-envtools ipq-wifi-plasmacloud-pa1200 -endef -TARGET_DEVICES += plasmacloud_pa1200 - -define Device/plasmacloud_pa2200 - $(call Device/FitImageLzma) - DEVICE_VENDOR := Plasma Cloud - DEVICE_MODEL := PA2200 - SOC := qcom-ipq4019 - DEVICE_DTS_CONFIG := config@pc.pa2200 - BLOCKSIZE := 64k - KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb | pad-to $$(BLOCKSIZE) - IMAGE_SIZE := 15552k - IMAGES += factory.bin - IMAGE/factory.bin := append-rootfs | pad-rootfs | openmesh-image ce_type=PA2200 - IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata - DEVICE_PACKAGES := ath10k-firmware-qca9888-ct ipq-wifi-plasmacloud-pa2200 uboot-envtools -endef -TARGET_DEVICES += plasmacloud_pa2200 - -define Device/qcom_ap-dk01.1-c1 - DEVICE_VENDOR := Qualcomm Atheros - DEVICE_MODEL := AP-DK01.1 - DEVICE_VARIANT := C1 - BOARD_NAME := ap-dk01.1-c1 - SOC := qcom-ipq4019 - DEVICE_DTS := qcom-ipq4019-ap.dk01.1-c1 - KERNEL_INSTALL := 1 - KERNEL_SIZE := 4096k - IMAGE_SIZE := 26624k - $(call Device/FitImage) - IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | append-metadata -endef -TARGET_DEVICES += qcom_ap-dk01.1-c1 - -define Device/qcom_ap-dk04.1-c1 - $(call Device/FitImage) - $(call Device/UbiFit) - DEVICE_VENDOR := Qualcomm Atheros - DEVICE_MODEL := AP-DK04.1 - DEVICE_VARIANT := C1 - SOC := qcom-ipq4019 - DEVICE_DTS := qcom-ipq4019-ap.dk04.1-c1 - KERNEL_INSTALL := 1 - KERNEL_SIZE := 4048k - BLOCKSIZE := 128k - PAGESIZE := 2048 - BOARD_NAME := ap-dk04.1-c1 -endef -TARGET_DEVICES += qcom_ap-dk04.1-c1 - -define Device/pangu_l1000 - $(call Device/FitImage) - $(call Device/UbiFit) - DEVICE_VENDOR := PANGU - DEVICE_MODEL := L1000 - SOC := qcom-ipq4019 - DEVICE_DTS := qcom-ipq4019-l1000 - KERNEL_INSTALL := 1 - BLOCKSIZE := 128k - PAGESIZE := 2048 - BOARD_NAME := l1000 - DEVICE_PACKAGES := ipq-wifi-pangu_l1000 -endef -TARGET_DEVICES += pangu_l1000 - -define Device/p2w_r619ac - $(call Device/FitzImage) - $(call Device/UbiFit) - DEVICE_VENDOR := P&W - DEVICE_MODEL := R619AC - SOC := qcom-ipq4019 - DEVICE_DTS_CONFIG := config@10 - BLOCKSIZE := 128k - PAGESIZE := 2048 - IMAGES += nand-factory.bin - IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand - DEVICE_PACKAGES := ipq-wifi-p2w_r619ac -endef -TARGET_DEVICES += p2w_r619ac - -define Device/p2w_r619ac-128m - $(call Device/FitzImage) - $(call Device/UbiFit) - DEVICE_VENDOR := P&W - DEVICE_MODEL := R619AC - DEVICE_VARIANT := 128M - SOC := qcom-ipq4019 - DEVICE_DTS_CONFIG := config@10 - BLOCKSIZE := 128k - PAGESIZE := 2048 - DEVICE_PACKAGES := ipq-wifi-p2w_r619ac -endef -TARGET_DEVICES += p2w_r619ac-128m - -define Device/pangu_l1000 - $(call Device/FitImage) - $(call Device/UbiFit) - DEVICE_VENDOR := PANGU - DEVICE_MODEL := L1000 - SOC := qcom-ipq4019 - DEVICE_DTS := qcom-ipq4019-l1000 - KERNEL_INSTALL := 1 - BLOCKSIZE := 128k - PAGESIZE := 2048 - BOARD_NAME := l1000 - DEVICE_PACKAGES := ipq-wifi-pangu_l1000 -endef -TARGET_DEVICES += pangu_l1000 - -define Device/qxwlan_e2600ac-c1 - $(call Device/FitImage) - DEVICE_VENDOR := Qxwlan - DEVICE_MODEL := E2600AC - DEVICE_VARIANT := C1 - BOARD_NAME := e2600ac-c1 - SOC := qcom-ipq4019 - KERNEL_SIZE := 4096k - IMAGE_SIZE := 31232k - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata - DEVICE_PACKAGES := ipq-wifi-qxwlan_e2600ac -endef -TARGET_DEVICES += qxwlan_e2600ac-c1 - -define Device/qxwlan_e2600ac-c2 - $(call Device/FitImage) - $(call Device/UbiFit) - DEVICE_VENDOR := Qxwlan - DEVICE_MODEL := E2600AC - DEVICE_VARIANT := C2 - SOC := qcom-ipq4019 - KERNEL_INSTALL := 1 - BLOCKSIZE := 128k - PAGESIZE := 2048 - DEVICE_PACKAGES := ipq-wifi-qxwlan_e2600ac -endef -TARGET_DEVICES += qxwlan_e2600ac-c2 - -define Device/unielec_u4019-32m - $(call Device/FitImage) - DEVICE_VENDOR := Unielec - DEVICE_MODEL := U4019 - DEVICE_VARIANT := 32M - BOARD_NAME := u4019-32m - SOC := qcom-ipq4019 - KERNEL_SIZE := 4096k - IMAGE_SIZE := 31232k - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata -endef -TARGET_DEVICES += unielec_u4019-32m - -define Device/zyxel_nbg6617 - $(call Device/FitImageLzma) - DEVICE_VENDOR := ZyXEL - DEVICE_MODEL := NBG6617 - SOC := qcom-ipq4018 - KERNEL_SIZE := 4096k - ROOTFS_SIZE := 24960k - RAS_BOARD := NBG6617 - RAS_ROOTFS_SIZE := 19840k - RAS_VERSION := "$(VERSION_DIST) $(REVISION)" - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata - IMAGES += factory.bin -# The ZyXEL firmware allows flashing thru the web-gui only when the rootfs is -# at least as large as the one of the initial firmware image (not the current -# one on the device). This only applies to the Web-UI, the bootlaoder ignores -# this minimum-size. However, the larger image can be flashed both ways. - IMAGE/factory.bin := append-rootfs | pad-rootfs | pad-to 64k | check-size $$$$(ROOTFS_SIZE) | zyxel-ras-image separate-kernel - IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-rootfs | check-size $$$$(ROOTFS_SIZE) | sysupgrade-tar rootfs=$$$$@ | append-metadata - DEVICE_PACKAGES := uboot-envtools kmod-usb-ledtrig-usbport -endef -TARGET_DEVICES += zyxel_nbg6617 - -define Device/zyxel_wre6606 - $(call Device/FitImage) - DEVICE_VENDOR := ZyXEL - DEVICE_MODEL := WRE6606 - DEVICE_DTS_CONFIG := config@4 - SOC := qcom-ipq4018 - IMAGE_SIZE := 13184k - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size - DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers -endef -TARGET_DEVICES += zyxel_wre6606 - -$(eval $(call BuildImage)) \ No newline at end of file diff --git a/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch b/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch deleted file mode 100644 index d278ead6..00000000 --- a/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch +++ /dev/null @@ -1,73 +0,0 @@ -From a10fab12a927e60b7141a602e740d70cb4d09e4a Mon Sep 17 00:00:00 2001 -From: John Crispin -Date: Thu, 9 Mar 2017 11:03:18 +0100 -Subject: [PATCH] arm: boot: add dts files - -Signed-off-by: John Crispin ---- - arch/arm/boot/dts/Makefile | 23 +++++++++++++++++++++++ - 1 file changed, 23 insertions(+) - ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -837,11 +837,60 @@ dtb-$(CONFIG_ARCH_QCOM) += \ - qcom-apq8074-dragonboard.dtb \ - qcom-apq8084-ifc6540.dtb \ - qcom-apq8084-mtp.dtb \ -+ qcom-ipq4018-a42.dtb \ -+ qcom-ipq4018-ap120c-ac.dtb \ -+ qcom-ipq4018-dap-2610.dtb \ -+ qcom-ipq4018-cs-w3-wd1200g-eup.dtb \ -+ qcom-ipq4018-magic-2-wifi-next.dtb \ -+ qcom-ipq4018-ea6350v3.dtb \ -+ qcom-ipq4018-eap1300.dtb \ -+ qcom-ipq4018-ecw5211.dtb \ -+ qcom-ipq4018-emd1.dtb \ -+ qcom-ipq4018-emr3500.dtb \ -+ qcom-ipq4018-ens620ext.dtb \ -+ qcom-ipq4018-ex6100v2.dtb \ -+ qcom-ipq4018-ex6150v2.dtb \ -+ qcom-ipq4018-fritzbox-4040.dtb \ -+ qcom-ipq4018-jalapeno.dtb \ -+ qcom-ipq4018-meshpoint-one.dtb \ -+ qcom-ipq4018-nbg6617.dtb \ -+ qcom-ipq4019-oap100.dtb \ -+ qcom-ipq4018-pa1200.dtb \ -+ qcom-ipq4018-rt-ac58u.dtb \ -+ qcom-ipq4018-wre6606.dtb \ -+ qcom-ipq4018-wrtq-329acn.dtb \ - qcom-ipq4019-ap.dk01.1-c1.dtb \ - qcom-ipq4019-ap.dk04.1-c1.dtb \ - qcom-ipq4019-ap.dk04.1-c3.dtb \ - qcom-ipq4019-ap.dk07.1-c1.dtb \ - qcom-ipq4019-ap.dk07.1-c2.dtb \ -+ qcom-ipq4019-a62.dtb \ -+ qcom-ipq4019-cm520-79f.dtb \ -+ qcom-ipq4019-ea8300.dtb \ -+ qcom-ipq4019-eap2200.dtb \ -+ qcom-ipq4019-fritzbox-7530.dtb \ -+ qcom-ipq4019-fritzrepeater-1200.dtb \ -+ qcom-ipq4019-fritzrepeater-3000.dtb \ -+ qcom-ipq4019-map-ac2200.dtb \ -+ qcom-ipq4019-mr8300.dtb \ -+ qcom-ipq4019-e2600ac-c1.dtb \ -+ qcom-ipq4019-e2600ac-c2.dtb \ -+ qcom-ipq4019-habanero-dvk.dtb \ -+ qcom-ipq4019-pa2200.dtb \ -+ qcom-ipq4019-rtl30vw.dtb \ -+ qcom-ipq4019-u4019-32m.dtb \ -+ qcom-ipq4019-wpj419.dtb \ -+ qcom-ipq4019-wtr-m2133hp.dtb \ -+ qcom-ipq4019-r619ac.dtb \ -+ qcom-ipq4019-r619ac-128m.dtb \ -+ qcom-ipq4019-l1000.dtb \ -+ qcom-ipq4028-wpj428.dtb \ -+ qcom-ipq4029-ap-303.dtb \ -+ qcom-ipq4029-ap-303h.dtb \ -+ qcom-ipq4029-ap-365.dtb \ -+ qcom-ipq4029-gl-b1300.dtb \ -+ qcom-ipq4029-gl-s1300.dtb \ -+ qcom-ipq4029-mr33.dtb \ - qcom-ipq8064-ap148.dtb \ - qcom-msm8660-surf.dtb \ - qcom-msm8960-cdp.dtb \ \ No newline at end of file diff --git a/root/target/linux/mediatek/mt7623/config-4.19 b/root/target/linux/mediatek/mt7623/config-4.19 deleted file mode 100644 index c162f5c0..00000000 --- a/root/target/linux/mediatek/mt7623/config-4.19 +++ /dev/null @@ -1,555 +0,0 @@ -# CONFIG_AIO is not set -CONFIG_ALIGNMENT_TRAP=y -# CONFIG_ARCH_AXXIA is not set -CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ARCH_DMA_ADDR_T_64BIT=y -CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y -CONFIG_ARCH_HAS_ELF_RANDOMIZE=y -CONFIG_ARCH_HAS_FORTIFY_SOURCE=y -CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y -CONFIG_ARCH_HAS_KCOV=y -CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y -CONFIG_ARCH_HAS_PHYS_TO_DMA=y -CONFIG_ARCH_HAS_PTE_SPECIAL=y -CONFIG_ARCH_HAS_SET_MEMORY=y -CONFIG_ARCH_HAS_SG_CHAIN=y -CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y -CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y -CONFIG_ARCH_HAS_TICK_BROADCAST=y -CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_MEDIATEK=y -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_ARCH_MULTIPLATFORM=y -CONFIG_ARCH_MULTI_V6_V7=y -CONFIG_ARCH_MULTI_V7=y -CONFIG_ARCH_NR_GPIO=0 -CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y -CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y -CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y -CONFIG_ARCH_SUPPORTS_UPROBES=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_ARM=y -CONFIG_ARM_APPENDED_DTB=y -CONFIG_ARM_ARCH_TIMER=y -CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y -CONFIG_ARM_ATAG_DTB_COMPAT=y -CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND=y -# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER is not set -CONFIG_ARM_CPU_SUSPEND=y -# CONFIG_ARM_CPU_TOPOLOGY is not set -CONFIG_ARM_GIC=y -CONFIG_ARM_HAS_SG_CHAIN=y -CONFIG_ARM_L1_CACHE_SHIFT=6 -CONFIG_ARM_L1_CACHE_SHIFT_6=y -CONFIG_ARM_LPAE=y -CONFIG_ARM_MEDIATEK_CPUFREQ=y -CONFIG_ARM_PATCH_IDIV=y -CONFIG_ARM_PATCH_PHYS_VIRT=y -# CONFIG_ARM_SMMU is not set -CONFIG_ARM_THUMB=y -CONFIG_ARM_THUMBEE=y -CONFIG_ARM_UNWIND=y -CONFIG_ARM_VIRT_EXT=y -CONFIG_ASN1=y -CONFIG_ASSOCIATIVE_ARRAY=y -CONFIG_ATAGS=y -CONFIG_AUTO_ZRELADDR=y -# CONFIG_BCM84881_PHY is not set -CONFIG_BLK_MQ_PCI=y -# CONFIG_CACHE_L2X0 is not set -CONFIG_CLEANCACHE=y -CONFIG_CLKDEV_LOOKUP=y -CONFIG_CLKSRC_MMIO=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_CLZ_TAB=y -CONFIG_CMDLINE="earlyprintk console=ttyS0,115200 vmalloc=256M" -CONFIG_CMDLINE_EXTEND=y -CONFIG_COMMON_CLK=y -CONFIG_COMMON_CLK_MEDIATEK=y -CONFIG_COMMON_CLK_MT2701=y -CONFIG_COMMON_CLK_MT2701_AUDSYS=y -CONFIG_COMMON_CLK_MT2701_BDPSYS=y -CONFIG_COMMON_CLK_MT2701_ETHSYS=y -CONFIG_COMMON_CLK_MT2701_G3DSYS=y -CONFIG_COMMON_CLK_MT2701_HIFSYS=y -CONFIG_COMMON_CLK_MT2701_IMGSYS=y -CONFIG_COMMON_CLK_MT2701_MMSYS=y -CONFIG_COMMON_CLK_MT2701_VDECSYS=y -# CONFIG_COMMON_CLK_MT7622 is not set -CONFIG_COMMON_CLK_MT7629=y -# CONFIG_COMMON_CLK_MT7629_ETHSYS is not set -# CONFIG_COMMON_CLK_MT7629_HIFSYS is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set -CONFIG_COREDUMP=y -# CONFIG_CPUFREQ_DT is not set -CONFIG_CPU_32v6K=y -CONFIG_CPU_32v7=y -CONFIG_CPU_ABRT_EV7=y -# CONFIG_CPU_BPREDICT_DISABLE is not set -CONFIG_CPU_CACHE_V7=y -CONFIG_CPU_CACHE_VIPT=y -CONFIG_CPU_COPY_V6=y -CONFIG_CPU_CP15=y -CONFIG_CPU_CP15_MMU=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_ATTR_SET=y -CONFIG_CPU_FREQ_GOV_COMMON=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -# CONFIG_CPU_FREQ_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_STAT=y -CONFIG_CPU_HAS_ASID=y -# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set -# CONFIG_CPU_ICACHE_DISABLE is not set -CONFIG_CPU_PABRT_V7=y -CONFIG_CPU_PM=y -CONFIG_CPU_RMAP=y -CONFIG_CPU_SPECTRE=y -# CONFIG_CPU_THERMAL is not set -CONFIG_CPU_THUMB_CAPABLE=y -CONFIG_CPU_TLB_V7=y -CONFIG_CPU_V7=y -CONFIG_CRASH_CORE=y -CONFIG_CRC16=y -# CONFIG_CRC32_SARWATE is not set -CONFIG_CRC32_SLICEBY8=y -CONFIG_CROSS_MEMORY_ATTACH=y -CONFIG_CRYPTO_ACOMP2=y -CONFIG_CRYPTO_AEAD=y -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_AKCIPHER=y -CONFIG_CRYPTO_AKCIPHER2=y -CONFIG_CRYPTO_CRC32=y -CONFIG_CRYPTO_CRC32C=y -CONFIG_CRYPTO_CTR=y -CONFIG_CRYPTO_DEFLATE=y -CONFIG_CRYPTO_DRBG=y -CONFIG_CRYPTO_DRBG_HMAC=y -CONFIG_CRYPTO_DRBG_MENU=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_JITTERENTROPY=y -CONFIG_CRYPTO_LZO=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y -CONFIG_CRYPTO_NULL=y -CONFIG_CRYPTO_NULL2=y -CONFIG_CRYPTO_RNG=y -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_RNG_DEFAULT=y -CONFIG_CRYPTO_RSA=y -CONFIG_CRYPTO_SEQIV=y -CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_WORKQUEUE=y -CONFIG_DCACHE_WORD_ACCESS=y -CONFIG_DEBUG_ALIGN_RODATA=y -CONFIG_DEBUG_BUGVERBOSE=y -CONFIG_DEBUG_GPIO=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_LL=y -CONFIG_DEBUG_LL_INCLUDE="debug/8250.S" -CONFIG_DEBUG_MT6589_UART0=y -# CONFIG_DEBUG_MT8127_UART0 is not set -# CONFIG_DEBUG_MT8135_UART3 is not set -CONFIG_DEBUG_PREEMPT=y -CONFIG_DEBUG_UART_8250=y -# CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set -CONFIG_DEBUG_UART_8250_SHIFT=2 -# CONFIG_DEBUG_UART_8250_WORD is not set -CONFIG_DEBUG_UART_PHYS=0x11004000 -CONFIG_DEBUG_UART_VIRT=0xf1004000 -CONFIG_DEBUG_UNCOMPRESS=y -# CONFIG_DEBUG_USER is not set -CONFIG_DEFAULT_NETLINK=y -CONFIG_DMADEVICES=y -CONFIG_DMA_ENGINE=y -CONFIG_DMA_OF=y -CONFIG_DTC=y -CONFIG_EARLY_PRINTK=y -CONFIG_EDAC_ATOMIC_SCRUB=y -CONFIG_EDAC_SUPPORT=y -CONFIG_EINT_MTK=y -CONFIG_ELF_CORE=y -CONFIG_EXT4_FS=y -# CONFIG_F2FS_CHECK_FS is not set -CONFIG_F2FS_FS=y -# CONFIG_F2FS_FS_SECURITY is not set -CONFIG_F2FS_FS_XATTR=y -CONFIG_F2FS_STAT_FS=y -CONFIG_FIXED_PHY=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_FREEZER=y -CONFIG_FS_IOMAP=y -CONFIG_FS_MBCACHE=y -CONFIG_GENERIC_ALLOCATOR=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y -CONFIG_GENERIC_CPU_AUTOPROBE=y -CONFIG_GENERIC_EARLY_IOREMAP=y -CONFIG_GENERIC_IDLE_POLL_SETUP=y -CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y -CONFIG_GENERIC_IRQ_MIGRATION=y -CONFIG_GENERIC_IRQ_MULTI_HANDLER=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_IRQ_SHOW_LEVEL=y -CONFIG_GENERIC_MSI_IRQ=y -CONFIG_GENERIC_MSI_IRQ_DOMAIN=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_PHY=y -CONFIG_GENERIC_PINCONF=y -CONFIG_GENERIC_PINCTRL_GROUPS=y -CONFIG_GENERIC_PINMUX_FUNCTIONS=y -CONFIG_GENERIC_SCHED_CLOCK=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y -# CONFIG_GPS is not set -CONFIG_HANDLE_DOMAIN_IRQ=y -# CONFIG_HARDEN_BRANCH_PREDICTOR is not set -CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_HAS_DMA=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT_MAP=y -CONFIG_HAVE_ARCH_AUDITSYSCALL=y -CONFIG_HAVE_ARCH_BITREVERSE=y -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_HAVE_ARCH_KGDB=y -CONFIG_HAVE_ARCH_PFN_VALID=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y -CONFIG_HAVE_ARM_ARCH_TIMER=y -CONFIG_HAVE_ARM_SMCCC=y -CONFIG_HAVE_CLK=y -CONFIG_HAVE_CLK_PREPARE=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_HAVE_DEBUG_KMEMLEAK=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y -CONFIG_HAVE_EBPF_JIT=y -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_HAVE_GENERIC_GUP=y -CONFIG_HAVE_IDE=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_MOD_ARCH_SPECIFIC=y -CONFIG_HAVE_NET_DSA=y -CONFIG_HAVE_OPROFILE=y -CONFIG_HAVE_OPTPROBES=y -CONFIG_HAVE_PERF_EVENTS=y -CONFIG_HAVE_PERF_REGS=y -CONFIG_HAVE_PERF_USER_STACK_DUMP=y -CONFIG_HAVE_PROC_CPU=y -CONFIG_HAVE_RCU_TABLE_FREE=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_RSEQ=y -CONFIG_HAVE_SMP=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_UID16=y -CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -CONFIG_HOTPLUG_CPU=y -# CONFIG_HUGETLBFS is not set -CONFIG_HWMON=y -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_MTK=y -CONFIG_HZ_FIXED=0 -CONFIG_HZ_PERIODIC=y -CONFIG_I2C=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MT65XX=y -CONFIG_ICPLUS_PHY=y -CONFIG_IIO=y -# CONFIG_IIO_BUFFER is not set -# CONFIG_IIO_TRIGGER is not set -CONFIG_INITRAMFS_COMPRESSION="" -# CONFIG_INITRAMFS_FORCE is not set -CONFIG_INITRAMFS_ROOT_GID=1000 -CONFIG_INITRAMFS_ROOT_UID=1000 -CONFIG_INITRAMFS_SOURCE="/openwrt/trunk/build_dir/target-arm_cortex-a7_musl-1.1.14_eabi/root-mediatek /openwrt/trunk/target/linux/generic/image/initramfs-base-files.txt" -# CONFIG_IOMMU_DEBUGFS is not set -# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set -# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set -CONFIG_IOMMU_SUPPORT=y -CONFIG_IRQCHIP=y -CONFIG_IRQ_DOMAIN=y -CONFIG_IRQ_DOMAIN_HIERARCHY=y -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_IRQ_WORK=y -CONFIG_JBD2=y -CONFIG_KALLSYMS=y -CONFIG_KEXEC=y -CONFIG_KEXEC_CORE=y -CONFIG_KEYS=y -CONFIG_LEDS_MT6323=y -CONFIG_LIBFDT=y -CONFIG_LOCK_DEBUGGING_SUPPORT=y -CONFIG_LOCK_SPIN_ON_OWNER=y -CONFIG_LZ4_DECOMPRESS=y -CONFIG_LZO_COMPRESS=y -CONFIG_LZO_DECOMPRESS=y -# CONFIG_MACH_MT2701 is not set -# CONFIG_MACH_MT6589 is not set -# CONFIG_MACH_MT6592 is not set -CONFIG_MACH_MT7623=y -CONFIG_MACH_MT7629=y -# CONFIG_MACH_MT8127 is not set -# CONFIG_MACH_MT8135 is not set -CONFIG_MAGIC_SYSRQ=y -CONFIG_MDIO_BITBANG=y -CONFIG_MDIO_BUS=y -CONFIG_MDIO_DEVICE=y -CONFIG_MDIO_GPIO=y -CONFIG_MEDIATEK_MT6577_AUXADC=y -CONFIG_MEDIATEK_WATCHDOG=y -CONFIG_MEMFD_CREATE=y -CONFIG_MFD_CORE=y -CONFIG_MFD_MT6397=y -CONFIG_MFD_SYSCON=y -CONFIG_MIGHT_HAVE_CACHE_L2X0=y -CONFIG_MIGHT_HAVE_PCI=y -CONFIG_MIGRATION=y -CONFIG_MMC=y -CONFIG_MMC_BLOCK=y -CONFIG_MMC_MTK=y -CONFIG_MMC_SDHCI=y -# CONFIG_MMC_SDHCI_PCI is not set -CONFIG_MMC_SDHCI_PLTFM=y -# CONFIG_MMC_TIFM_SD is not set -CONFIG_MODULES_USE_ELF_REL=y -CONFIG_MPILIB=y -# CONFIG_MPTCP_BINDER is not set -# CONFIG_MPTCP_FULLMESH is not set -# CONFIG_MPTCP_NDIFFPORTS is not set -# CONFIG_MPTCP_REDUNDANT is not set -# CONFIG_MPTCP_ROUNDROBIN is not set -# CONFIG_MT753X_GSW is not set -CONFIG_MTD_BLOCK2MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_M25P80=y -CONFIG_MTD_MT81xx_NOR=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ECC=y -CONFIG_MTD_NAND_MTK=y -CONFIG_MTD_SPI_NOR=y -CONFIG_MTD_SPLIT_FIRMWARE=y -CONFIG_MTD_SPLIT_UIMAGE_FW=y -CONFIG_MTD_UBI=y -CONFIG_MTD_UBI_BEB_LIMIT=20 -CONFIG_MTD_UBI_BLOCK=y -# CONFIG_MTD_UBI_FASTMAP is not set -# CONFIG_MTD_UBI_GLUEBI is not set -CONFIG_MTD_UBI_WL_THRESHOLD=4096 -# CONFIG_MTK_BTIF is not set -# CONFIG_MTK_COMBO is not set -# CONFIG_MTK_CONN_LTE_IDC_SUPPORT is not set -# CONFIG_MTK_DHCPV6C_WIFI is not set -CONFIG_MTK_EFUSE=y -# CONFIG_MTK_GPS_SUPPORT is not set -# CONFIG_MTK_HSDMA is not set -CONFIG_MTK_INFRACFG=y -# CONFIG_MTK_IOMMU is not set -# CONFIG_MTK_IOMMU_V1 is not set -CONFIG_MTK_PLATFORM="mt7623" -CONFIG_MTK_PMIC_WRAP=y -CONFIG_MTK_SCPSYS=y -CONFIG_MTK_THERMAL=y -CONFIG_MTK_TIMER=y -CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NEON=y -CONFIG_NET_DSA=y -CONFIG_NET_DSA_LEGACY=y -CONFIG_NET_DSA_MT7530=y -CONFIG_NET_DSA_TAG_MTK=y -CONFIG_NET_FLOW_LIMIT=y -CONFIG_NET_MEDIATEK_SOC=y -CONFIG_NET_SWITCHDEV=y -# CONFIG_NET_VENDOR_AURORA is not set -CONFIG_NET_VENDOR_MEDIATEK=y -# CONFIG_NET_VENDOR_WIZNET is not set -CONFIG_NLS=y -CONFIG_NO_BOOTMEM=y -CONFIG_NR_CPUS=4 -CONFIG_NVMEM=y -CONFIG_OF=y -CONFIG_OF_ADDRESS=y -CONFIG_OF_EARLY_FLATTREE=y -CONFIG_OF_FLATTREE=y -CONFIG_OF_GPIO=y -CONFIG_OF_IRQ=y -CONFIG_OF_KOBJ=y -CONFIG_OF_MDIO=y -CONFIG_OF_NET=y -CONFIG_OF_RESERVED_MEM=y -CONFIG_OLD_SIGACTION=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_PADATA=y -CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_PCI=y -CONFIG_PCIEAER=y -CONFIG_PCIEPORTBUS=y -CONFIG_PCIE_MEDIATEK=y -CONFIG_PCIE_PME=y -CONFIG_PCI_DOMAINS=y -CONFIG_PCI_DOMAINS_GENERIC=y -CONFIG_PCI_MSI=y -CONFIG_PCI_MSI_IRQ_DOMAIN=y -# CONFIG_PCI_V3_SEMI is not set -CONFIG_PERF_USE_VMALLOC=y -CONFIG_PGTABLE_LEVELS=3 -CONFIG_PGTABLE_MAPPING=y -CONFIG_PHYLIB=y -CONFIG_PHYLINK=y -CONFIG_PHYS_ADDR_T_64BIT=y -CONFIG_PHY_MTK_TPHY=y -# CONFIG_PHY_MTK_XSPHY is not set -CONFIG_PINCTRL=y -CONFIG_PINCTRL_MT2701=y -CONFIG_PINCTRL_MT6397=y -CONFIG_PINCTRL_MT7623=y -CONFIG_PINCTRL_MT7629=y -CONFIG_PINCTRL_MTK=y -CONFIG_PINCTRL_MTK_MOORE=y -CONFIG_PLUGIN_HOSTCC="g++" -CONFIG_PM=y -CONFIG_PM_CLK=y -# CONFIG_PM_DEBUG is not set -CONFIG_PM_GENERIC_DOMAINS=y -CONFIG_PM_GENERIC_DOMAINS_OF=y -CONFIG_PM_GENERIC_DOMAINS_SLEEP=y -CONFIG_PM_OPP=y -CONFIG_PM_SLEEP=y -CONFIG_PM_SLEEP_SMP=y -CONFIG_POWER_RESET=y -CONFIG_POWER_SUPPLY=y -CONFIG_PREEMPT=y -CONFIG_PREEMPT_COUNT=y -# CONFIG_PREEMPT_NONE is not set -CONFIG_PREEMPT_RCU=y -CONFIG_PRINTK_TIME=y -CONFIG_PWM=y -CONFIG_PWM_MEDIATEK=y -# CONFIG_PWM_MTK_DISP is not set -CONFIG_PWM_SYSFS=y -CONFIG_RAS=y -CONFIG_RATIONAL=y -CONFIG_RCU_CPU_STALL_TIMEOUT=21 -# CONFIG_RCU_EXPERT is not set -CONFIG_RCU_NEED_SEGCBLIST=y -CONFIG_RCU_STALL_COMMON=y -CONFIG_REFCOUNT_FULL=y -CONFIG_REGMAP=y -CONFIG_REGMAP_I2C=y -CONFIG_REGMAP_MMIO=y -CONFIG_REGMAP_SPI=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_REGULATOR_GPIO=y -CONFIG_REGULATOR_MT6323=y -# CONFIG_REGULATOR_MT6380 is not set -# CONFIG_REGULATOR_MT6397 is not set -# CONFIG_REGULATOR_QCOM_SPMI is not set -CONFIG_RESET_CONTROLLER=y -CONFIG_RFS_ACCEL=y -CONFIG_RPS=y -CONFIG_RTC_CLASS=y -# CONFIG_RTC_DRV_CMOS is not set -# CONFIG_RTC_DRV_MT6397 is not set -# CONFIG_RTC_DRV_MT7622 is not set -CONFIG_RTC_I2C_AND_SPI=y -CONFIG_RWSEM_SPIN_ON_OWNER=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -# CONFIG_SERIAL_8250_DMA is not set -CONFIG_SERIAL_8250_FSL=y -CONFIG_SERIAL_8250_MT6577=y -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -# CONFIG_SFP is not set -CONFIG_SGL_ALLOC=y -CONFIG_SMP=y -# CONFIG_SMP_ON_UP is not set -CONFIG_SPARSE_IRQ=y -CONFIG_SPI=y -CONFIG_SPI_BITBANG=y -CONFIG_SPI_MASTER=y -CONFIG_SPI_MEM=y -CONFIG_SPI_MT65XX=y -# CONFIG_SPI_MTK_SNFI is not set -CONFIG_SPMI=y -# CONFIG_SPS30 is not set -CONFIG_SRCU=y -CONFIG_STREAM_PARSER=y -# CONFIG_STRIP_ASM_SYMS is not set -CONFIG_SUSPEND=y -CONFIG_SUSPEND_FREEZER=y -CONFIG_SWCONFIG=y -CONFIG_SWPHY=y -CONFIG_SWP_EMULATE=y -CONFIG_SYS_SUPPORTS_APM_EMULATION=y -CONFIG_SYS_SUPPORTS_HUGETLBFS=y -CONFIG_TASKS_RCU=y -# CONFIG_TCP_CONG_NANQINLANG is not set -CONFIG_THERMAL=y -CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y -CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 -CONFIG_THERMAL_GOV_STEP_WISE=y -CONFIG_THERMAL_OF=y -# CONFIG_THUMB2_KERNEL is not set -CONFIG_TICK_CPU_ACCOUNTING=y -CONFIG_TIMER_OF=y -CONFIG_TIMER_PROBE=y -CONFIG_TREE_SRCU=y -CONFIG_UBIFS_FS=y -# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set -CONFIG_UBIFS_FS_LZO=y -CONFIG_UBIFS_FS_ZLIB=y -CONFIG_UEVENT_HELPER_PATH="" -CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" -CONFIG_UNINLINE_SPIN_UNLOCK=y -CONFIG_USB=y -CONFIG_USB_COMMON=y -# CONFIG_USB_EHCI_HCD is not set -CONFIG_USB_SUPPORT=y -CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_MTK=y -CONFIG_USB_XHCI_PLATFORM=y -CONFIG_USE_OF=y -CONFIG_VFP=y -CONFIG_VFPv3=y -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_WATCHDOG_CORE=y -# CONFIG_WIRELESS is not set -# CONFIG_WLAN is not set -CONFIG_XPS=y -CONFIG_XZ_DEC_ARM=y -CONFIG_XZ_DEC_BCJ=y -CONFIG_ZBOOT_ROM_BSS=0 -CONFIG_ZBOOT_ROM_TEXT=0 -CONFIG_ZLIB_DEFLATE=y -CONFIG_ZLIB_INFLATE=y -CONFIG_ZSMALLOC=y -# CONFIG_ZSMALLOC_STAT is not set diff --git a/sign.sh b/sign.sh deleted file mode 100755 index 2d5ca9d0..00000000 --- a/sign.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -key=${1:-key-build} -path=${2:-x86_64} -[ -d $path/source/bin ] && [ -f "$key" ] && \ - find $path/source/bin \ - \( -name '*.img.gz' -or -name 'Packages' \) \ - -exec $path/source/staging_dir/host/bin/usign -S -m {} -s "$key" \;