diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index 685cc48..c5eccf6 100644
--- a/.forgejo/workflows/build.yml
+++ b/.forgejo/workflows/build.yml
@@ -73,33 +73,21 @@ jobs:
fi
apk add -q curl
found=0
- publish() {
- case "$(basename "$1")" in
- imsd-*|fingerprintd-*) echo "registry-sourced, not republished: $(basename "$1")"; return 0 ;;
- libqmi-*|qmi-utils-*) echo "retired fork, not republished: $(basename "$1")"; return 0 ;;
+ for f in /home/build/.local/var/pmbootstrap/packages/*/aarch64/*.apk; do
+ [ -e "$f" ] || continue
+ case "$(basename "$f")" in
+ imsd-*|fingerprintd-*) echo "registry-sourced, not republished: $(basename "$f")"; continue ;;
+ libqmi-*|qmi-utils-*) echo "retired fork, not republished: $(basename "$f")"; continue ;;
esac
found=1
code=$(curl -s -o /dev/null -w '%{http_code}' \
- --user "catbot:$PACKAGE_TOKEN" --upload-file "$1" \
+ --user "catbot:$PACKAGE_TOKEN" --upload-file "$f" \
"https://forgejo.catcrafts.net/api/packages/Catcrafts/alpine/edge/fp6")
case "$code" in
- 201) echo "published: $(basename "$1")" ;;
- 409) echo "already published: $(basename "$1")" ;;
- *) echo "FAILED ($code): $(basename "$1")"; exit 1 ;;
+ 201) echo "published: $(basename "$f")" ;;
+ 409) echo "already published: $(basename "$f")" ;;
+ *) echo "FAILED ($code): $(basename "$f")"; exit 1 ;;
esac
- }
- # The kernel goes last: a publish that fails part-way (the first
- # failed upload ends this step) must never leave the registry serving
- # a kernel without the userspace its card name needs - the 7.3 kernel
- # has its topology and UCM only in soc-fairphone-fp6-audio >= 5.
- for f in /home/build/.local/var/pmbootstrap/packages/*/aarch64/*.apk; do
- [ -e "$f" ] || continue
- case "$(basename "$f")" in linux-postmarketos-qcom-milos-*) continue ;; esac
- publish "$f"
- done
- for f in /home/build/.local/var/pmbootstrap/packages/*/aarch64/linux-postmarketos-qcom-milos-*.apk; do
- [ -e "$f" ] || continue
- publish "$f"
done
[ "$found" = 1 ] || { echo "no packages found to publish"; exit 1; }
@@ -108,11 +96,7 @@ jobs:
git config --global --add safe.directory "$PWD"
git config user.email "ci@catcrafts.net"
git config user.name "fp6-img CI"
- # Annotated, so the release keeps the top of the releases page:
- # Forgejo stamps a release with its tag's time at every tag push -
- # a lightweight tag's is the commit's, older than the dated release
- # tagged at push time; an annotated tag's is now.
- git tag -a -f latest -m "Latest FP6 Nura image, built $(date -u +%Y-%m-%d) from $(git rev-parse --short HEAD)"
+ git tag -f latest
git push origin latest --force
- name: Publish rolling 'latest' release
diff --git a/FUNDING.yml b/FUNDING.yml
deleted file mode 100644
index 7a62ac3..0000000
--- a/FUNDING.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-# Read by Forgejo for the repository's Donate button.
-custom: 'https://catcrafts.net/shop/donation'
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index f288702..0000000
--- 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.
-
-
- Copyright (C)
-
- 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:
-
- Copyright (C)
- 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
index 3870278..9380819 100644
--- a/README.md
+++ b/README.md
@@ -38,17 +38,3 @@ NV back and reports the result. The bootloader never writes `boot`.
Default login: `user` / `147147` (same as official Nura images).
**Never re-lock the bootloader** with a custom image installed.
-
-## License
-
-GPL-3.0-only - see [LICENSE](LICENSE).
-
-Patches and packaging carried from other projects keep the license named in their files.
-
-## Funding
-
-https://catcrafts.net/shop/donation - see [FUNDING](FUNDING.yml)
-
-## Copyright
-
-Copyright (C) 2026 Catcrafts® [catcrafts.net](https://catcrafts.net/)
diff --git a/aports/device/catcrafts-fp6-repo/APKBUILD b/aports/device/catcrafts-fp6-repo/APKBUILD
index cb4d1bb..b28d9f5 100644
--- a/aports/device/catcrafts-fp6-repo/APKBUILD
+++ b/aports/device/catcrafts-fp6-repo/APKBUILD
@@ -10,7 +10,7 @@ pkgrel=0
pkgdesc="Catcrafts FP6 apk repository (signing key + repositories entry)"
url="https://forgejo.catcrafts.net/Catcrafts/-/packages"
arch="noarch"
-license="GPL-3.0-only"
+license="MIT"
options="!check"
install="$pkgname.post-install $pkgname.post-upgrade"
_keyname="catcrafts@f79ff8fc14285f7824dd6a8c36ac814751da19ab7ed47c516f089a311ab7fe57.rsa.pub"
diff --git a/aports/device/fp6-charging-mode/APKBUILD b/aports/device/fp6-charging-mode/APKBUILD
index d4a40b6..5d97b0d 100644
--- a/aports/device/fp6-charging-mode/APKBUILD
+++ b/aports/device/fp6-charging-mode/APKBUILD
@@ -31,7 +31,7 @@ pkgrel=0
pkgdesc="Fairphone 6 offline charging mode (charger-boot detection + minimal charging target)"
url="https://forgejo.catcrafts.net/Catcrafts/fp6-img"
arch="noarch"
-license="GPL-3.0-only"
+license="MIT"
options="!check"
source="
charging-mode-generator
diff --git a/aports/device/fp6-device-tweaks/APKBUILD b/aports/device/fp6-device-tweaks/APKBUILD
index a5f8d02..4e288b0 100644
--- a/aports/device/fp6-device-tweaks/APKBUILD
+++ b/aports/device/fp6-device-tweaks/APKBUILD
@@ -24,7 +24,7 @@ pkgrel=1
pkgdesc="Fairphone 6 device-critical system configuration"
url="https://forgejo.catcrafts.net/Catcrafts/fp6-img"
arch="noarch"
-license="GPL-3.0-only"
+license="MIT"
# apk-native ban: with this meta installed, the resolver routes Plasma
# Mobile's audio through real PulseAudio, which claims the card and runs
# wireplumber in a video-only profile - no sinks, ever
diff --git a/aports/device/fp6-vendor-blobs/30-ath11k-board-data.manifest b/aports/device/fp6-vendor-blobs/30-ath11k-board-data.manifest
deleted file mode 100644
index 0e4be6d..0000000
--- a/aports/device/fp6-vendor-blobs/30-ath11k-board-data.manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-# WCN6750 WLAN board data (calibration, Qualcomm/Fairphone) - taken from the
-# stock modem partition on-device instead of being shipped (fp6 repo
-# journal/base/ 2026-10-14, journal/blobs/). The device tree asks ath11k for
-# the Fairphone_Gen_6 entry; upstream linux-firmware's board-2.bin has none,
-# the driver silently falls back to generic data, and on that the FP6 Plus
-# does not associate at all (user report 2026-10-14) while the FP6's scans
-# no longer find the 5 GHz networks around it, so it associates on 2.4 GHz
-# only (dev phone A/B 2026-11-01). The container built here is upstream's
-# file with every entry kept plus the device's own bdwlan.elf under the
-# requested name; it lives in /lib/firmware/updates, which the loader
-# searches first. Active slot first, the other slot as fallback; no hash pin
-# - the ELF belongs to the stock modem image and can change with it. No
-# rebind line: the service runs before the driver loads, so a fresh install
-# has the container at the first probe and an installed phone gets it at
-# its next boot - a re-probe from a package hook would restart wifi in the
-# middle of an upgrade.
-ath11k-bdf modem_a,modem_b image/qca6750/bdwlan.elf bus=ahb,qmi-chip-id=1,qmi-board-id=255,variant=Fairphone_Gen_6 /usr/lib/firmware/ath11k/WCN6750/hw1.0/board-2.bin.zst /usr/lib/firmware/updates/ath11k/WCN6750/hw1.0/board-2.bin
diff --git a/aports/device/fp6-vendor-blobs/APKBUILD b/aports/device/fp6-vendor-blobs/APKBUILD
index f73e7e2..a03b09b 100644
--- a/aports/device/fp6-vendor-blobs/APKBUILD
+++ b/aports/device/fp6-vendor-blobs/APKBUILD
@@ -12,33 +12,28 @@
# drops a previously-shipped blob restores the file immediately instead of
# at the next boot (--refresh in addition for an mbn consumer: it re-derives
# the trustlet from the active slot even if a file is present). Consumers:
-# soc-fairphone-fp6-audio (aw88261 acf), fingerprintd (focal64 trustlet);
-# this package's own 30-ath11k-board-data fragment (WLAN board data).
+# soc-fairphone-fp6-audio (aw88261 acf), fingerprintd (focal64 trustlet).
#
# 1-r3 (2026-09-11): active slot first, an unpinned ('-') structurally
# verified mode for mbn, --refresh -- after two field units got no
# fingerprint sensor from a whole-image hash pin that can only match one
# Android build (fp6 repo journal/blobs/, journal/fingerprint/).
-# 1-r4 (2026-10-14): the ath11k-bdf directive -- the WLAN board data the
-# device tree asks for, built on-device from the stock modem partition
-# (the FP6 Plus does not associate on upstream's generic data).
maintainer="Jorijn van der Graaf "
pkgname=fp6-vendor-blobs
pkgver=1
-pkgrel=4
+pkgrel=3
pkgdesc="On-device extraction of vendor blobs from the stock Android partitions"
url="https://forgejo.catcrafts.net/Catcrafts/fp6-img"
arch="noarch"
-license="GPL-3.0-only"
+license="MIT"
# fallback mapper for when the initramfs didn't map the dynamic partitions
-depends="make-dynpart-mappings zstd"
+depends="make-dynpart-mappings"
install="$pkgname.post-upgrade"
options="!check"
source="
fp6-vendor-blobs-extract
fp6-vendor-blobs.service
fp6-vendor-blobs.preset
- 30-ath11k-board-data.manifest
"
package() {
@@ -47,9 +42,8 @@ package() {
install -Dm644 "$srcdir"/fp6-vendor-blobs.service \
"$pkgdir"/usr/lib/systemd/system/fp6-vendor-blobs.service
# enabled unconditionally: the unit is a fast no-op once every manifest
- # dest exists and every ath11k-bdf override is current against its base,
- # and blobs appearing on first boot must not depend on a manual
- # systemctl enable. sysinit = the real (pre-coldplug) run;
+ # dest exists, and blobs appearing on first boot must not depend on a
+ # manual systemctl enable. sysinit = the real (pre-coldplug) run;
# multi-user = the post-udev retry if the early run failed (see unit)
mkdir -p "$pkgdir"/etc/systemd/system/sysinit.target.wants \
"$pkgdir"/etc/systemd/system/multi-user.target.wants
@@ -64,13 +58,11 @@ package() {
# extracted, no sound card. See journal/blobs/ 2026-08-28.
install -Dm644 "$srcdir"/fp6-vendor-blobs.preset \
"$pkgdir"/usr/lib/systemd/system-preset/50-fp6-vendor-blobs.preset
- install -Dm644 "$srcdir"/30-ath11k-board-data.manifest \
- "$pkgdir"/usr/share/fp6-vendor-blobs/manifest.d/30-ath11k-board-data.manifest
+ mkdir -p "$pkgdir"/usr/share/fp6-vendor-blobs/manifest.d
}
sha512sums="
-6aee5f56bc7bc960537b7ca1069305b56a5ec8da99a58298ba1715e93f002d391a2bd24be78214428b0297f9e3cfd1003a243c76a2d08397dcac63a7d800d302 fp6-vendor-blobs-extract
+e9618b4a1ccbe0913a608b32a1a9e87337e3da79a3d7ccc7f49292ae9aaa9406d2ea9817d63b3cfff2c4346b80dd2476c10725f4f0f95c859acd17b22ec03a16 fp6-vendor-blobs-extract
b4c290095d9f39515378dfef08de720ce49324210342aa13c131dfce1103785e796e6f821f0c659671a4c44b46f466ce0e03f11f216fdcdee2a99db5e7970800 fp6-vendor-blobs.service
9e79dd0aed13f11a71282aa24b2a26331e85c105e25ab0c0fed6189b8c300769a5f4308b18b91d9855868d658ad3a57c03e26c9b11bd27fd5e03f9a5decbbd6a fp6-vendor-blobs.preset
-f13d7b384a9b577762693c6831fbf28cb9e92e4f943af1917ddeba121c582f0c85c81a3e01e8e9ff6367c3717b6c37743f019db297f75339871292cf816bfc91 30-ath11k-board-data.manifest
"
diff --git a/aports/device/fp6-vendor-blobs/fp6-vendor-blobs-extract b/aports/device/fp6-vendor-blobs/fp6-vendor-blobs-extract
index 650d7cc..7f5b940 100644
--- a/aports/device/fp6-vendor-blobs/fp6-vendor-blobs-extract
+++ b/aports/device/fp6-vendor-blobs/fp6-vendor-blobs-extract
@@ -11,7 +11,6 @@
#
# file
# mbn
-# ath11k-bdf
# rebind
#
# Partition lists are tried in the order written, except that on an A/B
@@ -48,24 +47,6 @@
# itself and refuses a damaged or foreign image (one flipped byte ->
# ERROR_ELF_SIGNATURE_ERROR, measured 2026-09-03). The sha256 of what was
# installed is logged either way.
-# ath11k-bdf: the WLAN board data (calibration) the device tree asks ath11k
-# for by name, e.g. bus=ahb,qmi-chip-id=1,qmi-board-id=255,variant=Fairphone_Gen_6.
-# Upstream linux-firmware's board-2.bin carries no Fairphone entry, so the
-# driver silently falls back to the generic board-id data; the FP6 Plus does
-# not associate on it (user report 2026-10-14, fp6 repo journal/base/). The
-# stock modem partition has the device's own file (image/qca6750/bdwlan.elf).
-# This directive copies it and wraps it into a container at (the
-# loader searches /lib/firmware/updates first): (board-2.bin or
-# board-2.bin.zst, every upstream entry kept byte for byte) + one BOARD
-# entry named holding the ELF. Verified structurally (ELF
-# magic, sane size, the container's own magic), never by a pinned hash:
-# the ELF belongs to the stock modem image and can change with it.
-# The driver takes the first BOARD entry whose name matches, so an entry
-# upstream ships under the same name is used before the appended copy.
-# The sha256 of the used is kept in .fp6-base: a that
-# changed since (a linux-firmware upgrade) rebuilds at the next
-# run, and so does --refresh. A rebuild that reproduces the existing
-# byte for byte installs nothing and does not count as extracted.
# rebind: if this fragment's run extracted at least one file, unbind and
# re-probe on so the consuming driver picks the file up
# in the same boot. Unconditional on purpose: a still-bound consumer may
@@ -83,9 +64,8 @@
# --if-device: exit 0 quietly when no stock super partition is visible
# (apk post-install scripts run inside build/CI chroots too; on images
# built there the first-boot service does the real extraction).
-# --refresh: re-derive every mbn and ath11k-bdf dest even if it exists,
-# replacing it only with an image that verifies (a failed refresh leaves
-# the old file). For
+# --refresh: re-derive every mbn dest even if it exists, replacing it only
+# with an image that verifies (a failed refresh leaves the old file). For
# the consumer's post-install/post-upgrade: a fresh 'apk add' gets its
# trustlet without a reboot, and a trustlet that was hand-placed or pinned
# to another build is replaced by the active slot's on the next upgrade.
@@ -277,76 +257,6 @@ extract_mbn() { #
fail "no listed partition ($parts) yields $rname with sha256 $want - $dest NOT installed$kept"
}
-# One little-endian u32 as four raw bytes (busybox printf, octal escapes).
-le32() { #
- printf "\\$(printf %03o $(($1 & 255)))\\$(printf %03o $((($1 >> 8) & 255)))\\$(printf %03o $((($1 >> 16) & 255)))\\$(printf %03o $((($1 >> 24) & 255)))"
-}
-pad4() { # -> bytes of zero padding to the next multiple of 4, on stdout
- n=$(( (4 - $1 % 4) % 4 ))
- [ "$n" -gt 0 ] && head -c "$n" /dev/zero
- return 0
-}
-# .fp6-base records the sha256 of the was built from.
-bdf_base_id() { sha256sum "$1" | awk '{print $1}'; }
-bdf_current() { # - true when exists and was built from this
- [ -f "$1" ] && [ -e "$2" ] && [ -f "$2.fp6-base" ] || return 1
- read -r bh bs < "$2.fp6-base"
- [ "$bh" = "$(bdf_base_id "$1")" ]
-}
-extract_ath11k_bdf() { #
- parts=$1 bsrc=$2 bname=$3 bbase=$4 bdest=$5
- [ -f "$bbase" ] || fail "ath11k-bdf: base container $bbase missing"
- bid=$(bdf_base_id "$bbase")
- braw="$bdest.fp6-raw.$$"
- mkdir -p "${bdest%/*}" || fail "cannot create ${bdest%/*}"
- case "$bbase" in
- *.zst) zstd -dcq "$bbase" > "$braw" 2>/dev/null || { rm -f "$braw"; fail "ath11k-bdf: cannot decompress $bbase"; } ;;
- *) cp "$bbase" "$braw" || { rm -f "$braw"; fail "ath11k-bdf: cannot read $bbase"; } ;;
- esac
- [ "$(head -c 16 "$braw")" = "QCA-ATH11K-BOARD" ] || { rm -f "$braw"; fail "ath11k-bdf: $bbase is not a QCA-ATH11K-BOARD container"; }
- # the driver walks the entries 4-byte aligned; an entry appended to an
- # unaligned base would be misread and the generic data used silently
- bsz=$(fsize "$braw")
- [ $(( bsz % 4 )) -eq 0 ] || { rm -f "$braw"; fail "ath11k-bdf: $bbase is $bsz bytes, not a multiple of 4"; }
- for part in $(order_parts "$parts"); do
- mount_part "$part" || { log "$part: not mountable, trying next"; continue; }
- elf="$MNT/$bsrc"
- [ -f "$elf" ] || { log "$part: no $bsrc, trying next"; continue; }
- esz=$(fsize "$elf")
- [ "$(hex4 "$elf")" = 7f454c46 ] || { log "$part:$bsrc: not an ELF image, trying next"; continue; }
- [ "$esz" -ge 4096 ] && [ "$esz" -le $((1024 * 1024)) ] || { log "$part:$bsrc: $esz bytes is not a board data file, trying next"; continue; }
- nlen=${#bname}
- npad=$(( (nlen + 3) / 4 * 4 ))
- dpad=$(( (esz + 3) / 4 * 4 ))
- tmp="$bdest.fp6-extract.$$"
- # container = base + BOARD IE { NAME IE, DATA IE }, each IE padded to 4
- {
- cat "$braw"
- le32 0; le32 $((8 + npad + 8 + dpad))
- le32 0; le32 "$nlen"; printf '%s' "$bname"; pad4 "$nlen"
- le32 1; le32 "$esz"; cat "$elf"; pad4 "$esz"
- } > "$tmp" 2>/dev/null || { rm -f "$tmp"; fail "ath11k-bdf: writing $tmp failed"; }
- want=$(( $(fsize "$braw") + 8 + 8 + npad + 8 + dpad ))
- tsz=$(fsize "$tmp")
- [ "$tsz" -eq "$want" ] || { rm -f "$tmp" "$braw"; fail "ath11k-bdf: $tmp is $tsz bytes, expected $want"; }
- got=$(sha256sum "$tmp" | awk '{print $1}')
- if [ -e "$bdest" ] && [ "$(sha256sum "$bdest" | awk '{print $1}')" = "$got" ]; then
- rm -f "$tmp" "$braw"
- echo "$bid" > "$bdest.fp6-base" || fail "ath11k-bdf: cannot write $bdest.fp6-base"
- log "ath11k-bdf: $bdest is already $bbase + $bname from $part:$bsrc (sha256 $got) - unchanged"
- return 2
- fi
- chmod 644 "$tmp" && mv "$tmp" "$bdest" || { rm -f "$tmp" "$braw"; fail "installing $bdest failed"; }
- echo "$bid" > "$bdest.fp6-base" || fail "ath11k-bdf: cannot write $bdest.fp6-base"
- rm -f "$braw"
- log "built $bdest = $bbase + $bname from $part:$bsrc ($esz bytes, sha256 $got)"
- return 0
- done
- rm -f "$braw"
- kept=
- [ -e "$bdest" ] && kept=" (the existing file is left in place)"
- fail "no listed partition ($parts) yields a well-formed $bsrc - $bdest NOT installed$kept"
-}
extract() { #
parts=$1 src=$2 dest=$3 want=$4
for part in $(order_parts "$parts"); do
@@ -402,8 +312,7 @@ fi
[ -d "$MANIFEST_DIR" ] || exit 0
-# fast path for every boot after the first: every file/mbn dest present and
-# every ath11k-bdf dest current against its base (bdf_current)
+# fast path for every boot after the first: all dests already present
missing=
for f in "$MANIFEST_DIR"/*.manifest; do
[ -e "$f" ] || continue
@@ -411,7 +320,6 @@ for f in "$MANIFEST_DIR"/*.manifest; do
case "$kind" in
file) [ -e "$c" ] || missing=1 ;;
mbn) [ -e "$d" ] && [ -z "$REFRESH" ] || missing=1 ;;
- ath11k-bdf) [ -z "$REFRESH" ] && bdf_current "$d" "$e" || missing=1 ;;
esac
done < "$f"
done
@@ -437,12 +345,6 @@ for f in "$MANIFEST_DIR"/*.manifest; do
extract_mbn "$a" "$b" "$c" "$d" "$e"
+Date: Wed, 17 Jun 2026 00:38:17 +0200
+Subject: [PATCH] resolve_btfids: preserve tag and parameter names when
+ processing implicit args
+
+process_kfunc_with_implicit_args() obtains parameter names through
+btf__name_by_offset() and passes them to btf__add_func_param() while
+constructing a new function prototype. Tag names are processed in a
+similar fashion.
+
+The returned name pointer references memory owned by the BTF object.
+btf__add_func_param(), btf__add_decl_tag(), etc. modify the same BTF and
+may grow its internal storage, invalidating previously returned string
+pointers.
+
+This can result in btf__add_func_param(), btf__add_decl_tag(), etc.
+dereferencing a stale pointer when copying the string, leading to crashes
+in strset__add_str().
+
+Duplicate the parameter name before calling btf__add_func_param() so it
+remains valid across BTF updates.
+
+Fixes: 9d199965990c ("resolve_btfids: Support for KF_IMPLICIT_ARGS")
+Cc: stable@vger.kernel.org
+Signed-off-by: Aelin Reidel
+---
+ tools/bpf/resolve_btfids/main.c | 20 +++++++++++++++-----
+ 1 file changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/tools/bpf/resolve_btfids/main.c b/tools/bpf/resolve_btfids/main.c
+index f8a91fa7584f..94b89e9c942e 100644
+--- a/tools/bpf/resolve_btfids/main.c
++++ b/tools/bpf/resolve_btfids/main.c
+@@ -1113,6 +1113,7 @@ static int process_kfunc_with_implicit_args(struct btf2btf_context *ctx, struct
+ {
+ s32 idx, new_proto_id, new_func_id, proto_id;
+ const char *param_name, *tag_name;
++ char *tmp_param_name, *tmp_tag_name;
+ const struct btf_param *params;
+ enum btf_func_linkage linkage;
+ char tmp_name[KSYM_NAME_LEN];
+@@ -1163,18 +1164,22 @@ static int process_kfunc_with_implicit_args(struct btf2btf_context *ctx, struct
+ if (strcmp(tag_name, "bpf_kfunc") == 0)
+ continue;
+
++ tmp_tag_name = strdup(tag_name);
+ idx = btf_decl_tag(t)->component_idx;
+
+ if (btf_kflag(t))
+- err = btf__add_decl_attr(btf, tag_name, new_func_id, idx);
++ err = btf__add_decl_attr(btf, tmp_tag_name, new_func_id, idx);
+ else
+- err = btf__add_decl_tag(btf, tag_name, new_func_id, idx);
++ err = btf__add_decl_tag(btf, tmp_tag_name, new_func_id, idx);
+
+ if (err < 0) {
+ pr_err("ERROR: resolve_btfids: failed to add decl tag %s for %s\n",
+- tag_name, tmp_name);
++ tmp_tag_name, tmp_name);
++ free(tmp_tag_name);
+ return -EINVAL;
+ }
++
++ free(tmp_tag_name);
+ }
+
+ add_new_proto:
+@@ -1193,12 +1198,17 @@ static int process_kfunc_with_implicit_args(struct btf2btf_context *ctx, struct
+ if (is_kf_implicit_arg(btf, ¶ms[i]))
+ break;
+ param_name = btf__name_by_offset(btf, params[i].name_off);
+- err = btf__add_func_param(btf, param_name, params[i].type);
++ tmp_param_name = strdup(param_name);
++ if (!tmp_param_name)
++ return -ENOMEM;
++ err = btf__add_func_param(btf, tmp_param_name, params[i].type);
+ if (err < 0) {
+ pr_err("ERROR: resolve_btfids: failed to add param %s for %s\n",
+- param_name, kfunc->name);
++ tmp_param_name, kfunc->name);
++ free(tmp_param_name);
+ return err;
+ }
++ free(tmp_param_name);
+ t = (struct btf_type *)btf__type_by_id(btf, proto_id);
+ }
+
+--
+2.54.0
+
diff --git a/aports/device/linux-postmarketos-qcom-milos/APKBUILD b/aports/device/linux-postmarketos-qcom-milos/APKBUILD
index acfadb1..6e3c06f 100644
--- a/aports/device/linux-postmarketos-qcom-milos/APKBUILD
+++ b/aports/device/linux-postmarketos-qcom-milos/APKBUILD
@@ -1,15 +1,12 @@
-# Fork of pmaports device/testing/linux-postmarketos-qcom-milos (7.2.0-r0; pmaports
-# still ships 7.2.0), overlaid via pmbootstrap so it shadows the upstream aport.
-# Differences: source is the Catcrafts combined-stable branch (upstream
-# v7.3.0-milos tag + the FP6 bring-up carries); the config is the exact one
-# the development FP6 runs, plus CONFIG_EFI_ZBOOT for the packaging below;
-# build() targets the FP6's own cores (KCFLAGS); and the package depends on
-# soc-fairphone-fp6-audio >= 5, which carries the topology and UCM for the
-# card name the 7.3 DTS uses.
+# Fork of pmaports device/testing/linux-postmarketos-qcom-milos (7.2.0-r0),
+# overlaid via pmbootstrap so it shadows the upstream aport. Differences:
+# source is the Catcrafts combined-stable branch (upstream v7.2.0-milos tag +
+# the FP6 bring-up carries), and the config is the exact one the development
+# FP6 runs, plus CONFIG_EFI_ZBOOT for the packaging below.
maintainer="Jorijn van der Graaf "
_flavor="postmarketos-qcom-milos"
pkgname=linux-$_flavor
-pkgver=7.3.0
+pkgver=7.2.0
# always sorts above the upstream aport (r0..r99)
pkgrel=103
pkgdesc="Milos mainline kernel + Catcrafts FP6 bring-up carries (combined-stable)"
@@ -17,13 +14,6 @@ arch="aarch64"
_carch="arm64"
url="https://forgejo.catcrafts.net/Catcrafts/milos-linux"
license="GPL-2.0-only"
-# The 7.3 DTS names the sound card MILOS-Fairphone-Gen6; only
-# soc-fairphone-fp6-audio >= 5 installs the topology and UCM under that
-# name. Without this bound a kernel-only upgrade boots with no sound card at
-# all: the topology load fails and the card does not instantiate.
-# A pkgver floor, not a pkgrel one: pmbootstrap resolves a versioned
-# dependency on an aport against its pkgver alone.
-depends="soc-fairphone-fp6-audio>=5"
options="!strip !check !tracedeps
pmb:cross-native
pmb:kconfigcheck-community
@@ -55,6 +45,7 @@ _commit="REPLACED_BY_CI"
source="
milos-linux-$_commit.tar.gz
+ 0001-resolve_btfids-preserve-tag-and-parameter-names-when.patch
$_config
"
builddir="$srcdir/milos-linux"
@@ -101,5 +92,6 @@ package() {
sha512sums="
REPLACED_BY_CI milos-linux-REPLACED_BY_CI.tar.gz
+4e705e038a91466a86fc5317b0028c2220aa1e7a4807e5d86db2f9ac815a927c59666a8f21ed50c4632147d3ce183d8042378a76f95341dbcd3db1047faf39e3 0001-resolve_btfids-preserve-tag-and-parameter-names-when.patch
REPLACED_BY_CI config-postmarketos-qcom-milos.aarch64
"
diff --git a/aports/device/linux-postmarketos-qcom-milos/config-postmarketos-qcom-milos.aarch64 b/aports/device/linux-postmarketos-qcom-milos/config-postmarketos-qcom-milos.aarch64
index f331623..4ae9b46 100644
--- a/aports/device/linux-postmarketos-qcom-milos/config-postmarketos-qcom-milos.aarch64
+++ b/aports/device/linux-postmarketos-qcom-milos/config-postmarketos-qcom-milos.aarch64
@@ -1,16 +1,16 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 7.3.0 Kernel Configuration
+# Linux/arm64 7.2.0 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="clang version 23.1.3"
+CONFIG_CC_VERSION_TEXT="clang version 22.1.8"
CONFIG_GCC_VERSION=0
CONFIG_CC_IS_CLANG=y
-CONFIG_CLANG_VERSION=230103
+CONFIG_CLANG_VERSION=220108
CONFIG_AS_IS_LLVM=y
-CONFIG_AS_VERSION=230103
+CONFIG_AS_VERSION=220108
CONFIG_LD_VERSION=0
CONFIG_LD_IS_LLD=y
-CONFIG_LLD_VERSION=230103
+CONFIG_LLD_VERSION=220108
CONFIG_RUSTC_VERSION=0
CONFIG_RUSTC_LLVM_VERSION=0
CONFIG_RUSTC_LLVM_MAJOR_VERSION=0
@@ -25,9 +25,8 @@ CONFIG_CC_HAS_COUNTED_BY=y
CONFIG_CC_HAS_COUNTED_BY_PTR=y
CONFIG_CC_HAS_ALLOC_TOKEN=y
CONFIG_CC_HAS_MULTIDIMENSIONAL_NONSTRING=y
-CONFIG_CC_OPT_INLINE_MEMSET="-mllvm -max-store-memset=4294967294"
CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
-CONFIG_PAHOLE_VERSION=132
+CONFIG_PAHOLE_VERSION=131
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
@@ -120,7 +119,6 @@ CONFIG_ARCH_HAS_PREEMPT_LAZY=y
CONFIG_PREEMPT=y
# CONFIG_PREEMPT_LAZY is not set
CONFIG_PREEMPT_COUNT=y
-CONFIG_HAS_SEPARATE_PREEMPT_RESCHED_BITS=y
CONFIG_PREEMPTION=y
# CONFIG_PREEMPT_DYNAMIC is not set
# CONFIG_SCHED_CORE is not set
@@ -173,12 +171,11 @@ CONFIG_UCLAMP_TASK=y
CONFIG_UCLAMP_BUCKETS_COUNT=5
# end of Scheduler features
-CONFIG_ARCH_HAS_PTE_PROTNONE=y
CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
CONFIG_CC_HAS_INT128=y
CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough"
-CONFIG_CC_MS_EXTENSIONS="-fms-anonymous-structs"
+CONFIG_CC_MS_EXTENSIONS="-fms-extensions"
CONFIG_GCC10_NO_ARRAY_BOUNDS=y
CONFIG_GCC_NO_STRINGOP_OVERFLOW=y
CONFIG_ARCH_SUPPORTS_INT128=y
@@ -242,6 +239,7 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_LD_ORPHAN_WARN=y
CONFIG_LD_ORPHAN_WARN_LEVEL="warn"
+CONFIG_SYSCTL=y
CONFIG_HAVE_UID16=y
CONFIG_SYSCTL_EXCEPTION_TRACE=y
CONFIG_SYSFS_SYSCALL=y
@@ -409,7 +407,7 @@ CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
CONFIG_ARM64_ERRATUM_1165522=y
CONFIG_ARM64_ERRATUM_1319367=y
CONFIG_ARM64_ERRATUM_1530923=y
-CONFIG_ARM64_WORKAROUND_REPEAT_TLBI_SYNC=y
+CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
CONFIG_ARM64_ERRATUM_2441007=y
CONFIG_ARM64_ERRATUM_1286807=y
CONFIG_ARM64_ERRATUM_1463225=y
@@ -422,10 +420,8 @@ CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y
CONFIG_ARM64_ERRATUM_2054223=y
CONFIG_ARM64_ERRATUM_2067961=y
CONFIG_ARM64_ERRATUM_2441009=y
-CONFIG_ARM64_WORKAROUND_BROKEN_AMU_CONSTCNT=y
CONFIG_ARM64_ERRATUM_2457168=y
CONFIG_ARM64_ERRATUM_2645198=y
-CONFIG_ARM64_ERRATUM_3821522=y
CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y
CONFIG_ARM64_ERRATUM_2966298=y
CONFIG_ARM64_ERRATUM_3117295=y
@@ -449,8 +445,6 @@ CONFIG_QCOM_QDF2400_ERRATUM_0065=y
CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
CONFIG_ARM64_WORKAROUND_DISABLE_CNP=y
CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
-CONFIG_NVIDIA_OLYMPUS_1027_ERRATUM=y
-CONFIG_RENESAS_ERRATUM_GEN4GICITS1=y
CONFIG_ROCKCHIP_ERRATUM_3568002=y
CONFIG_ROCKCHIP_ERRATUM_3588001=y
# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
@@ -542,6 +536,7 @@ CONFIG_ARM64_TLB_RANGE=y
#
CONFIG_AS_HAS_ARMV8_5=y
CONFIG_ARM64_BTI=y
+CONFIG_ARM64_BTI_KERNEL=y
CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARM64_AS_HAS_MTE=y
@@ -919,7 +914,6 @@ CONFIG_RWSEM_SPIN_ON_OWNER=y
CONFIG_LOCK_SPIN_ON_OWNER=y
CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
CONFIG_QUEUED_SPINLOCKS=y
-# CONFIG_QUEUED_SPINLOCKS_TRACE_CONTENDED_RELEASE is not set
CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
CONFIG_QUEUED_RWLOCKS=y
CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y
@@ -995,7 +989,7 @@ CONFIG_PAGE_REPORTING=y
CONFIG_NUMA_MIGRATION=y
CONFIG_MIGRATION=y
CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
-CONFIG_ARCH_HAS_PMD_SOFTLEAVES=y
+CONFIG_ARCH_ENABLE_THP_MIGRATION=y
CONFIG_CONTIG_ALLOC=y
CONFIG_PCP_BATCH_SCALE_MAX=5
CONFIG_PHYS_ADDR_T_64BIT=y
@@ -1062,7 +1056,6 @@ CONFIG_LOCK_MM_AND_FIND_VMA=y
CONFIG_EXECMEM=y
CONFIG_NUMA_MEMBLKS=y
# CONFIG_NUMA_EMU is not set
-CONFIG_GENERIC_ARCH_NUMA=y
CONFIG_ARCH_HAS_USER_SHADOW_STACK=y
CONFIG_PT_RECLAIM=y
CONFIG_ARCH_HAS_LAZY_MMU_MODE=y
@@ -1730,7 +1723,9 @@ CONFIG_REGMAP_MMIO=y
CONFIG_REGMAP_IRQ=y
CONFIG_REGMAP_SOUNDWIRE=m
CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
CONFIG_GENERIC_ARCH_TOPOLOGY=y
+CONFIG_GENERIC_ARCH_NUMA=y
# CONFIG_FW_DEVLINK_SYNC_STATE_TIMEOUT is not set
# end of Generic Driver Options
@@ -1819,8 +1814,6 @@ CONFIG_ARM_PSCI_FW=y
#
# Qualcomm firmware drivers
#
-CONFIG_QCOM_PAS=y
-CONFIG_QCOM_PAS_TEE=m
CONFIG_QCOM_SCM=y
CONFIG_QCOM_TZMEM=y
CONFIG_QCOM_TZMEM_MODE_GENERIC=y
@@ -1918,6 +1911,7 @@ CONFIG_QCOM_FASTRPC=m
# CONFIG_LATTICE_ECP3_CONFIG is not set
CONFIG_SRAM=y
# CONFIG_XILINX_SDFEC is not set
+# CONFIG_HISI_HIKEY_USB is not set
# CONFIG_OPEN_DICE is not set
CONFIG_NTSYNC=m
# CONFIG_VCPU_STALL_DETECTOR is not set
@@ -1927,9 +1921,14 @@ CONFIG_NTSYNC=m
#
# EEPROM support
#
+CONFIG_EEPROM_AT24=m
+# CONFIG_EEPROM_AT25 is not set
# CONFIG_EEPROM_MAX6875 is not set
# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_EEPROM_93XX46 is not set
# CONFIG_EEPROM_IDT_89HPESX is not set
+# CONFIG_EEPROM_EE1004 is not set
+# CONFIG_EEPROM_M24LR is not set
# end of EEPROM support
# CONFIG_SENSORS_LIS3_SPI is not set
@@ -1939,8 +1938,6 @@ CONFIG_NTSYNC=m
# CONFIG_UACCE is not set
# CONFIG_PVPANIC is not set
# CONFIG_AMD_SBRMI_I2C is not set
-# CONFIG_AMD_SBTSI is not set
-# CONFIG_INTEL_SSEI is not set
# end of Misc devices
#
@@ -2093,7 +2090,6 @@ CONFIG_NET_VENDOR_I825XX=y
CONFIG_NET_VENDOR_INTEL=y
CONFIG_NET_VENDOR_ADI=y
# CONFIG_ADIN1110 is not set
-# CONFIG_ADIN1140 is not set
CONFIG_NET_VENDOR_LITEX=y
# CONFIG_LITEX_LITEETH is not set
CONFIG_NET_VENDOR_MARVELL=y
@@ -2153,7 +2149,6 @@ CONFIG_NET_VENDOR_WIZNET=y
CONFIG_NET_VENDOR_XILINX=y
# CONFIG_XILINX_EMACLITE is not set
# CONFIG_XILINX_LL_TEMAC is not set
-CONFIG_NET_VENDOR_ZTE=y
CONFIG_QCOM_IPA=m
CONFIG_PHYLINK=m
CONFIG_PHYLIB=y
@@ -2172,7 +2167,6 @@ CONFIG_FIXED_PHY=y
# CONFIG_AMD_PHY is not set
# CONFIG_ADIN_PHY is not set
# CONFIG_ADIN1100_PHY is not set
-# CONFIG_ADIN1140_PHY is not set
# CONFIG_AQUANTIA_PHY is not set
CONFIG_AX88796B_PHY=m
# CONFIG_BROADCOM_PHY is not set
@@ -2182,7 +2176,6 @@ CONFIG_AX88796B_PHY=m
# CONFIG_BCM87XX_PHY is not set
# CONFIG_CICADA_PHY is not set
# CONFIG_CORTINA_PHY is not set
-# CONFIG_DAP8211R_PHY is not set
# CONFIG_DAVICOM_PHY is not set
# CONFIG_ICPLUS_PHY is not set
# CONFIG_LXT_PHY is not set
@@ -2227,10 +2220,6 @@ CONFIG_AX88796B_PHY=m
# CONFIG_VITESSE_PHY is not set
# CONFIG_XILINX_GMII2RGMII is not set
# CONFIG_PSE_CONTROLLER is not set
-
-#
-# MDIO controller drivers
-#
CONFIG_FWNODE_MDIO=y
CONFIG_OF_MDIO=y
# CONFIG_MDIO_BITBANG is not set
@@ -2248,8 +2237,6 @@ CONFIG_OF_MDIO=y
# CONFIG_MDIO_BUS_MUX_GPIO is not set
# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-# end of MDIO Multiplexers
-# end of MDIO controller drivers
#
# PCS device drivers
@@ -2346,11 +2333,6 @@ CONFIG_WLAN_VENDOR_MEDIATEK=y
CONFIG_WLAN_VENDOR_MICROCHIP=y
# CONFIG_WILC1000_SDIO is not set
# CONFIG_WILC1000_SPI is not set
-CONFIG_WLAN_VENDOR_MORSEMICRO=y
-# CONFIG_MM81X_USB is not set
-# CONFIG_MM81X_SDIO is not set
-CONFIG_WLAN_VENDOR_NXP=y
-# CONFIG_NXPWIFI_SDIO is not set
CONFIG_WLAN_VENDOR_PURELIFI=y
# CONFIG_PLFXLC is not set
CONFIG_WLAN_VENDOR_RALINK=y
@@ -2502,7 +2484,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_EETI is not set
# CONFIG_TOUCHSCREEN_EGALAX is not set
# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
-CONFIG_TOUCHSCREEN_ESWIN_EPH8621=y
# CONFIG_TOUCHSCREEN_EXC3000 is not set
# CONFIG_TOUCHSCREEN_FUJITSU is not set
# CONFIG_TOUCHSCREEN_GOODIX is not set
@@ -2588,7 +2569,6 @@ CONFIG_INPUT_UINPUT=y
# CONFIG_INPUT_IQS269A is not set
# CONFIG_INPUT_IQS626A is not set
# CONFIG_INPUT_IQS7222 is not set
-# CONFIG_INPUT_ISA1200_HAPTIC is not set
# CONFIG_INPUT_CMA3000 is not set
# CONFIG_INPUT_DRV260X_HAPTICS is not set
# CONFIG_INPUT_DRV2665_HAPTICS is not set
@@ -2713,7 +2693,6 @@ CONFIG_HW_RANDOM_OPTEE=y
# CONFIG_HW_RANDOM_CCTRNG is not set
# CONFIG_HW_RANDOM_XIPHERA is not set
CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
-CONFIG_HW_RANDOM_QCOM=y
# CONFIG_DEVMEM is not set
CONFIG_DEVPORT=y
# CONFIG_TCG_TPM is not set
@@ -2887,7 +2866,6 @@ CONFIG_GENERIC_PINCONF=y
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_PINCTRL_AW9523 is not set
# CONFIG_PINCTRL_CY8C95X0 is not set
-# CONFIG_PINCTRL_GENERIC_MUX is not set
# CONFIG_PINCTRL_MCP23S08 is not set
# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
# CONFIG_PINCTRL_OCELOT is not set
@@ -2908,7 +2886,6 @@ CONFIG_PINCTRL_MSM=y
# CONFIG_PINCTRL_IPQ9574 is not set
# CONFIG_PINCTRL_IPQ9650 is not set
# CONFIG_PINCTRL_KAANAPALI is not set
-CONFIG_PINCTRL_MAILI=y
# CONFIG_PINCTRL_MDM9607 is not set
# CONFIG_PINCTRL_MSM8916 is not set
# CONFIG_PINCTRL_MSM8917 is not set
@@ -3125,9 +3102,7 @@ CONFIG_BATTERY_QCOM_BATTMGR=y
# CONFIG_CHARGER_BQ2515X is not set
# CONFIG_CHARGER_BQ25890 is not set
# CONFIG_CHARGER_BQ25980 is not set
-# CONFIG_CHARGER_BQ25630 is not set
# CONFIG_CHARGER_BQ256XX is not set
-# CONFIG_CHARGER_SGM41542 is not set
# CONFIG_CHARGER_SMB347 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
# CONFIG_BATTERY_GOLDFISH is not set
@@ -3170,7 +3145,6 @@ CONFIG_HWMON=y
# CONFIG_SENSORS_ASC7621 is not set
# CONFIG_SENSORS_ASUS_ROG_RYUJIN is not set
# CONFIG_SENSORS_AXI_FAN_CONTROL is not set
-# CONFIG_SENSORS_KB9002 is not set
# CONFIG_SENSORS_ARCTIC_FAN_CONTROLLER is not set
# CONFIG_SENSORS_ARM_SCMI is not set
# CONFIG_SENSORS_ATXP1 is not set
@@ -3269,6 +3243,7 @@ CONFIG_HWMON=y
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_PMBUS is not set
# CONFIG_SENSORS_PT5161L is not set
+# CONFIG_SENSORS_SBTSI is not set
# CONFIG_SENSORS_SHT15 is not set
# CONFIG_SENSORS_SHT21 is not set
# CONFIG_SENSORS_SHT3x is not set
@@ -3868,8 +3843,6 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
# CONFIG_VIDEO_IMX355 is not set
# CONFIG_VIDEO_IMX412 is not set
# CONFIG_VIDEO_IMX415 is not set
-# CONFIG_VIDEO_IMX471 is not set
-# CONFIG_VIDEO_IMX678 is not set
CONFIG_VIDEO_IMX896=m
# CONFIG_VIDEO_MT9M001 is not set
# CONFIG_VIDEO_MT9M111 is not set
@@ -4428,7 +4401,6 @@ CONFIG_DRM_PANEL=y
# Display Panels
#
# CONFIG_DRM_PANEL_ABT_Y030XX067A is not set
-# CONFIG_DRM_PANEL_ANBERNIC_TD4310 is not set
# CONFIG_DRM_PANEL_ARM_VERSATILE is not set
# CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
# CONFIG_DRM_PANEL_AUO_A030JTN01 is not set
@@ -4438,7 +4410,6 @@ CONFIG_DRM_PANEL=y
# CONFIG_DRM_PANEL_BOE_TH101MB31UIG002_28A is not set
# CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set
# CONFIG_DRM_PANEL_BOE_TV101WUM_LL2 is not set
-# CONFIG_DRM_PANEL_CHIPONE_ICNA35XX is not set
# CONFIG_DRM_PANEL_CHIPWEALTH_CH13726A is not set
# CONFIG_DRM_PANEL_EBBG_FT8719 is not set
# CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set
@@ -4454,10 +4425,8 @@ CONFIG_DRM_PANEL=y
# CONFIG_DRM_PANEL_HIMAX_HX83121A is not set
# CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
# CONFIG_DRM_PANEL_HYDIS_HV101HD1 is not set
-# CONFIG_DRM_PANEL_ILITEK_ILI7807S is not set
# CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
-# CONFIG_DRM_PANEL_ILITEK_ILI9488 is not set
# CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set
# CONFIG_DRM_PANEL_ILITEK_ILI9806E_DSI is not set
# CONFIG_DRM_PANEL_ILITEK_ILI9806E_SPI is not set
@@ -4490,7 +4459,6 @@ CONFIG_DRM_PANEL=y
# CONFIG_DRM_PANEL_NOVATEK_NT35560 is not set
# CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set
# CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set
-# CONFIG_DRM_PANEL_NOVATEK_NT36536 is not set
# CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
# CONFIG_DRM_PANEL_NOVATEK_NT36672E is not set
# CONFIG_DRM_PANEL_NOVATEK_NT37700F is not set
@@ -4509,7 +4477,6 @@ CONFIG_DRM_PANEL_NOVATEK_NT37705=m
# CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
# CONFIG_DRM_PANEL_RAYDIUM_RM69380 is not set
# CONFIG_DRM_PANEL_RENESAS_R61307 is not set
-# CONFIG_DRM_PANEL_RENESAS_R63419 is not set
# CONFIG_DRM_PANEL_RENESAS_R69328 is not set
# CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
# CONFIG_DRM_PANEL_SAMSUNG_AMS581VF01 is not set
@@ -4648,7 +4615,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_KTD253 is not set
# CONFIG_BACKLIGHT_KTD2801 is not set
# CONFIG_BACKLIGHT_KTZ8866 is not set
-# CONFIG_BACKLIGHT_SY7758 is not set
# CONFIG_BACKLIGHT_MAX25014 is not set
CONFIG_BACKLIGHT_QCOM_WLED=y
# CONFIG_BACKLIGHT_ADP8860 is not set
@@ -4936,8 +4902,6 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_ADAU1701 is not set
# CONFIG_SND_SOC_ADAU1761_I2C is not set
# CONFIG_SND_SOC_ADAU1761_SPI is not set
-# CONFIG_SND_SOC_ADAU1977_SPI is not set
-# CONFIG_SND_SOC_ADAU1977_I2C is not set
# CONFIG_SND_SOC_ADAU7002 is not set
# CONFIG_SND_SOC_ADAU7118_HW is not set
# CONFIG_SND_SOC_ADAU7118_I2C is not set
@@ -5061,7 +5025,6 @@ CONFIG_SND_SOC_HDMI_CODEC=y
# CONFIG_SND_SOC_RT5640 is not set
# CONFIG_SND_SOC_RT5645 is not set
# CONFIG_SND_SOC_RT5659 is not set
-# CONFIG_SND_SOC_RT5677 is not set
# CONFIG_SND_SOC_RT5682_SDW is not set
# CONFIG_SND_SOC_RT700_SDW is not set
# CONFIG_SND_SOC_RT711_SDW is not set
@@ -5161,7 +5124,6 @@ CONFIG_SND_SOC_WCD9378_SDW=m
# CONFIG_SND_SOC_WSA881X is not set
# CONFIG_SND_SOC_WSA883X is not set
# CONFIG_SND_SOC_WSA884X is not set
-# CONFIG_SND_SOC_WSA885X is not set
# CONFIG_SND_SOC_ZL38060 is not set
# CONFIG_SND_SOC_MAX9759 is not set
# CONFIG_SND_SOC_MT6351 is not set
@@ -5241,13 +5203,11 @@ CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
CONFIG_HID_HOLTEK=m
CONFIG_HOLTEK_FF=y
-# CONFIG_HID_HYPERX is not set
CONFIG_HID_VIVALDI_COMMON=m
CONFIG_HID_GOODIX_SPI=m
CONFIG_HID_GOOGLE_STADIA_FF=m
CONFIG_HID_VIVALDI=m
CONFIG_HID_GT683R=m
-# CONFIG_HID_MSI is not set
CONFIG_HID_KEYTOUCH=m
CONFIG_HID_KYE=m
# CONFIG_HID_KYSONA is not set
@@ -5353,7 +5313,6 @@ CONFIG_HID_MCP2221=m
#
# HID-BPF support
#
-# CONFIG_HID_BPF is not set
# end of HID-BPF support
CONFIG_I2C_HID=y
@@ -5773,7 +5732,6 @@ CONFIG_LEDS_CLASS_MULTICOLOR=m
# CONFIG_LEDS_SPI_BYTE is not set
# CONFIG_LEDS_LM3697 is not set
# CONFIG_LEDS_ST1202 is not set
-# CONFIG_LEDS_LTC3220 is not set
#
# Flash and Torch LED drivers
@@ -6073,21 +6031,13 @@ CONFIG_COMMON_CLK=y
# CONFIG_COMMON_CLK_VC5 is not set
# CONFIG_COMMON_CLK_VC7 is not set
# CONFIG_COMMON_CLK_FIXED_MMIO is not set
-
-#
-# Cixtech Audio Subsystem Clock Driver
-#
-# end of Cixtech Audio Subsystem Clock Driver
-
CONFIG_QCOM_GDSC=y
CONFIG_COMMON_CLK_QCOM=y
# CONFIG_CLK_ELIZA_DISPCC is not set
# CONFIG_CLK_ELIZA_GCC is not set
# CONFIG_CLK_ELIZA_TCSRCC is not set
-CONFIG_CLK_GLYMUR_CAMCC=m
# CONFIG_CLK_GLYMUR_DISPCC is not set
-CONFIG_CLK_GLYMUR_EVACC=m
-CONFIG_CLK_GLYMUR_GCC=m
+# CONFIG_CLK_GLYMUR_GCC is not set
# CONFIG_CLK_GLYMUR_GPUCC is not set
# CONFIG_CLK_GLYMUR_TCSRCC is not set
# CONFIG_CLK_GLYMUR_VIDEOCC is not set
@@ -6097,12 +6047,7 @@ CONFIG_CLK_GLYMUR_GCC=m
# CONFIG_CLK_KAANAPALI_GPUCC is not set
# CONFIG_CLK_KAANAPALI_TCSRCC is not set
# CONFIG_CLK_KAANAPALI_VIDEOCC is not set
-CONFIG_CLK_NORD_DISPCC=m
-CONFIG_CLK_MAILI_VIDEOCC=m
-CONFIG_CLK_NORD_GCC=m
-CONFIG_CLK_SHIKRA_AUDIOCORECC=m
-CONFIG_CLK_SHIKRA_GCC=y
-CONFIG_CLK_NORD_GPUCC=m
+# CONFIG_CLK_NORD_GCC is not set
# CONFIG_CLK_X1E80100_CAMCC is not set
# CONFIG_CLK_X1E80100_DISPCC is not set
# CONFIG_CLK_X1E80100_GCC is not set
@@ -6113,14 +6058,15 @@ CONFIG_CLK_NORD_GPUCC=m
# CONFIG_CLK_X1P42100_VIDEOCC is not set
# CONFIG_CLK_QCM2290_GPUCC is not set
# CONFIG_QCOM_A53PLL is not set
+# CONFIG_QCOM_A7PLL is not set
# CONFIG_QCOM_CLK_APCC_MSM8996 is not set
CONFIG_QCOM_CLK_RPMH=y
-CONFIG_CLK_HAWI_GCC=m
+# CONFIG_CLK_HAWI_GCC is not set
# CONFIG_CLK_HAWI_TCSRCC is not set
-CONFIG_CLK_HAWI_VIDEOCC=m
# CONFIG_IPQ_APSS_PLL is not set
# CONFIG_IPQ_APSS_5424 is not set
# CONFIG_IPQ_CMN_PLL is not set
+# CONFIG_IPQ_GCC_4019 is not set
# CONFIG_IPQ_GCC_5018 is not set
# CONFIG_IPQ_GCC_5210 is not set
# CONFIG_IPQ_GCC_5332 is not set
@@ -6315,7 +6261,6 @@ CONFIG_QCOM_IOMMU=y
#
CONFIG_REMOTEPROC=y
# CONFIG_REMOTEPROC_CDEV is not set
-# CONFIG_AMD_MBV_BRAM_REMOTEPROC is not set
CONFIG_QCOM_PIL_INFO=m
CONFIG_QCOM_RPROC_COMMON=m
CONFIG_QCOM_Q6V5_COMMON=m
@@ -6386,15 +6331,23 @@ CONFIG_SOUNDWIRE_QCOM=y
# end of Enable LiteX SoC Builder specific drivers
# CONFIG_WPCM450_SOC is not set
-CONFIG_QCOM_SOC=y
+
+#
+# Qualcomm SoC drivers
+#
CONFIG_QCOM_AOSS_QMP=y
CONFIG_QCOM_COMMAND_DB=y
CONFIG_QCOM_GENI_SE=y
+# CONFIG_QCOM_GSBI is not set
CONFIG_QCOM_LLCC=y
+CONFIG_QCOM_MDT_LOADER=y
# CONFIG_QCOM_OCMEM is not set
CONFIG_QCOM_PD_MAPPER=y
+CONFIG_QCOM_PDR_HELPERS=y
+CONFIG_QCOM_PDR_MSG=y
# CONFIG_QCOM_PMIC_PDCHARGER_ULOG is not set
CONFIG_QCOM_PMIC_GLINK=y
+CONFIG_QCOM_QMI_HELPERS=y
# CONFIG_QCOM_RAMP_CTRL is not set
CONFIG_QCOM_RMTFS_MEM=y
# CONFIG_QCOM_RPM_MASTER_STATS is not set
@@ -6410,12 +6363,10 @@ CONFIG_QCOM_STATS=y
# CONFIG_QCOM_WCNSS_CTRL is not set
CONFIG_QCOM_APR=y
CONFIG_QCOM_ICC_BWMON=y
-# CONFIG_QCOM_PBS is not set
CONFIG_QCOM_INLINE_CRYPTO_ENGINE=y
-CONFIG_QCOM_MDT_LOADER=y
-CONFIG_QCOM_PDR_HELPERS=y
-CONFIG_QCOM_PDR_MSG=y
-CONFIG_QCOM_QMI_HELPERS=y
+# CONFIG_QCOM_PBS is not set
+# end of Qualcomm SoC drivers
+
CONFIG_QCOM_UBWC_CONFIG=y
# CONFIG_SOC_TI is not set
@@ -6642,7 +6593,6 @@ CONFIG_QCOM_SPMI_ADC5=y
# CONFIG_TI_ADS1018 is not set
# CONFIG_TI_ADS1100 is not set
# CONFIG_TI_ADS1119 is not set
-# CONFIG_TI_ADS112C14 is not set
# CONFIG_TI_ADS124S08 is not set
# CONFIG_TI_ADS1298 is not set
# CONFIG_TI_ADS131E08 is not set
@@ -6655,7 +6605,6 @@ CONFIG_QCOM_SPMI_ADC5=y
# CONFIG_TI_LMP92064 is not set
# CONFIG_TI_TLC4541 is not set
# CONFIG_TI_TSC2046 is not set
-# CONFIG_VERSAL_SYSMON_I2C is not set
# CONFIG_VF610_ADC is not set
# CONFIG_XILINX_XADC is not set
# end of Analog to digital converters
@@ -6779,7 +6728,6 @@ CONFIG_IIO_INV_SENSORS_TIMESTAMP=m
# CONFIG_MAX5821 is not set
# CONFIG_MCP4725 is not set
# CONFIG_MCP4728 is not set
-# CONFIG_MCP47A1 is not set
# CONFIG_MCP47FEB02 is not set
# CONFIG_MCP4821 is not set
# CONFIG_MCP4922 is not set
@@ -6801,12 +6749,6 @@ CONFIG_IIO_INV_SENSORS_TIMESTAMP=m
# CONFIG_ADMV8818 is not set
# end of Filters
-#
-# Flow sensors
-#
-# CONFIG_SENSIRION_SLF3S is not set
-# end of Flow sensors
-
#
# Frequency Synthesizers DDS/PLL
#
@@ -6820,7 +6762,6 @@ CONFIG_IIO_INV_SENSORS_TIMESTAMP=m
#
# Phase-Locked Loop (PLL) frequency synthesizers
#
-# CONFIG_ADF41513 is not set
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
# CONFIG_ADF4377 is not set
@@ -6901,8 +6842,6 @@ CONFIG_HID_SENSOR_HUMIDITY=m
CONFIG_INV_ICM42600=m
# CONFIG_INV_ICM42600_I2C is not set
CONFIG_INV_ICM42600_SPI=m
-# CONFIG_INV_ICM42607_I2C is not set
-# CONFIG_INV_ICM42607_SPI is not set
# CONFIG_INV_ICM45600_I2C is not set
# CONFIG_INV_ICM45600_SPI is not set
# CONFIG_INV_MPU6050_I2C is not set
@@ -7000,7 +6939,6 @@ CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
# CONFIG_MMC5983 is not set
# CONFIG_IIO_ST_MAGN_3AXIS is not set
# CONFIG_INFINEON_TLV493D is not set
-# CONFIG_QMC5883L is not set
CONFIG_QMC6308=m
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843_SPI is not set
@@ -7268,11 +7206,6 @@ CONFIG_NVMEM_LAYOUTS=y
# CONFIG_NVMEM_LAYOUT_U_BOOT_ENV is not set
# end of Layout Types
-CONFIG_EEPROM_AT24=m
-# CONFIG_EEPROM_AT25 is not set
-# CONFIG_EEPROM_93XX46 is not set
-# CONFIG_EEPROM_EE1004 is not set
-# CONFIG_EEPROM_M24LR is not set
CONFIG_NVMEM_QCOM_QFPROM=y
# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_RMEM is not set
@@ -7304,7 +7237,6 @@ CONFIG_INTERCONNECT_QCOM_BCM_VOTER=y
# CONFIG_INTERCONNECT_QCOM_GLYMUR is not set
# CONFIG_INTERCONNECT_QCOM_HAWI is not set
# CONFIG_INTERCONNECT_QCOM_KAANAPALI is not set
-CONFIG_INTERCONNECT_QCOM_MAILI=y
# CONFIG_INTERCONNECT_QCOM_NORD is not set
CONFIG_INTERCONNECT_QCOM_OSM_L3=y
# CONFIG_INTERCONNECT_QCOM_QCS615 is not set
@@ -7429,6 +7361,7 @@ CONFIG_FSCACHE=y
CONFIG_CACHEFILES=m
# CONFIG_CACHEFILES_DEBUG is not set
# CONFIG_CACHEFILES_ERROR_INJECTION is not set
+# CONFIG_CACHEFILES_ONDEMAND is not set
# end of Caches
#
@@ -7462,7 +7395,7 @@ CONFIG_PROC_FS=y
# CONFIG_PROC_KCORE is not set
CONFIG_PROC_VMCORE=y
# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
-CONFIG_SYSCTL=y
+CONFIG_PROC_SYSCTL=y
CONFIG_PROC_PAGE_MONITOR=y
CONFIG_PROC_CHILDREN=y
CONFIG_KERNFS=y
@@ -7490,6 +7423,7 @@ CONFIG_MISC_FILESYSTEMS=y
# CONFIG_HFSPLUS_FS is not set
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
# CONFIG_CRAMFS is not set
CONFIG_SQUASHFS=m
CONFIG_SQUASHFS_FILE_CACHE=y
@@ -7509,6 +7443,7 @@ CONFIG_SQUASHFS_XZ=y
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
# CONFIG_SQUASHFS_EMBEDDED is not set
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_OMFS_FS is not set
# CONFIG_HPFS_FS is not set
@@ -7907,6 +7842,16 @@ CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
# CONFIG_CRYPTO_DEV_CCP is not set
+CONFIG_CRYPTO_DEV_QCE=y
+CONFIG_CRYPTO_DEV_QCE_SKCIPHER=y
+CONFIG_CRYPTO_DEV_QCE_SHA=y
+CONFIG_CRYPTO_DEV_QCE_AEAD=y
+CONFIG_CRYPTO_DEV_QCE_ENABLE_ALL=y
+# CONFIG_CRYPTO_DEV_QCE_ENABLE_SKCIPHER is not set
+# CONFIG_CRYPTO_DEV_QCE_ENABLE_SHA is not set
+# CONFIG_CRYPTO_DEV_QCE_ENABLE_AEAD is not set
+CONFIG_CRYPTO_DEV_QCE_SW_MAX_LEN=512
+CONFIG_CRYPTO_DEV_QCOM_RNG=y
# CONFIG_CRYPTO_DEV_VIRTIO is not set
# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
# CONFIG_CRYPTO_DEV_CCREE is not set
@@ -7968,13 +7913,7 @@ CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_LIB_UTILS=y
CONFIG_CRYPTO_LIB_AES=y
CONFIG_CRYPTO_LIB_AES_ARCH=y
-CONFIG_CRYPTO_LIB_AES_CBC=y
CONFIG_CRYPTO_LIB_AES_CBC_MACS=y
-CONFIG_CRYPTO_LIB_AES_CCM=y
-CONFIG_CRYPTO_LIB_AES_CTR=y
-CONFIG_CRYPTO_LIB_AES_ECB=y
-CONFIG_CRYPTO_LIB_AES_GCM=y
-CONFIG_CRYPTO_LIB_AES_XTS=y
CONFIG_CRYPTO_LIB_ARC4=m
CONFIG_CRYPTO_LIB_GF128MUL=y
CONFIG_CRYPTO_LIB_BLAKE2B=y
@@ -7982,7 +7921,7 @@ CONFIG_CRYPTO_LIB_CHACHA=m
CONFIG_CRYPTO_LIB_CHACHA_ARCH=y
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=y
-CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_DES=y
CONFIG_CRYPTO_LIB_GF128HASH=y
CONFIG_CRYPTO_LIB_GF128HASH_ARCH=y
CONFIG_CRYPTO_LIB_MD5=y
@@ -8005,6 +7944,7 @@ CONFIG_RAID6_PQ_ARCH=y
CONFIG_RAID6_PQ_BENCHMARK=y
CONFIG_XXHASH=y
CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
+# CONFIG_RANDOM32_SELFTEST is not set
CONFIG_842_COMPRESS=y
CONFIG_842_DECOMPRESS=y
CONFIG_ZLIB_INFLATE=y
@@ -8053,7 +7993,6 @@ CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
CONFIG_ARCH_HAS_BATCHED_DMA_SYNC=y
CONFIG_SWIOTLB=y
-CONFIG_SWIOTLB_DEFAULT_SIZE_MB=64
# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y
CONFIG_DMA_NEED_SYNC=y
@@ -8077,7 +8016,7 @@ CONFIG_DIMLIB=y
CONFIG_LIBFDT=y
CONFIG_OID_REGISTRY=y
CONFIG_UCS2_STRING=y
-CONFIG_VDSO_DATASTORE=y
+CONFIG_HAVE_GENERIC_VDSO=y
CONFIG_GENERIC_GETTIMEOFDAY=y
CONFIG_VDSO_GETRANDOM=y
CONFIG_FONT_SUPPORT=y
@@ -8145,7 +8084,7 @@ CONFIG_FRAME_WARN=2048
CONFIG_SECTION_MISMATCH_WARN_ONLY=y
CONFIG_ARCH_WANT_FRAME_POINTERS=y
CONFIG_FRAME_POINTER=y
-CONFIG_WARN_CONTEXT_ANALYSIS=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
# end of Compile-time checks and compiler options
#
@@ -8190,7 +8129,6 @@ CONFIG_ARCH_HAS_PTDUMP=y
CONFIG_HAVE_DEBUG_KMEMLEAK=y
# CONFIG_DEBUG_KMEMLEAK is not set
# CONFIG_PER_VMA_LOCK_STATS is not set
-# CONFIG_MEM_ALLOC_PROFILING is not set
# CONFIG_DEBUG_OBJECTS is not set
# CONFIG_SHRINKER_DEBUG is not set
# CONFIG_DEBUG_STACK_USAGE is not set
@@ -8203,6 +8141,7 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
# CONFIG_DEBUG_VIRTUAL is not set
CONFIG_DEBUG_MEMORY_INIT=y
# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_MEM_ALLOC_PROFILING is not set
CONFIG_HAVE_ARCH_KASAN=y
CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y
@@ -8298,7 +8237,6 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_FREGS=y
CONFIG_HAVE_FTRACE_GRAPH_FUNC=y
CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
CONFIG_HAVE_EXTRA_IPI_TRACEPOINTS=y
CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
@@ -8320,7 +8258,6 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
# CONFIG_FUNCTION_GRAPH_RETVAL is not set
# CONFIG_FUNCTION_GRAPH_RETADDR is not set
CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
# CONFIG_FUNCTION_SELF_TRACING is not set
# CONFIG_FPROBE is not set
@@ -8338,7 +8275,6 @@ CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
# CONFIG_PROFILE_ALL_BRANCHES is not set
# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_PROBE_EVENTS_DUMP_FETCHARG is not set
CONFIG_KPROBE_EVENTS=y
# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
CONFIG_UPROBE_EVENTS=y
@@ -8412,7 +8348,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
# CONFIG_TEST_WORKQUEUE is not set
# CONFIG_TEST_BPF is not set
# CONFIG_FIND_BIT_BENCHMARK is not set
-# CONFIG_REGION_ALLOC_BENCHMARK is not set
# CONFIG_TEST_FIRMWARE is not set
# CONFIG_TEST_SYSCTL is not set
# CONFIG_TEST_UDELAY is not set
diff --git a/aports/device/soc-fairphone-fp6-audio/APKBUILD b/aports/device/soc-fairphone-fp6-audio/APKBUILD
index 1d603ae..0478cce 100644
--- a/aports/device/soc-fairphone-fp6-audio/APKBUILD
+++ b/aports/device/soc-fairphone-fp6-audio/APKBUILD
@@ -2,12 +2,7 @@
# yet: the AudioReach topology (built from Catcrafts/audioreach-topology
# branch fp6), the UCM profile, and pipewire config. Files are
# byte-identical to the ones deployed and tested on the development FP6.
-# The tplg/UCM target filenames carry the sound card model string from the
-# board DTS: the q6apm topology loader requests qcom/milos/-tplg.bin
-# and alsa-ucm resolves conf.d/milos/.conf. Kernel 7.3 names the card
-# "MILOS-Fairphone-Gen6", 7.2 named it "Fairphone (Gen. 6)"; both files are
-# installed under the new name with the old name as a symlink, so the package
-# serves either kernel - the one still running after an upgrade included.
+# The tplg/UCM target filenames contain spaces, hence the safe source names.
#
# The proprietary AW88261 amp config blob (aw88261_acf.bin) is NOT shipped
# since pkgver 4: fp6-vendor-blobs extracts it from the stock vendor
@@ -15,8 +10,8 @@
# distributed. Provenance/design: fp6 repo journal/blobs/.
maintainer="Jorijn van der Graaf "
pkgname=soc-fairphone-fp6-audio
-pkgver=5
-pkgrel=0
+pkgver=4
+pkgrel=1
pkgdesc="Fairphone 6 audio topology and UCM profile"
url="https://forgejo.catcrafts.net/Catcrafts/audioreach-topology"
arch="noarch"
@@ -34,14 +29,10 @@ source="
package() {
install -Dm644 "$srcdir"/fp6-tplg.bin \
- "$pkgdir"/usr/lib/firmware/qcom/milos/MILOS-Fairphone-Gen6-tplg.bin
- ln -s MILOS-Fairphone-Gen6-tplg.bin \
"$pkgdir/usr/lib/firmware/qcom/milos/Fairphone (Gen. 6)-tplg.bin"
install -Dm644 "$srcdir"/aw88261-acf.manifest \
"$pkgdir"/usr/share/fp6-vendor-blobs/manifest.d/10-aw88261-acf.manifest
install -Dm644 "$srcdir"/ucm-milos-fp6.conf \
- "$pkgdir"/usr/share/alsa/ucm2/conf.d/milos/MILOS-Fairphone-Gen6.conf
- ln -s MILOS-Fairphone-Gen6.conf \
"$pkgdir/usr/share/alsa/ucm2/conf.d/milos/Fairphone (Gen. 6).conf"
install -Dm644 "$srcdir"/HiFi.conf \
"$pkgdir"/usr/share/alsa/ucm2/Fairphone/fp6/HiFi.conf