Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Add APK package building capabilities to OpenWrt #4294

Open
wants to merge 70 commits into
base: main
Choose a base branch
from
Open

Add APK package building capabilities to OpenWrt #4294

wants to merge 70 commits into from
+1,515 −98

Commits on Apr 29, 2024

  1. feeds: use GitHub repo mirror to lower bandwidth usage 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    4fa7f9f View commit details
    Browse the repository at this point in the history

  2. CI: add manual staging build 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    8636700 View commit details
    Browse the repository at this point in the history

  3. openwrt-keyring: add apk-test-key.pem 

    This key is used during development to allow the installation of CI
created repositories.

Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    8fc714a View commit details
    Browse the repository at this point in the history

  4. apk: add package 

    APK (Alpine Package Keeper) is the package manager of Alpine Linux and
has multiple advantages over OPKG, add the manager as an alternative.

Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    45b2128 View commit details
    Browse the repository at this point in the history

  5. apk and opkg side by side 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    05847a3 View commit details
    Browse the repository at this point in the history

  6. trying to fix...

    @dangowrt @aparcar
    dangowrt authored and aparcar committed Apr 29, 2024
    Copy the full SHA
    2219ad9 View commit details
    Browse the repository at this point in the history

  7. fixes from paul

    @dangowrt @aparcar
    dangowrt authored and aparcar committed Apr 29, 2024
    Copy the full SHA
    8eeb032 View commit details
    Browse the repository at this point in the history

  8. apk: update to 2024-02-05

    @dangowrt @aparcar
    dangowrt authored and aparcar committed Apr 29, 2024
    Copy the full SHA
    3d4e26f View commit details
    Browse the repository at this point in the history

  9. fix: only call 'opkg flag ...' is building with opkg 

    skip this when using APK.
    @dangowrt @aparcar
    dangowrt authored and aparcar committed Apr 29, 2024
    Copy the full SHA
    452fcae View commit details
    Browse the repository at this point in the history

  10. various apk related fixes

    @dangowrt @aparcar
    dangowrt authored and aparcar committed Apr 29, 2024
    Copy the full SHA
    a88523d View commit details
    Browse the repository at this point in the history

  11. base-files: default_postinst: allow pkgname set by caller 

    Instead of using basename on the script variable to set local pkgname
variable, use global pkgname if set by caller.

This is one way to get post-install scripts to work when creating
images with APK.

Another way would be to extract the scripts into a tmp folder and run
them one-by-one instead of concatenating them -- the speed gain during
build time is none-zero, but worth it?
    @dangowrt @aparcar
    dangowrt authored and aparcar committed Apr 29, 2024
    Copy the full SHA
    eddabc7 View commit details
    Browse the repository at this point in the history

  12. handle specific version depends without breaking opkg

    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    c997ea3 View commit details
    Browse the repository at this point in the history

  13. cleanup outdated CI

    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    dbda1b4 View commit details
    Browse the repository at this point in the history

  14. mv package-{ipkg,pack}.mk 

    it's no longer just ipkg

Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    f12c642 View commit details
    Browse the repository at this point in the history

  15. package-pack: cosmetic changes 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    05dca70 View commit details
    Browse the repository at this point in the history

  16. fix default_postinst and alternatives

    @dangowrt @aparcar
    dangowrt authored and aparcar committed Apr 29, 2024
    Copy the full SHA
    5ca69e8 View commit details
    Browse the repository at this point in the history

  17. feeds: revert changes 

    Since we use our own version compare algo, no need to drop the hash from
LuCI versions

Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    53ff2e2 View commit details
    Browse the repository at this point in the history

  18. fix versioned dependencies compatibility between APK and OPKG 

    Improve re-formatting Makefile logic to generate APK-style dependencies
from the OPKG-style syntax in our package Makefiles.
    @dangowrt @aparcar
    dangowrt authored and aparcar committed Apr 29, 2024
    Copy the full SHA
    93791ba View commit details
    Browse the repository at this point in the history

  19. fix package/Makefile when using opkg

    @dangowrt @aparcar
    dangowrt authored and aparcar committed Apr 29, 2024
    Copy the full SHA
    c02c713 View commit details
    Browse the repository at this point in the history

  20. apk: add support for ABIVersion field

    @dangowrt @aparcar
    dangowrt authored and aparcar committed Apr 29, 2024
    Copy the full SHA
    9aa59c3 View commit details
    Browse the repository at this point in the history

  21. fix rootfs.mk shell errors

    @dangowrt @aparcar
    dangowrt authored and aparcar committed Apr 29, 2024
    Copy the full SHA
    2b39d82 View commit details
    Browse the repository at this point in the history

  22. apk: add hash patch 

    https://gitlab.alpinelinux.org/alpine/apk-tools/-/merge_requests/156

Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    c906e85 View commit details
    Browse the repository at this point in the history

  23. fix rebasing and drop obsolete abi patch 

    abi can now be handled in a metadata field

Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    b39bc6e View commit details
    Browse the repository at this point in the history

  24. apk: update to latest sources 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    aacdecb View commit details
    Browse the repository at this point in the history

  25. package-pack: drop --abiversion usage for now 

    implemented via generic metadata

Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    e2b14dc View commit details
    Browse the repository at this point in the history

  26. toolchain: fix release string to fit apk version 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    4396af2 View commit details
    Browse the repository at this point in the history

  27. fix package/index if no apk files were created

    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    903d7aa View commit details
    Browse the repository at this point in the history

  28. typo

    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    124575f View commit details
    Browse the repository at this point in the history

  29. no usign required for apk and cyclonedx doesn't work right now 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    2ec0876 View commit details
    Browse the repository at this point in the history

  30. apk: don't require zstd 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    38afd2f View commit details
    Browse the repository at this point in the history

  31. apk: mavc 

    lol

Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    3d1601b View commit details
    Browse the repository at this point in the history

  32. package-pack: fix opkg creation 

    let's not drop opkg support just yet...

Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    17b7a76 View commit details
    Browse the repository at this point in the history

  33. apk: further opkg compat 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    238ee3e View commit details
    Browse the repository at this point in the history

  34. makefilemagic

    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    1dbce3e View commit details
    Browse the repository at this point in the history

  35. missing bits

    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    e7977b0 View commit details
    Browse the repository at this point in the history

  36. use regular download server 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    946a375 View commit details
    Browse the repository at this point in the history

  37. apk: update to latest 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    0440b99 View commit details
    Browse the repository at this point in the history

  38. apk: fix compilation on macos 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    4c120c2 View commit details
    Browse the repository at this point in the history

  39. apk: add support for ARC700 and ARCHS architectures 

    Signed-off-by: Daniel Golle <daniel@makrotopia.org>
    @dangowrt @aparcar
    dangowrt authored and aparcar committed Apr 29, 2024
    Copy the full SHA
    7a6ba4a View commit details
    Browse the repository at this point in the history

  40. apk: don't build host-dependencies in parallel 

    Building APK's (numerous) build-dependencies in parallel ends up making
a mess and failing build. Build them sequentially to fix that for now.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
    @dangowrt @aparcar
    dangowrt authored and aparcar committed Apr 29, 2024
    Copy the full SHA
    a318ae1 View commit details
    Browse the repository at this point in the history

  41. apk: dynamic version and bump 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    9ab36c4 View commit details
    Browse the repository at this point in the history

  42. apk: update to latest head 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    8cbb769 View commit details
    Browse the repository at this point in the history

  43. apk: add missing LDFLAGS 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    cd72b90 View commit details
    Browse the repository at this point in the history

  44. rpcd: fix version 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    c7b7616 View commit details
    Browse the repository at this point in the history

  45. Revert "apk: add missing LDFLAGS" 

    No longer needed with latest meson bump

This reverts commit 5ef6c6e.
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    39e3a42 View commit details
    Browse the repository at this point in the history

  46. apk: don't append arch to package names 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    0517ad2 View commit details
    Browse the repository at this point in the history

  47. Reapply "apk: add missing LDFLAGS" 

    This options seems to be easier than fixing APK meson

This reverts commit d07e401.
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    9199b38 View commit details
    Browse the repository at this point in the history

  48. build: cleanup and simplify package cleanup 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    025a532 View commit details
    Browse the repository at this point in the history

  49. version.mk: revert repo url to normal 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    00df550 View commit details
    Browse the repository at this point in the history

  50. ib: fixups to work with opkg again 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    69896c5 View commit details
    Browse the repository at this point in the history

  51. image: don't reload apk feeds for local manifest 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    f2ac723 View commit details
    Browse the repository at this point in the history

  52. base-files, image: better USE_APK detection 

    i'm just confused

Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    a925e13 View commit details
    Browse the repository at this point in the history

  53. package-pack: add actual version to provides 

    previously versions were not APK compatible and therefore had to be
hardcoded to 0. with supported versions, let's use the right one.

Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    16df143 View commit details
    Browse the repository at this point in the history

  54. ib: fix building apk based firmware 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    8b9266d View commit details
    Browse the repository at this point in the history

  55. ib: minor cleanup

    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    b19d4a5 View commit details
    Browse the repository at this point in the history

  56. apk: drop change naming patch 

    cleanup should be more sophisticated since APK can actually handle
multiple versions of the same package - take that opkg
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    0372cb9 View commit details
    Browse the repository at this point in the history

  57. apk: fix gcc cross compile runtime issues 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    5dafcc8 View commit details
    Browse the repository at this point in the history

  58. apk: update to latest 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    1554d67 View commit details
    Browse the repository at this point in the history

  59. apk: add missing MESON_VARS VERSION 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    73dd57f View commit details
    Browse the repository at this point in the history

  60. apk: fixup apk package path, wget patch 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    097cbcd View commit details
    Browse the repository at this point in the history

  61. image: fix APK manifest to look like OPKG manifest 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    db927a7 View commit details
    Browse the repository at this point in the history

  62. version.mk: use testing repositories 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    97abc83 View commit details
    Browse the repository at this point in the history

  63. apk: add mbedtls support and use it 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    846fc60 View commit details
    Browse the repository at this point in the history

  64. apk: support mbedtls and openssl variants 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    a783622 View commit details
    Browse the repository at this point in the history

  65. apk: update to latest mbedtls implementation 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    88fa262 View commit details
    Browse the repository at this point in the history

  66. apk: clean double maintainer entry 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    1862367 View commit details
    Browse the repository at this point in the history

  67. apk: use official upstream URL plus mbedtls patch 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    2f2ded1 View commit details
    Browse the repository at this point in the history

  68. ci: add job to build APK firmware and packages 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    a8dca8f View commit details
    Browse the repository at this point in the history

  69. build: use S3 storage provided by Ansuel 

    Signed-off-by: Paul Spooren <mail@aparcar.org>
    @aparcar
    aparcar committed Apr 29, 2024
    Copy the full SHA
    92b03b9 View commit details
    Browse the repository at this point in the history

  70. CI: apk: test prebuilt tools/toolchain 

    Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
    @Ansuel @aparcar
    Ansuel authored and aparcar committed Apr 29, 2024
    Copy the full SHA
    f3a5dde View commit details
    Browse the repository at this point in the history