diff options
| -rw-r--r-- | legacy/busybox/0001-ash-add-support-for-command_not_found_handle-hook-fu.patch (renamed from system/busybox/0001-ash-add-support-for-command_not_found_handle-hook-fu.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0001-ash-exec-busybox.static.patch (renamed from system/busybox/0001-ash-exec-busybox.static.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0001-cat-fix-cat-e-and-cat-v-erroneously-numbering-1st-li.patch (renamed from system/busybox/0001-cat-fix-cat-e-and-cat-v-erroneously-numbering-1st-li.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0001-wget-emit-a-message-that-certificate-verification-is.patch (renamed from system/busybox/0001-wget-emit-a-message-that-certificate-verification-is.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0002-app-location-for-cpio-vi-and-lspci.patch (renamed from system/busybox/0002-app-location-for-cpio-vi-and-lspci.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch (renamed from system/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0003-ash-exec-busybox.static.patch (renamed from system/busybox/0003-ash-exec-busybox.static.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch (renamed from system/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0004-app-location-for-cpio-vi-and-lspci.patch (renamed from system/busybox/0004-app-location-for-cpio-vi-and-lspci.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0004-ping-make-ping-work-without-root-privileges.patch (renamed from system/busybox/0004-ping-make-ping-work-without-root-privileges.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0005-fbsplash-support-console-switching.patch (renamed from system/busybox/0005-fbsplash-support-console-switching.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch (renamed from system/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch (renamed from system/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0006-ping-make-ping-work-without-root-privileges.patch (renamed from system/busybox/0006-ping-make-ping-work-without-root-privileges.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch (renamed from system/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0007-fbsplash-support-console-switching.patch (renamed from system/busybox/0007-fbsplash-support-console-switching.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0008-diff-add-support-for-no-dereference.patch (renamed from system/busybox/0008-diff-add-support-for-no-dereference.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch (renamed from system/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch (renamed from system/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch (renamed from system/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch (renamed from system/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch (renamed from system/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0011-sysklogd-add-Z-option-to-adjust-message-timezones.patch (renamed from system/busybox/0011-sysklogd-add-Z-option-to-adjust-message-timezones.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0011-testsuite-fix-cpio-tests.patch (renamed from system/busybox/0011-testsuite-fix-cpio-tests.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0012-microcom-segfault.patch (renamed from system/busybox/0012-microcom-segfault.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch (renamed from system/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0013-testsuite-fix-cpio-tests.patch (renamed from system/busybox/0013-testsuite-fix-cpio-tests.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0014-miscutils-microcom-Fixed-segfault.patch (renamed from system/busybox/0014-miscutils-microcom-Fixed-segfault.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0015-ash-introduce-a-config-option-to-search-current-dire.patch (renamed from system/busybox/0015-ash-introduce-a-config-option-to-search-current-dire.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0016-top-handle-much-larger-VSZ-values.patch (renamed from system/busybox/0016-top-handle-much-larger-VSZ-values.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch (renamed from system/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/APKBUILD (renamed from system/busybox/APKBUILD) | 0 | ||||
| -rw-r--r-- | legacy/busybox/acpid.logrotate (renamed from system/busybox/acpid.logrotate) | 0 | ||||
| -rw-r--r-- | legacy/busybox/bbsuid.c (renamed from system/busybox/bbsuid.c) | 0 | ||||
| -rw-r--r-- | legacy/busybox/busybox-extras.post-install (renamed from system/busybox/busybox-extras.post-install) | 0 | ||||
| -rw-r--r-- | legacy/busybox/busybox-extras.pre-deinstall (renamed from system/busybox/busybox-extras.pre-deinstall) | 0 | ||||
| -rw-r--r-- | legacy/busybox/busybox.post-install (renamed from system/busybox/busybox.post-install) | 0 | ||||
| -rw-r--r-- | legacy/busybox/busybox.post-upgrade (renamed from system/busybox/busybox.post-upgrade) | 0 | ||||
| -rw-r--r-- | legacy/busybox/busybox.pre-deinstall (renamed from system/busybox/busybox.pre-deinstall) | 0 | ||||
| -rw-r--r-- | legacy/busybox/busybox.trigger (renamed from system/busybox/busybox.trigger) | 0 | ||||
| -rw-r--r-- | legacy/busybox/busyboxconfig (renamed from system/busybox/busyboxconfig) | 0 | ||||
| -rw-r--r-- | legacy/busybox/busyboxconfig-extras (renamed from system/busybox/busyboxconfig-extras) | 0 | ||||
| -rw-r--r-- | legacy/busybox/dad.if-up (renamed from system/busybox/dad.if-up) | 0 | ||||
| -rw-r--r-- | legacy/busybox/external_ssl_client.patch (renamed from system/busybox/external_ssl_client.patch) | 0 | ||||
| -rw-r--r-- | legacy/busybox/nologin.c (renamed from system/busybox/nologin.c) | 0 | ||||
| -rw-r--r-- | legacy/busybox/ssl_client.c (renamed from system/busybox/ssl_client.c) | 0 | ||||
| -rw-r--r-- | legacy/busybox/top-buffer-overflow.patch (renamed from system/busybox/top-buffer-overflow.patch) | 0 | ||||
| -rw-r--r-- | system/adelie-base/APKBUILD | 6 | ||||
| -rw-r--r-- | system/easy-kernel-power8-64k/APKBUILD | 66 | ||||
| -rw-r--r-- | system/easy-kernel-power8/APKBUILD | 62 | ||||
| -rw-r--r-- | system/easy-kernel-power8/config-ppc64 | 2 | ||||
| -rw-r--r-- | system/easy-kernel/APKBUILD | 44 | ||||
| -rw-r--r-- | system/easy-kernel/config-aarch64 | 65 | ||||
| -rw-r--r-- | system/libucontext/0001-Reorder-registers-in-other-assembler-files.patch | 45 | ||||
| -rw-r--r-- | system/libucontext/APKBUILD | 8 | ||||
| -rw-r--r-- | system/libucontext/ppc64-assembly.patch | 331 | ||||
| -rw-r--r-- | system/libucontext/ppc64-stack-layout.patch | 105 | ||||
| -rw-r--r-- | user/ffmpeg/APKBUILD | 6 | ||||
| -rw-r--r-- | user/gpgme/1.12.0-fix-t-tofuinfo.patch | 100 | ||||
| -rw-r--r-- | user/gpgme/APKBUILD | 25 | ||||
| -rw-r--r-- | user/mesa/APKBUILD | 14 | ||||
| -rw-r--r-- | user/mesa/fix-non-altivec-ppc32.patch | 66 | ||||
| -rw-r--r-- | user/qastools/APKBUILD | 43 | ||||
| -rw-r--r-- | user/rust/APKBUILD | 9 | ||||
| -rw-r--r-- | user/wireguard-module-power8-64k/APKBUILD | 37 | ||||
| -rw-r--r-- | user/wireguard-module-power8/APKBUILD | 37 | ||||
| -rw-r--r-- | user/wireguard-module/APKBUILD | 16 | ||||
| -rw-r--r-- | user/wxwidgets/APKBUILD | 43 |
68 files changed, 933 insertions, 197 deletions
diff --git a/system/busybox/0001-ash-add-support-for-command_not_found_handle-hook-fu.patch b/legacy/busybox/0001-ash-add-support-for-command_not_found_handle-hook-fu.patch index 929370b9d..929370b9d 100644 --- a/system/busybox/0001-ash-add-support-for-command_not_found_handle-hook-fu.patch +++ b/legacy/busybox/0001-ash-add-support-for-command_not_found_handle-hook-fu.patch diff --git a/system/busybox/0001-ash-exec-busybox.static.patch b/legacy/busybox/0001-ash-exec-busybox.static.patch index fdf134960..fdf134960 100644 --- a/system/busybox/0001-ash-exec-busybox.static.patch +++ b/legacy/busybox/0001-ash-exec-busybox.static.patch diff --git a/system/busybox/0001-cat-fix-cat-e-and-cat-v-erroneously-numbering-1st-li.patch b/legacy/busybox/0001-cat-fix-cat-e-and-cat-v-erroneously-numbering-1st-li.patch index 4680b920e..4680b920e 100644 --- a/system/busybox/0001-cat-fix-cat-e-and-cat-v-erroneously-numbering-1st-li.patch +++ b/legacy/busybox/0001-cat-fix-cat-e-and-cat-v-erroneously-numbering-1st-li.patch diff --git a/system/busybox/0001-wget-emit-a-message-that-certificate-verification-is.patch b/legacy/busybox/0001-wget-emit-a-message-that-certificate-verification-is.patch index 3780b039e..3780b039e 100644 --- a/system/busybox/0001-wget-emit-a-message-that-certificate-verification-is.patch +++ b/legacy/busybox/0001-wget-emit-a-message-that-certificate-verification-is.patch diff --git a/system/busybox/0002-app-location-for-cpio-vi-and-lspci.patch b/legacy/busybox/0002-app-location-for-cpio-vi-and-lspci.patch index 8c8e4ee7a..8c8e4ee7a 100644 --- a/system/busybox/0002-app-location-for-cpio-vi-and-lspci.patch +++ b/legacy/busybox/0002-app-location-for-cpio-vi-and-lspci.patch diff --git a/system/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch b/legacy/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch index 72df8ecf9..72df8ecf9 100644 --- a/system/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch +++ b/legacy/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch diff --git a/system/busybox/0003-ash-exec-busybox.static.patch b/legacy/busybox/0003-ash-exec-busybox.static.patch index 94239a2eb..94239a2eb 100644 --- a/system/busybox/0003-ash-exec-busybox.static.patch +++ b/legacy/busybox/0003-ash-exec-busybox.static.patch diff --git a/system/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch b/legacy/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch index 5671ee1b0..5671ee1b0 100644 --- a/system/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch +++ b/legacy/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch diff --git a/system/busybox/0004-app-location-for-cpio-vi-and-lspci.patch b/legacy/busybox/0004-app-location-for-cpio-vi-and-lspci.patch index 7f105cb67..7f105cb67 100644 --- a/system/busybox/0004-app-location-for-cpio-vi-and-lspci.patch +++ b/legacy/busybox/0004-app-location-for-cpio-vi-and-lspci.patch diff --git a/system/busybox/0004-ping-make-ping-work-without-root-privileges.patch b/legacy/busybox/0004-ping-make-ping-work-without-root-privileges.patch index 77fa5ed76..77fa5ed76 100644 --- a/system/busybox/0004-ping-make-ping-work-without-root-privileges.patch +++ b/legacy/busybox/0004-ping-make-ping-work-without-root-privileges.patch diff --git a/system/busybox/0005-fbsplash-support-console-switching.patch b/legacy/busybox/0005-fbsplash-support-console-switching.patch index 792c2d6c8..792c2d6c8 100644 --- a/system/busybox/0005-fbsplash-support-console-switching.patch +++ b/legacy/busybox/0005-fbsplash-support-console-switching.patch diff --git a/system/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch b/legacy/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch index 181acdb9a..181acdb9a 100644 --- a/system/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch +++ b/legacy/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch diff --git a/system/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch b/legacy/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch index 65c423178..65c423178 100644 --- a/system/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch +++ b/legacy/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch diff --git a/system/busybox/0006-ping-make-ping-work-without-root-privileges.patch b/legacy/busybox/0006-ping-make-ping-work-without-root-privileges.patch index 630619b4a..630619b4a 100644 --- a/system/busybox/0006-ping-make-ping-work-without-root-privileges.patch +++ b/legacy/busybox/0006-ping-make-ping-work-without-root-privileges.patch diff --git a/system/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch b/legacy/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch index 8b89902de..8b89902de 100644 --- a/system/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch +++ b/legacy/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch diff --git a/system/busybox/0007-fbsplash-support-console-switching.patch b/legacy/busybox/0007-fbsplash-support-console-switching.patch index ef226d009..ef226d009 100644 --- a/system/busybox/0007-fbsplash-support-console-switching.patch +++ b/legacy/busybox/0007-fbsplash-support-console-switching.patch diff --git a/system/busybox/0008-diff-add-support-for-no-dereference.patch b/legacy/busybox/0008-diff-add-support-for-no-dereference.patch index 95063a863..95063a863 100644 --- a/system/busybox/0008-diff-add-support-for-no-dereference.patch +++ b/legacy/busybox/0008-diff-add-support-for-no-dereference.patch diff --git a/system/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch b/legacy/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch index b0cb5cc3d..b0cb5cc3d 100644 --- a/system/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch +++ b/legacy/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch diff --git a/system/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch b/legacy/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch index 2034f5c88..2034f5c88 100644 --- a/system/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch +++ b/legacy/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch diff --git a/system/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch b/legacy/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch index 2624675c4..2624675c4 100644 --- a/system/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch +++ b/legacy/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch diff --git a/system/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch b/legacy/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch index a45c46d09..a45c46d09 100644 --- a/system/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch +++ b/legacy/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch diff --git a/system/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch b/legacy/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch index 75fe62dfd..75fe62dfd 100644 --- a/system/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch +++ b/legacy/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch diff --git a/system/busybox/0011-sysklogd-add-Z-option-to-adjust-message-timezones.patch b/legacy/busybox/0011-sysklogd-add-Z-option-to-adjust-message-timezones.patch index b4ba240c4..b4ba240c4 100644 --- a/system/busybox/0011-sysklogd-add-Z-option-to-adjust-message-timezones.patch +++ b/legacy/busybox/0011-sysklogd-add-Z-option-to-adjust-message-timezones.patch diff --git a/system/busybox/0011-testsuite-fix-cpio-tests.patch b/legacy/busybox/0011-testsuite-fix-cpio-tests.patch index a6eb803de..a6eb803de 100644 --- a/system/busybox/0011-testsuite-fix-cpio-tests.patch +++ b/legacy/busybox/0011-testsuite-fix-cpio-tests.patch diff --git a/system/busybox/0012-microcom-segfault.patch b/legacy/busybox/0012-microcom-segfault.patch index 4789079b3..4789079b3 100644 --- a/system/busybox/0012-microcom-segfault.patch +++ b/legacy/busybox/0012-microcom-segfault.patch diff --git a/system/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch b/legacy/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch index 50719b003..50719b003 100644 --- a/system/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch +++ b/legacy/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch diff --git a/system/busybox/0013-testsuite-fix-cpio-tests.patch b/legacy/busybox/0013-testsuite-fix-cpio-tests.patch index a9ba0c4d0..a9ba0c4d0 100644 --- a/system/busybox/0013-testsuite-fix-cpio-tests.patch +++ b/legacy/busybox/0013-testsuite-fix-cpio-tests.patch diff --git a/system/busybox/0014-miscutils-microcom-Fixed-segfault.patch b/legacy/busybox/0014-miscutils-microcom-Fixed-segfault.patch index 59114460a..59114460a 100644 --- a/system/busybox/0014-miscutils-microcom-Fixed-segfault.patch +++ b/legacy/busybox/0014-miscutils-microcom-Fixed-segfault.patch diff --git a/system/busybox/0015-ash-introduce-a-config-option-to-search-current-dire.patch b/legacy/busybox/0015-ash-introduce-a-config-option-to-search-current-dire.patch index 9fc6f7e68..9fc6f7e68 100644 --- a/system/busybox/0015-ash-introduce-a-config-option-to-search-current-dire.patch +++ b/legacy/busybox/0015-ash-introduce-a-config-option-to-search-current-dire.patch diff --git a/system/busybox/0016-top-handle-much-larger-VSZ-values.patch b/legacy/busybox/0016-top-handle-much-larger-VSZ-values.patch index c8013403f..c8013403f 100644 --- a/system/busybox/0016-top-handle-much-larger-VSZ-values.patch +++ b/legacy/busybox/0016-top-handle-much-larger-VSZ-values.patch diff --git a/system/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch b/legacy/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch index bdf24b783..bdf24b783 100644 --- a/system/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch +++ b/legacy/busybox/0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch diff --git a/system/busybox/APKBUILD b/legacy/busybox/APKBUILD index 44b3e352d..44b3e352d 100644 --- a/system/busybox/APKBUILD +++ b/legacy/busybox/APKBUILD diff --git a/system/busybox/acpid.logrotate b/legacy/busybox/acpid.logrotate index a37763540..a37763540 100644 --- a/system/busybox/acpid.logrotate +++ b/legacy/busybox/acpid.logrotate diff --git a/system/busybox/bbsuid.c b/legacy/busybox/bbsuid.c index 24d0d7d3e..24d0d7d3e 100644 --- a/system/busybox/bbsuid.c +++ b/legacy/busybox/bbsuid.c diff --git a/system/busybox/busybox-extras.post-install b/legacy/busybox/busybox-extras.post-install index a0327a691..a0327a691 100644 --- a/system/busybox/busybox-extras.post-install +++ b/legacy/busybox/busybox-extras.post-install diff --git a/system/busybox/busybox-extras.pre-deinstall b/legacy/busybox/busybox-extras.pre-deinstall index 15461302c..15461302c 100644 --- a/system/busybox/busybox-extras.pre-deinstall +++ b/legacy/busybox/busybox-extras.pre-deinstall diff --git a/system/busybox/busybox.post-install b/legacy/busybox/busybox.post-install index a986b2f76..a986b2f76 100644 --- a/system/busybox/busybox.post-install +++ b/legacy/busybox/busybox.post-install diff --git a/system/busybox/busybox.post-upgrade b/legacy/busybox/busybox.post-upgrade index 291ed7a6d..291ed7a6d 100644 --- a/system/busybox/busybox.post-upgrade +++ b/legacy/busybox/busybox.post-upgrade diff --git a/system/busybox/busybox.pre-deinstall b/legacy/busybox/busybox.pre-deinstall index f1e10ba92..f1e10ba92 100644 --- a/system/busybox/busybox.pre-deinstall +++ b/legacy/busybox/busybox.pre-deinstall diff --git a/system/busybox/busybox.trigger b/legacy/busybox/busybox.trigger index e531a45b8..e531a45b8 100644 --- a/system/busybox/busybox.trigger +++ b/legacy/busybox/busybox.trigger diff --git a/system/busybox/busyboxconfig b/legacy/busybox/busyboxconfig index d2ea6fd75..d2ea6fd75 100644 --- a/system/busybox/busyboxconfig +++ b/legacy/busybox/busyboxconfig diff --git a/system/busybox/busyboxconfig-extras b/legacy/busybox/busyboxconfig-extras index ed9c572a9..ed9c572a9 100644 --- a/system/busybox/busyboxconfig-extras +++ b/legacy/busybox/busyboxconfig-extras diff --git a/system/busybox/dad.if-up b/legacy/busybox/dad.if-up index e76bb60bf..e76bb60bf 100644 --- a/system/busybox/dad.if-up +++ b/legacy/busybox/dad.if-up diff --git a/system/busybox/external_ssl_client.patch b/legacy/busybox/external_ssl_client.patch index 8adb7b41b..8adb7b41b 100644 --- a/system/busybox/external_ssl_client.patch +++ b/legacy/busybox/external_ssl_client.patch diff --git a/system/busybox/nologin.c b/legacy/busybox/nologin.c index 75ad89eda..75ad89eda 100644 --- a/system/busybox/nologin.c +++ b/legacy/busybox/nologin.c diff --git a/system/busybox/ssl_client.c b/legacy/busybox/ssl_client.c index 8aa558e70..8aa558e70 100644 --- a/system/busybox/ssl_client.c +++ b/legacy/busybox/ssl_client.c diff --git a/system/busybox/top-buffer-overflow.patch b/legacy/busybox/top-buffer-overflow.patch index 14b23c648..14b23c648 100644 --- a/system/busybox/top-buffer-overflow.patch +++ b/legacy/busybox/top-buffer-overflow.patch diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD index 4cda8968f..4954aa8f8 100644 --- a/system/adelie-base/APKBUILD +++ b/system/adelie-base/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=adelie-base pkgver=0.9.1 -pkgrel=2 +pkgrel=3 pkgdesc="The Adélie Linux Base System" url="https://www.adelielinux.org/" arch="noarch" @@ -71,8 +71,8 @@ doc() { posix() { # We pull in vim for /usr/bin/ex, until apk has an alternatives system - depends="adelie-base at bc cflow ed fcron heirloom-devtools - heirloom-pax mailx mawk vim" + depends="adelie-base at bc cflow cxref ed fcron heirloom-devtools + heirloom-pax mailx mawk uucp vim" pkgdesc="$pkgdesc - Additional POSIX tools" mkdir -p "$subpkgdir" return 0 diff --git a/system/easy-kernel-power8-64k/APKBUILD b/system/easy-kernel-power8-64k/APKBUILD index 1b75a06f4..4ccc016fe 100644 --- a/system/easy-kernel-power8-64k/APKBUILD +++ b/system/easy-kernel-power8-64k/APKBUILD @@ -1,42 +1,50 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> -_pkgname=easy-kernel-power8-64k +# KEEP THIS IN SYNC with the other easy-kernel packages. +_kflavour=-power8-64k +_pkgname=easy-kernel$_kflavour pkgver=4.14.88 pkgrel=13 pkgname=$_pkgname-$pkgver-mc$pkgrel -_kflavour=power8-64k pkgdesc="The Linux kernel, packaged for POWER8 and POWER9 computers (with 64K page size)" url="https://kernel.org/" arch="ppc64" options="!check !dbg !strip !tracedeps" license="GPL-2.0-only" depends="" -makedepends="bc gzip lzop openssl-dev xz" +makedepends="bc gzip kmod lzop openssl-dev xz" install="" -provides="easy-kernel-power8-64k=$pkgver-r$pkgrel" -subpackages="$_pkgname-modules-$pkgver-mc$pkgrel:modules" -source="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz - https://distfiles.adelielinux.org/source/linux-4.14-mc$pkgrel.patch.xz +provides="easy-kernel$_kflavour=$pkgver-r$pkgrel" +subpackages="$_pkgname-modules-$pkgver-mc$pkgrel:modules + $_pkgname-src-$pkgver-mc$pkgrel:src + " +_pkgmajver=${pkgver%%.*} +_pkgminver=${pkgver%.*} +source="https://cdn.kernel.org/pub/linux/kernel/v${_pkgmajver}.x/linux-${_pkgminver}.tar.xz + https://distfiles.adelielinux.org/source/linux-${_pkgminver}-mc$pkgrel.patch.xz ast-endianness.patch config-ppc64 futex-cmpxchg.patch " -builddir="$srcdir/linux-4.14" +builddir="$srcdir/linux-${_pkgminver}" prepare() { - default_prepare cd "$srcdir" - cat linux-4.14-mc$pkgrel.patch.xz | unxz -> linux-4.14-mc$pkgrel.patch - cd "$builddir" - patch -Np1 <../linux-4.14-mc$pkgrel.patch + cat linux-${_pkgminver}-mc$pkgrel.patch.xz | unxz -> linux-${_pkgminver}-mc$pkgrel.patch + patch -Np1 -d "$builddir" <linux-${_pkgminver}-mc$pkgrel.patch + default_prepare cd "$srcdir" - cp config-$CARCH linux-4.14/.config - cp -pr linux-4.14 linux-src + cp config-$CARCH linux-${_pkgminver}/.config + cp -pr linux-${_pkgminver} linux-src } build() { cd "$builddir" make LDFLAGS="" + + cd "$srcdir/linux-src" + make LDFLAGS="" modules_prepare clean + cp "$builddir/Module.symvers" . } package() { @@ -48,32 +56,38 @@ package() { if [ -f "$pkgdir"/boot/vmlinuz ]; then mv "$pkgdir"/boot/vmlinuz \ - "$pkgdir"/boot/vmlinuz-$pkgver-mc$pkgrel-easy-$_kflavour + "$pkgdir"/boot/vmlinuz-$pkgver-mc$pkgrel-easy$_kflavour fi if [ -f "$pkgdir"/boot/vmlinux ]; then mv "$pkgdir"/boot/vmlinux \ - "$pkgdir"/boot/vmlinux-$pkgver-mc$pkgrel-easy-$_kflavour + "$pkgdir"/boot/vmlinux-$pkgver-mc$pkgrel-easy$_kflavour fi - # This allows coexistence of both kernel flavours on media. - mv "$pkgdir"/boot/System.map "$pkgdir"/boot/System.map-$_kflavour + mv "$pkgdir"/boot/System.map "$pkgdir"/boot/System.map-$pkgver-mc$pkgrel-easy$_kflavour install -D "$builddir"/include/config/kernel.release \ - "$pkgdir"/usr/share/kernel/easy-$pkgver-mc$pkgrel-$_kflavour/kernel.release + "$pkgdir"/usr/share/kernel/easy-$pkgver-mc$pkgrel$_kflavour/kernel.release } modules() { pkgdesc="Modules / device drivers for easy-kernel" - provides="easy-kernel-power8-64k-modules=$pkgver-r$pkgrel" + provides="easy-kernel$_kflavour-modules=$pkgver-r$pkgrel" autodeps=0 # modules should not depend on src just for symlink mkdir -p "$subpkgdir"/lib mv "$pkgdir"/lib/modules "$subpkgdir"/lib/ - rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy-$_kflavour/build - rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy-$_kflavour/source - ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel-p8" \ - "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy-$_kflavour/build - ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel-p8" \ - "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy-$_kflavour/source + rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy$_kflavour/build + rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy$_kflavour/source + ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel$_kflavour" \ + "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy$_kflavour/build + ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel$_kflavour" \ + "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy$_kflavour/source +} + +src() { + pkgdesc="Kernel source code used to build the kernel" + provides="easy-kernel$_kflavour-src=$pkgver-r$pkgrel" + mkdir -p "$subpkgdir"/usr/src + mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$pkgrel$_kflavour } sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz diff --git a/system/easy-kernel-power8/APKBUILD b/system/easy-kernel-power8/APKBUILD index 477e7ea04..34f8faddd 100644 --- a/system/easy-kernel-power8/APKBUILD +++ b/system/easy-kernel-power8/APKBUILD @@ -1,6 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> -_pkgname=easy-kernel-power8 +# KEEP THIS IN SYNC with the other easy-kernel packages. +_kflavour=-power8 +_pkgname=easy-kernel$_kflavour pkgver=4.14.88 pkgrel=13 pkgname=$_pkgname-$pkgver-mc$pkgrel @@ -12,31 +14,37 @@ license="GPL-2.0-only" depends="" makedepends="bc gzip kmod lzop openssl-dev xz" install="" -provides="easy-kernel-power8=$pkgver-r$pkgrel" +provides="easy-kernel$_kflavour=$pkgver-r$pkgrel" subpackages="$_pkgname-modules-$pkgver-mc$pkgrel:modules - $_pkgname-src-$pkgver-mc$pkgrel:src" -source="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz - https://distfiles.adelielinux.org/source/linux-4.14-mc$pkgrel.patch.xz + $_pkgname-src-$pkgver-mc$pkgrel:src + " +_pkgmajver=${pkgver%%.*} +_pkgminver=${pkgver%.*} +source="https://cdn.kernel.org/pub/linux/kernel/v${_pkgmajver}.x/linux-${_pkgminver}.tar.xz + https://distfiles.adelielinux.org/source/linux-${_pkgminver}-mc$pkgrel.patch.xz ast-endianness.patch config-ppc64 futex-cmpxchg.patch " -builddir="$srcdir/linux-4.14" +builddir="$srcdir/linux-${_pkgminver}" prepare() { - default_prepare cd "$srcdir" - cat linux-4.14-mc$pkgrel.patch.xz | unxz -> linux-4.14-mc$pkgrel.patch - cd "$builddir" - patch -Np1 <../linux-4.14-mc$pkgrel.patch + cat linux-${_pkgminver}-mc$pkgrel.patch.xz | unxz -> linux-${_pkgminver}-mc$pkgrel.patch + patch -Np1 -d "$builddir" <linux-${_pkgminver}-mc$pkgrel.patch + default_prepare cd "$srcdir" - cp config-$CARCH linux-4.14/.config - cp -pr linux-4.14 linux-src + cp config-$CARCH linux-${_pkgminver}/.config + cp -pr linux-${_pkgminver} linux-src } build() { cd "$builddir" make LDFLAGS="" + + cd "$srcdir/linux-src" + make LDFLAGS="" modules_prepare clean + cp "$builddir/Module.symvers" . } package() { @@ -48,42 +56,42 @@ package() { if [ -f "$pkgdir"/boot/vmlinuz ]; then mv "$pkgdir"/boot/vmlinuz \ - "$pkgdir"/boot/vmlinuz-$pkgver-mc$pkgrel-easy-p8 + "$pkgdir"/boot/vmlinuz-$pkgver-mc$pkgrel-easy$_kflavour fi if [ -f "$pkgdir"/boot/vmlinux ]; then mv "$pkgdir"/boot/vmlinux \ - "$pkgdir"/boot/vmlinux-$pkgver-mc$pkgrel-easy-p8 + "$pkgdir"/boot/vmlinux-$pkgver-mc$pkgrel-easy$_kflavour fi - # This allows coexistence of both kernel flavours on media. - mv "$pkgdir"/boot/System.map "$pkgdir"/boot/System.map-p8 + mv "$pkgdir"/boot/System.map "$pkgdir"/boot/System.map-$pkgver-mc$pkgrel-easy$_kflavour install -D "$builddir"/include/config/kernel.release \ - "$pkgdir"/usr/share/kernel/easy-$pkgver-mc$pkgrel-p8/kernel.release + "$pkgdir"/usr/share/kernel/easy-$pkgver-mc$pkgrel$_kflavour/kernel.release } modules() { pkgdesc="Modules / device drivers for easy-kernel" - provides="easy-kernel-power8-modules=$pkgver-r$pkgrel" + provides="easy-kernel$_kflavour-modules=$pkgver-r$pkgrel" autodeps=0 # modules should not depend on src just for symlink mkdir -p "$subpkgdir"/lib mv "$pkgdir"/lib/modules "$subpkgdir"/lib/ - rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy-p8/build - rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy-p8/source - ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel-p8" \ - "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy-p8/build - ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel-p8" \ - "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy-p8/source + rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy$_kflavour/build + rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy$_kflavour/source + ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel$_kflavour" \ + "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy$_kflavour/build + ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel$_kflavour" \ + "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy$_kflavour/source } src() { pkgdesc="Kernel source code used to build the kernel" - provides="easy-kernel-power8-src=$pkgver-r$pkgrel" + provides="easy-kernel$_kflavour-src=$pkgver-r$pkgrel" mkdir -p "$subpkgdir"/usr/src - mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$pkgrel-p8 + mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$pkgrel$_kflavour } + sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz bfe606f208894cc572fb98f323e26956c69b4f75febd4a9b500514cbb2aa70bddb2aba05b3f16a5fe52535236b215335f73974324065f80643265f17f281faa6 linux-4.14-mc13.patch.xz e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch -7eaa8840cbcb78afcc95a2e57a0fe92d6016f0ee6b5e1530e647ddb2799dae709ff57ac86bdfdefd32be1f3b1aec789cdc6b49f81c3186291672a8945bc474dd config-ppc64 +70c09aaa7e75ef04389d69768874bc243f351a63f481b191d5708f74f1ceccf32dbbc286415aff4eaf44040a0fd75e90487a50f0c53a32f6d1c0dc779cb56fec config-ppc64 64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch" diff --git a/system/easy-kernel-power8/config-ppc64 b/system/easy-kernel-power8/config-ppc64 index 62fb8f381..ad91c8957 100644 --- a/system/easy-kernel-power8/config-ppc64 +++ b/system/easy-kernel-power8/config-ppc64 @@ -86,7 +86,7 @@ CONFIG_SCHED_MUQSS=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-easy-p8" +CONFIG_LOCALVERSION="-easy-power8" CONFIG_LOCALVERSION_AUTO=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_XZ=y diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD index 2a3903b73..294644b01 100644 --- a/system/easy-kernel/APKBUILD +++ b/system/easy-kernel/APKBUILD @@ -1,6 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> -_pkgname=easy-kernel +# KEEP THIS IN SYNC with the other easy-kernel packages. +_kflavour="" +_pkgname=easy-kernel$_kflavour pkgver=4.14.88 pkgrel=13 pkgname=$_pkgname-$pkgver-mc$pkgrel @@ -12,9 +14,10 @@ license="GPL-2.0-only" depends="" makedepends="bc gzip kmod lzop openssl-dev xz" install="" -provides="easy-kernel=$pkgver-r$pkgrel" +provides="easy-kernel$_kflavour=$pkgver-r$pkgrel" subpackages="$_pkgname-modules-$pkgver-mc$pkgrel:modules - $_pkgname-src-$pkgver-mc$pkgrel:src linux-headers:headers" + $_pkgname-src-$pkgver-mc$pkgrel:src + linux-headers:headers" _pkgmajver=${pkgver%%.*} _pkgminver=${pkgver%.*} source="https://cdn.kernel.org/pub/linux/kernel/v${_pkgmajver}.x/linux-${_pkgminver}.tar.xz @@ -65,29 +68,38 @@ package() { if [ -f "$pkgdir"/boot/vmlinuz ]; then mv "$pkgdir"/boot/vmlinuz \ - "$pkgdir"/boot/vmlinuz-$pkgver-mc$pkgrel-easy + "$pkgdir"/boot/vmlinuz-$pkgver-mc$pkgrel-easy$_kflavour fi if [ -f "$pkgdir"/boot/vmlinux ]; then mv "$pkgdir"/boot/vmlinux \ - "$pkgdir"/boot/vmlinux-$pkgver-mc$pkgrel-easy + "$pkgdir"/boot/vmlinux-$pkgver-mc$pkgrel-easy$_kflavour fi + if [ -f "$pkgdir"/boot/System.map ]; then + mv "$pkgdir"/boot/System.map \ + "$pkgdir"/boot/System.map-$pkgver-mc$pkgrel-easy$_kflavour + fi + + case $CARCH in + aarch64|arm*) make INSTALL_PATH="$pkgdir"/boot dtbs_install ;; + esac + install -D "$builddir"/include/config/kernel.release \ - "$pkgdir"/usr/share/kernel/easy-$pkgver-mc$pkgrel/kernel.release + "$pkgdir"/usr/share/kernel/easy-$pkgver-mc$pkgrel$_kflavour/kernel.release } modules() { pkgdesc="Modules / device drivers for easy-kernel" - provides="easy-kernel-modules=$pkgver-r$pkgrel" + provides="easy-kernel$_kflavour-modules=$pkgver-r$pkgrel" autodeps=0 # modules should not depend on src just for symlink mkdir -p "$subpkgdir"/lib mv "$pkgdir"/lib/modules "$subpkgdir"/lib/ - rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy/build - rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy/source - ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel" \ - "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy/build - ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel" \ - "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy/source + rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy$_kflavour/build + rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy$_kflavour/source + ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel$_kflavour" \ + "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy$_kflavour/build + ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel$_kflavour" \ + "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy$_kflavour/source } headers() { @@ -113,9 +125,9 @@ headers() { src() { pkgdesc="Kernel source code used to build the kernel" - provides="easy-kernel-src=$pkgver-r$pkgrel" + provides="easy-kernel$_kflavour-src=$pkgver-r$pkgrel" mkdir -p "$subpkgdir"/usr/src - mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$pkgrel + mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$pkgrel$_kflavour } sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz @@ -126,7 +138,7 @@ cfa1c2b523875967c42bfd8fcfeeb80b1c4c9887c4399b4767f0ac0525769a9e8c5cddaec831e1ad 1112f6c3fcfd7fdc0ef4d5e85df5d3adea430a9c7b4c2b34508a215f7ba14c863ccd7a5e17f13ed46c518bafec30cfb3ced70c465137c14ef5fc998b6cbcca1f config-ppc 1c5b4365da04a85ac994f123847cc69df0eda772e88b12914cd1e16ea9be62de2a46106f0f0b736f0e7bee746017d49f5671d1277793b5d383258f3d40b562f6 config-x86_64 69c737ecb6968ca567dfb52335a8a89e147c0b01f92b1e5239bd6d806c10cd7d4225f3cc8a703249020669d3e785df0c1350afda158b0e6c8e70b4805532f07e config-pmmx -231c346e601c1d032a03d6cb19ed3d6e0f538f84d6c9980e3f47236ba9dc3f076ea23f91d68813b7d5c9eea40200f69cef31697f89f514112c09c5762ab2c48a config-aarch64 +c7573068450aff89101ef5aec683f4fee34476f072f9f7debcdc7398c646194b63e3d2fb63742631cdbff0d77d9fabf8d151cc260d80297d00b57c800c60ef6c config-aarch64 64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch fdd94b9de7b374f1812dec0f9971c05f5e52177ca4a16c8071daa620c18265b38f656f528e7045a24f30af01f05e53e54546fb0a9e93773cf191866e87de505d kernel.h af093e91e8c8371629948e2e574f8764078564bc027ba5b2f87886f8827d9a63ba7a43717552fe7e3cc9212b2fd55b8633b12900c3d8cdc6c035d52b389c39e5 uapi-ether.patch" diff --git a/system/easy-kernel/config-aarch64 b/system/easy-kernel/config-aarch64 index 69fbd943c..3d9def137 100644 --- a/system/easy-kernel/config-aarch64 +++ b/system/easy-kernel/config-aarch64 @@ -170,7 +170,6 @@ CONFIG_KALLSYMS_ALL=y # CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_PRINTK=y -CONFIG_PRINTK_NMI=y CONFIG_BUG=y CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y @@ -217,7 +216,6 @@ CONFIG_JUMP_LABEL=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y -CONFIG_HAVE_NMI=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_GENERIC_SMP_IDLE_THREAD=y @@ -232,7 +230,6 @@ CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_RCU_TABLE_FREE=y -CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y @@ -623,9 +620,7 @@ CONFIG_ARM64_MODULE_CMODEL_LARGE=y # CONFIG_ARM64_ACPI_PARKING_PROTOCOL is not set CONFIG_CMDLINE="" # CONFIG_CMDLINE_FORCE is not set -CONFIG_EFI_STUB=y -CONFIG_EFI=y -CONFIG_DMI=y +# CONFIG_EFI is not set # # Userspace binary formats @@ -2405,7 +2400,7 @@ CONFIG_I2C_ALGOBIT=y # # I2C system bus drivers (mostly embedded / system-on-chip) # -CONFIG_I2C_BCM2835=m +CONFIG_I2C_BCM2835=y CONFIG_I2C_BCM_IPROC=y CONFIG_I2C_BRCMSTB=y # CONFIG_I2C_CADENCE is not set @@ -2474,8 +2469,8 @@ CONFIG_SPI_MASTER=y # CONFIG_SPI_ALTERA is not set # CONFIG_SPI_ARMADA_3700 is not set # CONFIG_SPI_AXI_SPI_ENGINE is not set -CONFIG_SPI_BCM2835=m -CONFIG_SPI_BCM2835AUX=m +CONFIG_SPI_BCM2835=y +CONFIG_SPI_BCM2835AUX=y CONFIG_SPI_BCM_QSPI=y # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_CADENCE is not set @@ -2930,7 +2925,7 @@ CONFIG_MTK_THERMAL=y # # Broadcom thermal drivers # -# CONFIG_BCM2835_THERMAL is not set +CONFIG_BCM2835_THERMAL=m CONFIG_BCM_NS_THERMAL=y # @@ -3410,8 +3405,10 @@ CONFIG_DRM_VM=y CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_SIL164=m # CONFIG_DRM_I2C_NXP_TDA998X is not set -# CONFIG_DRM_HDLCD is not set -# CONFIG_DRM_MALI_DISPLAY is not set +CONFIG_DRM_ARM=y +CONFIG_DRM_HDLCD=m +# CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set +CONFIG_DRM_MALI_DISPLAY=m # CONFIG_DRM_RADEON is not set # CONFIG_DRM_AMDGPU is not set @@ -3569,7 +3566,6 @@ CONFIG_FB_ARMCLCD=y # CONFIG_FB_CYBER2000 is not set # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set -# CONFIG_FB_EFI is not set # CONFIG_FB_OPENCORES is not set # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_NVIDIA is not set @@ -3594,7 +3590,7 @@ CONFIG_FB_ARMCLCD=y # CONFIG_FB_SH_MOBILE_LCDC is not set # CONFIG_FB_S3C is not set # CONFIG_FB_SMSCUFX is not set -# CONFIG_FB_UDL is not set +CONFIG_FB_UDL=m # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_XILINX is not set # CONFIG_FB_VIRTUAL is not set @@ -3605,7 +3601,7 @@ CONFIG_XEN_FBDEV_FRONTEND=y # CONFIG_FB_AUO_K190X is not set # CONFIG_FB_SIMPLE is not set # CONFIG_FB_SH_MOBILE_MERAM is not set -# CONFIG_FB_SSD1307 is not set +CONFIG_FB_SSD1307=m # CONFIG_FB_SM712 is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m @@ -3815,10 +3811,10 @@ CONFIG_SND_SOC_RCAR=m # # Allwinner SoC Audio support # -# CONFIG_SND_SUN4I_CODEC is not set -# CONFIG_SND_SUN8I_CODEC_ANALOG is not set -# CONFIG_SND_SUN4I_I2S is not set -# CONFIG_SND_SUN4I_SPDIF is not set +CONFIG_SND_SUN4I_CODEC=m +CONFIG_SND_SUN8I_CODEC_ANALOG=m +CONFIG_SND_SUN4I_I2S=m +CONFIG_SND_SUN4I_SPDIF=m # CONFIG_SND_SOC_TEGRA is not set # CONFIG_SND_SOC_XTFPGA_I2S is not set # CONFIG_ZX_SPDIF is not set @@ -4378,7 +4374,6 @@ CONFIG_EDAC_SUPPORT=y CONFIG_EDAC=y CONFIG_EDAC_LEGACY_SYSFS=y # CONFIG_EDAC_DEBUG is not set -# CONFIG_EDAC_GHES is not set # CONFIG_EDAC_LAYERSCAPE is not set # CONFIG_EDAC_THUNDERX is not set # CONFIG_EDAC_XGENE is not set @@ -4469,7 +4464,6 @@ CONFIG_RTC_DRV_DS3232_HWMON=y # CONFIG_RTC_DRV_DS1685_FAMILY is not set # CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_DS2404 is not set -CONFIG_RTC_DRV_EFI=y # CONFIG_RTC_DRV_STK17TA8 is not set # CONFIG_RTC_DRV_M48T86 is not set # CONFIG_RTC_DRV_M48T35 is not set @@ -4516,7 +4510,7 @@ CONFIG_DMA_OF=y # CONFIG_ALTERA_MSGDMA is not set # CONFIG_AMBA_PL08X is not set CONFIG_BCM_SBA_RAID=m -CONFIG_DMA_BCM2835=m +CONFIG_DMA_BCM2835=y # CONFIG_DMA_SUN6I is not set # CONFIG_FSL_EDMA is not set # CONFIG_INTEL_IDMA64 is not set @@ -4600,7 +4594,6 @@ CONFIG_XEN_GRANT_DEV_ALLOC=y CONFIG_SWIOTLB_XEN=y # CONFIG_XEN_PVCALLS_BACKEND is not set CONFIG_XEN_PRIVCMD=y -CONFIG_XEN_EFI=y CONFIG_XEN_AUTO_XLATE=y CONFIG_STAGING=y # CONFIG_IRDA is not set @@ -5460,27 +5453,12 @@ CONFIG_ARM_PSCI_FW=y CONFIG_ARM_SCPI_PROTOCOL=y CONFIG_ARM_SCPI_POWER_DOMAIN=y # CONFIG_FIRMWARE_MEMMAP is not set -CONFIG_DMIID=y -# CONFIG_DMI_SYSFS is not set CONFIG_RASPBERRYPI_FIRMWARE=y # CONFIG_FW_CFG_SYSFS is not set CONFIG_QCOM_SCM=y CONFIG_QCOM_SCM_64=y CONFIG_HAVE_ARM_SMCCC=y # CONFIG_GOOGLE_FIRMWARE is not set - -# -# EFI (Extensible Firmware Interface) Support -# -# CONFIG_EFI_VARS is not set -CONFIG_EFI_ESRT=y -CONFIG_EFI_PARAMS_FROM_FDT=y -CONFIG_EFI_RUNTIME_WRAPPERS=y -CONFIG_EFI_ARMSTUB=y -CONFIG_EFI_CAPSULE_LOADER=y -# CONFIG_EFI_TEST is not set -# CONFIG_RESET_ATTACK_MITIGATION is not set -CONFIG_UEFI_CPER=y # CONFIG_EFI_DEV_PATH_PARSER is not set CONFIG_MESON_SM=y @@ -5513,15 +5491,7 @@ CONFIG_ACPI_TABLE_UPGRADE=y CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_HED=y # CONFIG_ACPI_CUSTOM_METHOD is not set -# CONFIG_ACPI_BGRT is not set CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y -CONFIG_HAVE_ACPI_APEI=y -CONFIG_ACPI_APEI=y -CONFIG_ACPI_APEI_GHES=y -CONFIG_ACPI_APEI_PCIEAER=y -CONFIG_ACPI_APEI_SEA=y -# CONFIG_ACPI_APEI_EINJ is not set -# CONFIG_ACPI_APEI_ERST_DEBUG is not set # CONFIG_PMIC_OPREGION is not set # CONFIG_ACPI_CONFIGFS is not set CONFIG_ACPI_IORT=y @@ -5623,7 +5593,6 @@ CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y -CONFIG_EFIVAR_FS=y CONFIG_MISC_FILESYSTEMS=y # CONFIG_ORANGEFS_FS is not set # CONFIG_ADFS_FS is not set @@ -5945,7 +5914,6 @@ CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set # CONFIG_DEBUG_WX is not set # CONFIG_DEBUG_ALIGN_RODATA is not set -# CONFIG_DEBUG_EFI is not set # CONFIG_ARM64_RELOC_TEST is not set # CONFIG_CORESIGHT is not set @@ -6241,7 +6209,6 @@ CONFIG_CLZ_TAB=y CONFIG_MPILIB=y CONFIG_LIBFDT=y CONFIG_OID_REGISTRY=y -CONFIG_UCS2_STRING=y CONFIG_FONT_SUPPORT=y # CONFIG_FONTS is not set CONFIG_FONT_8x8=y diff --git a/system/libucontext/0001-Reorder-registers-in-other-assembler-files.patch b/system/libucontext/0001-Reorder-registers-in-other-assembler-files.patch deleted file mode 100644 index b6fe600c9..000000000 --- a/system/libucontext/0001-Reorder-registers-in-other-assembler-files.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 42c84cbe58c3c9089cc2a46a425210f20b47bcc9 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Thu, 19 Jul 2018 17:17:26 -0500 -Subject: [PATCH] Reorder registers in other assembler files - -This fixes the previous commit which changed the register order in -swapcontext only, which caused setcontext to subtly corrupt the stack. ---- - arch/x86_64/getcontext.S | 4 ++-- - arch/x86_64/setcontext.S | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/arch/x86_64/getcontext.S b/arch/x86_64/getcontext.S -index 7e56a1a..24cc1d3 100644 ---- a/arch/x86_64/getcontext.S -+++ b/arch/x86_64/getcontext.S -@@ -22,8 +22,8 @@ __getcontext: - movq %r14, 88(%rdi) - movq %r15, 96(%rdi) - movq %rdi, 104(%rdi) -- movq %rbp, 112(%rdi) -- movq %rsi, 120(%rdi) -+ movq %rsi, 112(%rdi) -+ movq %rbp, 120(%rdi) - movq %rbx, 128(%rdi) - movq %rdx, 136(%rdi) - movq $1, 144(%rdi) /* $1 is %rax */ -diff --git a/arch/x86_64/setcontext.S b/arch/x86_64/setcontext.S -index 607d40c..aba3775 100644 ---- a/arch/x86_64/setcontext.S -+++ b/arch/x86_64/setcontext.S -@@ -21,8 +21,8 @@ __setcontext: - movq 80(%rdi), %r13 - movq 88(%rdi), %r14 - movq 96(%rdi), %r15 -- movq 112(%rdi), %rbp -- movq 120(%rdi), %rsi -+ movq 112(%rdi), %rsi -+ movq 120(%rdi), %rbp - movq 128(%rdi), %rbx - movq 136(%rdi), %rdx - movq 144(%rdi), %rax --- -2.15.0 - diff --git a/system/libucontext/APKBUILD b/system/libucontext/APKBUILD index 2adee39f2..f6b020858 100644 --- a/system/libucontext/APKBUILD +++ b/system/libucontext/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=libucontext pkgver=0.1.3 -pkgrel=0 +pkgrel=1 pkgdesc="ucontext function implementations" url="https://git.dereferenced.org/kaniini/libucontext/" arch="all" @@ -9,6 +9,8 @@ license="ISC" depends="" subpackages="$pkgname-dev" source="https://distfiles.dereferenced.org/libucontext/libucontext-$pkgver.tar.xz + ppc64-assembly.patch + ppc64-stack-layout.patch " case "$CTARGET_ARCH" in @@ -33,4 +35,6 @@ package() { make ARCH="$LIBUCONTEXT_ARCH" DESTDIR="$pkgdir" install } -sha512sums="9e0694c09f159de714b655f6a4201a05c8d1871ee7376bb6bf824206b45475cfbd8269ca1caa75b9c322624d9f77d3fc3f938228a4bdd267a5ddceb57ca5c1ab libucontext-0.1.3.tar.xz" +sha512sums="9e0694c09f159de714b655f6a4201a05c8d1871ee7376bb6bf824206b45475cfbd8269ca1caa75b9c322624d9f77d3fc3f938228a4bdd267a5ddceb57ca5c1ab libucontext-0.1.3.tar.xz +dbb7599fe5cc1e470d944bf741c393c13e684d6c27bd794ec380a05ba1ba045597b102903a1ac9bf586a508941440373c2d29fad1d7372ee8c72ffb7f0e11f75 ppc64-assembly.patch +d6219487a5aa456726a01a5a6a39c3a7f29bc24a66f2fc77ff7f852e1b45ffe64854ad92cafad3cc03d3b52bd77dce786ef125e3e88ddb0398833a560afb5211 ppc64-stack-layout.patch" diff --git a/system/libucontext/ppc64-assembly.patch b/system/libucontext/ppc64-assembly.patch new file mode 100644 index 000000000..66fb3104d --- /dev/null +++ b/system/libucontext/ppc64-assembly.patch @@ -0,0 +1,331 @@ +From 7b864e86e3e8e64fe69363137384ee9b858fe78d Mon Sep 17 00:00:00 2001 +From: Bobby Bingham <koorogi@koorogi.info> +Date: Sat, 23 Feb 2019 17:12:37 -0600 +Subject: [PATCH 2/3] ppc64: rewrite get/set/swapcontext in assembly + +If getcontext makes any function call, which it does to call syscall, then +it must spill its return address to the stack. After it returns to its +caller, that return address can be clobbered. When setcontext is called +to resume this saved context, the correct return address is not available. +--- + Makefile | 10 ++------- + arch/ppc64/getcontext.S | 25 +++++++++++++++++++++ + arch/ppc64/getcontext.c | 45 ------------------------------------- + arch/ppc64/retfromsyscall.c | 24 ++++++++++++++++++++ + arch/ppc64/setcontext.S | 26 +++++++++++++++++++++ + arch/ppc64/setcontext.c | 45 ------------------------------------- + arch/ppc64/swapcontext.S | 28 +++++++++++++++++++++++ + arch/ppc64/swapcontext.c | 45 ------------------------------------- + 8 files changed, 105 insertions(+), 143 deletions(-) + create mode 100644 arch/ppc64/getcontext.S + delete mode 100644 arch/ppc64/getcontext.c + create mode 100644 arch/ppc64/retfromsyscall.c + create mode 100644 arch/ppc64/setcontext.S + delete mode 100644 arch/ppc64/setcontext.c + create mode 100644 arch/ppc64/swapcontext.S + delete mode 100644 arch/ppc64/swapcontext.c + +diff --git a/Makefile b/Makefile +index 51365a3..d6ff1b0 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,14 +2,8 @@ ARCH := $(shell uname -m) + + CFLAGS = -ggdb3 -O2 -Wall -Iarch/${ARCH} + +-LIBUCONTEXT_C_SRC = \ +- arch/${ARCH}/makecontext.c +- +-LIBUCONTEXT_S_SRC = \ +- arch/${ARCH}/getcontext.S \ +- arch/${ARCH}/setcontext.S \ +- arch/${ARCH}/swapcontext.S \ +- arch/${ARCH}/startcontext.S ++LIBUCONTEXT_C_SRC = $(wildcard arch/${ARCH}/*.c) ++LIBUCONTEXT_S_SRC = $(wildcard arch/${ARCH}/*.S) + + LIBUCONTEXT_OBJ = ${LIBUCONTEXT_C_SRC:.c=.o} ${LIBUCONTEXT_S_SRC:.S=.o} + LIBUCONTEXT_SOVERSION = 0 +diff --git a/arch/ppc64/getcontext.S b/arch/ppc64/getcontext.S +new file mode 100644 +index 0000000..935edd2 +--- /dev/null ++++ b/arch/ppc64/getcontext.S +@@ -0,0 +1,25 @@ ++/* ++ * Copyright (c) 2019 Bobby Bingham <koorogi@koorogi.info> ++ * ++ * Permission to use, copy, modify, and/or distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * This software is provided 'as is' and without any warranty, express or ++ * implied. In no event shall the authors be liable for any damages arising ++ * from the use of this software. ++ */ ++ ++.global __getcontext ++.hidden __swapcontext ++__getcontext: ++ addis 2, 12, .TOC.-__getcontext@ha ++ addi 2, 12, .TOC.-__getcontext@l ++ ++ .localentry __getcontext,.-__getcontext ++ ++ li 4, 0 ++ b __swapcontext ++ ++.weak getcontext ++getcontext = __getcontext +diff --git a/arch/ppc64/getcontext.c b/arch/ppc64/getcontext.c +deleted file mode 100644 +index 5da9dfb..0000000 +--- a/arch/ppc64/getcontext.c ++++ /dev/null +@@ -1,45 +0,0 @@ +-/* +- * Copyright (c) 2018 William Pitcock <nenolod@dereferenced.org> +- * +- * Permission to use, copy, modify, and/or distribute this software for any +- * purpose with or without fee is hereby granted, provided that the above +- * copyright notice and this permission notice appear in all copies. +- * +- * This software is provided 'as is' and without any warranty, express or +- * implied. In no event shall the authors be liable for any damages arising +- * from the use of this software. +- */ +- +-#define _GNU_SOURCE +-#include <stddef.h> +-#include <stdarg.h> +-#include <signal.h> +-#include <string.h> +-#include <stdint.h> +-#include <errno.h> +-#include <unistd.h> +-#include <sys/syscall.h> +- +- +-int +-__getcontext(ucontext_t *ucp) +-{ +-#ifdef SYS_swapcontext +- int r; +- +- r = syscall(SYS_swapcontext, ucp, NULL, sizeof(ucontext_t)); +- if (r < 0) +- { +- errno = -r; +- return -1; +- } +- +- return 0; +-#else +- errno = ENOSYS; +- return -1; +-#endif +-} +- +- +-extern __typeof(__getcontext) getcontext __attribute__((weak, __alias__("__getcontext"))); +diff --git a/arch/ppc64/retfromsyscall.c b/arch/ppc64/retfromsyscall.c +new file mode 100644 +index 0000000..22c5134 +--- /dev/null ++++ b/arch/ppc64/retfromsyscall.c +@@ -0,0 +1,24 @@ ++/* ++ * Copyright (c) 2019 Bobby Bingham <koorogi@koorogi.info> ++ * ++ * Permission to use, copy, modify, and/or distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * This software is provided 'as is' and without any warranty, express or ++ * implied. In no event shall the authors be liable for any damages arising ++ * from the use of this software. ++ */ ++ ++#include <errno.h> ++ ++__attribute__ ((visibility ("hidden"))) ++int __retfromsyscall(long retval) ++{ ++ if (retval < 0) { ++ errno = -retval; ++ return -1; ++ } ++ return 0; ++} ++ +diff --git a/arch/ppc64/setcontext.S b/arch/ppc64/setcontext.S +new file mode 100644 +index 0000000..5a0cde3 +--- /dev/null ++++ b/arch/ppc64/setcontext.S +@@ -0,0 +1,26 @@ ++/* ++ * Copyright (c) 2019 Bobby Bingham <koorogi@koorogi.info> ++ * ++ * Permission to use, copy, modify, and/or distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * This software is provided 'as is' and without any warranty, express or ++ * implied. In no event shall the authors be liable for any damages arising ++ * from the use of this software. ++ */ ++ ++.global __setcontext ++.hidden __swapcontext ++__setcontext: ++ addis 2, 12, .TOC.-__setcontext@ha ++ addi 2, 12, .TOC.-__setcontext@l ++ ++ .localentry __setcontext,.-__setcontext ++ ++ mr 4, 3 ++ li 3, 0 ++ b __swapcontext ++ ++.weak setcontext ++setcontext = __setcontext +diff --git a/arch/ppc64/setcontext.c b/arch/ppc64/setcontext.c +deleted file mode 100644 +index 59c65b4..0000000 +--- a/arch/ppc64/setcontext.c ++++ /dev/null +@@ -1,45 +0,0 @@ +-/* +- * Copyright (c) 2018 William Pitcock <nenolod@dereferenced.org> +- * +- * Permission to use, copy, modify, and/or distribute this software for any +- * purpose with or without fee is hereby granted, provided that the above +- * copyright notice and this permission notice appear in all copies. +- * +- * This software is provided 'as is' and without any warranty, express or +- * implied. In no event shall the authors be liable for any damages arising +- * from the use of this software. +- */ +- +-#define _GNU_SOURCE +-#include <stddef.h> +-#include <stdarg.h> +-#include <signal.h> +-#include <string.h> +-#include <stdint.h> +-#include <errno.h> +-#include <unistd.h> +-#include <sys/syscall.h> +- +- +-int +-__setcontext(const ucontext_t *ucp) +-{ +-#ifdef SYS_swapcontext +- int r; +- +- r = syscall(SYS_swapcontext, NULL, (void *) ucp, sizeof(ucontext_t)); +- if (r < 0) +- { +- errno = -r; +- return -1; +- } +- +- return r; +-#else +- errno = ENOSYS; +- return -1; +-#endif +-} +- +- +-extern __typeof(__setcontext) setcontext __attribute__((weak, __alias__("__setcontext"))); +diff --git a/arch/ppc64/swapcontext.S b/arch/ppc64/swapcontext.S +new file mode 100644 +index 0000000..982537a +--- /dev/null ++++ b/arch/ppc64/swapcontext.S +@@ -0,0 +1,28 @@ ++/* ++ * Copyright (c) 2019 Bobby Bingham <koorogi@koorogi.info> ++ * ++ * Permission to use, copy, modify, and/or distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * This software is provided 'as is' and without any warranty, express or ++ * implied. In no event shall the authors be liable for any damages arising ++ * from the use of this software. ++ */ ++ ++.global __swapcontext ++__swapcontext: ++ addis 2, 12, .TOC.-__swapcontext@ha ++ addi 2, 12, .TOC.-__swapcontext@l ++ ++ .localentry __swapcontext,.-__swapcontext ++ ++ li 0, 249 # SYS_swapcontext ++ li 5, 1696 # sizeof(ucontext_t) ++ sc ++ ++.hidden __retfromsyscall ++ b __retfromsyscall ++ ++.weak swapcontext ++swapcontext = __swapcontext +diff --git a/arch/ppc64/swapcontext.c b/arch/ppc64/swapcontext.c +deleted file mode 100644 +index af14bc2..0000000 +--- a/arch/ppc64/swapcontext.c ++++ /dev/null +@@ -1,45 +0,0 @@ +-/* +- * Copyright (c) 2018 William Pitcock <nenolod@dereferenced.org> +- * +- * Permission to use, copy, modify, and/or distribute this software for any +- * purpose with or without fee is hereby granted, provided that the above +- * copyright notice and this permission notice appear in all copies. +- * +- * This software is provided 'as is' and without any warranty, express or +- * implied. In no event shall the authors be liable for any damages arising +- * from the use of this software. +- */ +- +-#define _GNU_SOURCE +-#include <stddef.h> +-#include <stdarg.h> +-#include <signal.h> +-#include <string.h> +-#include <stdint.h> +-#include <errno.h> +-#include <unistd.h> +-#include <sys/syscall.h> +- +- +-int +-__swapcontext(ucontext_t *oucp, const ucontext_t *ucp) +-{ +-#ifdef SYS_swapcontext +- int r; +- +- r = syscall(SYS_swapcontext, oucp, ucp, sizeof(ucontext_t)); +- if (r < 0) +- { +- errno = -r; +- return -1; +- } +- +- return r; +-#else +- errno = ENOSYS; +- return -1; +-#endif +-} +- +- +-extern __typeof(__swapcontext) swapcontext __attribute__((weak, __alias__("__swapcontext"))); +-- +2.19.2 + diff --git a/system/libucontext/ppc64-stack-layout.patch b/system/libucontext/ppc64-stack-layout.patch new file mode 100644 index 000000000..d030b61af --- /dev/null +++ b/system/libucontext/ppc64-stack-layout.patch @@ -0,0 +1,105 @@ +From a17b01bc9df4004a1852ba272d452b0f46f5927c Mon Sep 17 00:00:00 2001 +From: Bobby Bingham <koorogi@koorogi.info> +Date: Tue, 19 Feb 2019 06:27:28 +0000 +Subject: [PATCH 3/3] ppc64: fix stack frame layout + +--- + arch/ppc64/makecontext.c | 48 +++++++++++++++++----------------------- + 1 file changed, 20 insertions(+), 28 deletions(-) + +diff --git a/arch/ppc64/makecontext.c b/arch/ppc64/makecontext.c +index 9d6b998..6d9841c 100644 +--- a/arch/ppc64/makecontext.c ++++ b/arch/ppc64/makecontext.c +@@ -1,5 +1,6 @@ + /* + * Copyright (c) 2018 William Pitcock <nenolod@dereferenced.org> ++ * Copyright (c) 2019 Bobby Bingham <koorogi@koorogi.info> + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above +@@ -11,32 +12,39 @@ + */ + + #define _GNU_SOURCE +-#include <stddef.h> + #include <stdarg.h> + #include <signal.h> +-#include <string.h> + #include <stdint.h> + +- + #include "defs.h" + + + extern void __start_context(void); + + ++#define SAVEARG(i,val) \ ++ do { \ ++ *(i < 8 ? &ucp->uc_mcontext.gp_regs[3+i] : argp) = val; \ ++ argp++; \ ++ } while (0) ++ + void + __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...) + { + greg_t *sp, *argp; + va_list va; +- int i; +- unsigned int uc_link, stack_args; ++ unsigned int stack_args; ++ ++ /* We pass uc_link as an argument, so in total we have argc+1 args */ ++ stack_args = argc + 1; + +- stack_args = argc > 8 ? argc - 8 : 0; +- uc_link = stack_args + 1; ++ /* We can pass 8 args before needing the stack. If any arg is passed ++ * on the stack, then stack space must be reserved for all args, even ++ * though the first 8 don't need to be stored there */ ++ if (stack_args <= 8) stack_args = 0; + + sp = (greg_t *) ((uintptr_t) ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size); +- sp -= (uc_link + 1); ++ sp -= stack_args + 4; + sp = (greg_t *) (((uintptr_t) sp & -16L)); + + ucp->uc_mcontext.gp_regs[REG_NIP] = (uintptr_t) func; +@@ -45,29 +53,13 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...) + ucp->uc_mcontext.gp_regs[REG_ENTRY] = (uintptr_t) func; + ucp->uc_mcontext.gp_regs[REG_R31] = (uintptr_t) ucp->uc_link; + +- sp[0] = (uintptr_t) &__start_context; +- sp[uc_link] = (uintptr_t) ucp->uc_link; +- argp = &sp[2]; ++ sp[0] = 0; ++ argp = &sp[4]; + + va_start(va, argc); + +- for (i = 0; i < argc; i++) +- switch (i) +- { +- case 0: +- case 1: +- case 2: +- case 3: +- case 4: +- case 5: +- case 6: +- case 7: +- ucp->uc_mcontext.gp_regs[i + 3] = va_arg (va, greg_t); +- break; +- default: +- *argp++ = va_arg (va, greg_t); +- break; +- } ++ for (int i = 0; i < argc; i++) SAVEARG(i, va_arg(va, greg_t)); ++ SAVEARG(argc, (uintptr_t) ucp->uc_link); + + va_end(va); + } +-- +2.19.2 + diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD index 6d6c0627b..acc4cedd9 100644 --- a/user/ffmpeg/APKBUILD +++ b/user/ffmpeg/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ffmpeg -pkgver=4.1 -pkgrel=1 +pkgver=4.1.1 +pkgrel=0 pkgdesc="Record, convert, and stream audio and video" url="https://ffmpeg.org/" arch="all" @@ -101,5 +101,5 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ } -sha512sums="59db7e8a6238048c04c3b0bd5885aea2bf7951f79949fc0659a8d235c4cd809ac0c1a74544a4c218a38c8c739eea76f5ee1231bfb96439487212c6e65591780e ffmpeg-4.1.tar.xz +sha512sums="fe72680f1e4ca0b226199d1407803e1de11f00f5a88a23251182172cda4a7369cf1826c4ef86230bf60b0f9ff0d69382da5eeec26574a31eacd9935cf4eeb86f ffmpeg-4.1.1.tar.xz 32652e18d4eb231a2e32ad1cacffdf33264aac9d459e0e2e6dd91484fced4e1ca5a62886057b1f0b4b1589c014bbe793d17c78adbaffec195f9a75733b5b18cb 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch" diff --git a/user/gpgme/1.12.0-fix-t-tofuinfo.patch b/user/gpgme/1.12.0-fix-t-tofuinfo.patch new file mode 100644 index 000000000..74ba11050 --- /dev/null +++ b/user/gpgme/1.12.0-fix-t-tofuinfo.patch @@ -0,0 +1,100 @@ +From 66376f3e206a1aa791d712fb8577bb3490268f60 Mon Sep 17 00:00:00 2001 +From: Andre Heinecke <aheinecke@gnupg.org> +Date: Wed, 9 Jan 2019 08:25:21 +0100 +Subject: [PATCH] qt: Use tofu conflict test keys without expiry + +* lang/qt/tests/t-tofuinfo.cpp: Use new test keys without +expiry. + +-- +The old keys expired on 2019-01-06. + +GnuPG-Bug-Id: T3815 +--- + lang/qt/tests/t-tofuinfo.cpp | 58 +++++++++++++++++++----------------- + 1 file changed, 30 insertions(+), 28 deletions(-) + +diff --git a/lang/qt/tests/t-tofuinfo.cpp b/lang/qt/tests/t-tofuinfo.cpp +index b7161028..2d881069 100644 +--- a/lang/qt/tests/t-tofuinfo.cpp ++++ b/lang/qt/tests/t-tofuinfo.cpp +@@ -69,46 +69,48 @@ static const char testMsg1[] = + + static const char conflictKey1[] = "-----BEGIN PGP PUBLIC KEY BLOCK-----\n" + "\n" +-"mDMEWG+w/hYJKwYBBAHaRw8BAQdAiq1oStvDYg8ZfFs5DgisYJo8dJxD+C/AA21O\n" +-"K/aif0O0GXRvZnVfY29uZmxpY3RAZXhhbXBsZS5jb22IlgQTFggAPhYhBHoJBLaV\n" +-"DamYAgoa1L5BwMOl/x88BQJYb7D+AhsDBQkDwmcABQsJCAcCBhUICQoLAgQWAgMB\n" +-"Ah4BAheAAAoJEL5BwMOl/x88GvwA/0SxkbLyAcshGm2PRrPsFQsSVAfwaSYFVmS2\n" +-"cMVIw1PfAQDclRH1Z4MpufK07ju4qI33o4s0UFpVRBuSxt7A4P2ZD7g4BFhvsP4S\n" +-"CisGAQQBl1UBBQEBB0AmVrgaDNJ7K2BSalsRo2EkRJjHGqnp5bBB0tapnF81CQMB\n" +-"CAeIeAQYFggAIBYhBHoJBLaVDamYAgoa1L5BwMOl/x88BQJYb7D+AhsMAAoJEL5B\n" +-"wMOl/x88OR0BAMq4/vmJUORRTmzjHcv/DDrQB030DSq666rlckGIKTShAPoDXM9N\n" +-"0gZK+YzvrinSKZXHmn0aSwmC1/hyPybJPEljBw==\n" +-"=p2Oj\n" ++"mDMEXDWgpxYJKwYBBAHaRw8BAQdAguVu4qkx8iw4eU+TQ4vvcKG7IdcZvbMhw3Zc\n" ++"npGf0+u0GXRvZnVfY29uZmxpY3RAZXhhbXBsZS5jb22IkAQTFggAOBYhBO6ovNDG\n" ++"nLzbR1TlMJYJ0fjlWbUrBQJcNaCnAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheA\n" ++"AAoJEJYJ0fjlWbUrLaMBALegwkv2+sEcmKZqxt8JscYvFiEuycv2+rKHaZA0eDoN\n" ++"AP97W4XrJb5x49J5jDDdeko8k00uGqiiuAXJo27/i/phA7g4BFw1oKcSCisGAQQB\n" ++"l1UBBQEBB0Crhw24E2lPBhd/y+ZFotQ/2TrYqkUQqGPmff8ofLziNgMBCAeIeAQY\n" ++"FggAIBYhBO6ovNDGnLzbR1TlMJYJ0fjlWbUrBQJcNaCnAhsMAAoJEJYJ0fjlWbUr\n" ++"/K8BAJWsa+tOZsJw7w5fz6O0We6Xx4Rt17jHf563G6wMcz9+AQDRsedJ7w4zYzS9\n" ++"MFiJQ5aN0NDHMRtDFWAgCunVnJ3OBw==\n" ++"=fZa5\n" + "-----END PGP PUBLIC KEY BLOCK-----\n"; + + static const char conflictKey2[] = "-----BEGIN PGP PUBLIC KEY BLOCK-----\n" + "\n" +-"mDMEWG+xShYJKwYBBAHaRw8BAQdA567gPEPJRpqKnZjlFJMRNUqruRviYMyygfF6\n" +-"6Ok+ygu0GXRvZnVfY29uZmxpY3RAZXhhbXBsZS5jb22IlgQTFggAPhYhBJ5kRh7E\n" +-"I98w8kgUcmkAfYFvqqHsBQJYb7FKAhsDBQkDwmcABQsJCAcCBhUICQoLAgQWAgMB\n" +-"Ah4BAheAAAoJEGkAfYFvqqHsYR0BAOz8JjYB4VvGkt6noLS3F5TLfsedGwQkBCw5\n" +-"znw/vGZsAQD9DSX+ekwdrN56mNO8ISt5uVS7B1ZQtouNBF+nzcwbDbg4BFhvsUoS\n" +-"CisGAQQBl1UBBQEBB0BFupW8+Xc1ikab8TJqANjQhvFVh6uLsgcK4g9lZgbGXAMB\n" +-"CAeIeAQYFggAIBYhBJ5kRh7EI98w8kgUcmkAfYFvqqHsBQJYb7FKAhsMAAoJEGkA\n" +-"fYFvqqHs15ABALdN3uiV/07cJ3RkNb3WPcijGsto+lECDS11dKEwTMFeAQDx+V36\n" +-"ocbYC/xEuwi3w45oNqGieazzcD/GBbt8OBk3BA==\n" +-"=45IR\n" ++"mDMEXDWgixYJKwYBBAHaRw8BAQdAMWOhumYspcvEOTuesOSN4rvnJVOj/6qOWFTu\n" ++"x+wPRra0GXRvZnVfY29uZmxpY3RAZXhhbXBsZS5jb22IkAQTFggAOBYhBA64G88Q\n" ++"NPXztj8ID/FhC7tiGbeRBQJcNaCLAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheA\n" ++"AAoJEPFhC7tiGbeRUt4A/2hf4Zgz+TYyfeH/4/ZtyL1JuZggqR1s5UopEx2Aiw10\n" ++"AP405KiTd31TJQN8Ru+7bskPu0/mzLZMNkRvBNEdc5kbDLg4BFw1oIsSCisGAQQB\n" ++"l1UBBQEBB0B5NtSrx7wDDKgwUe5Rxz0vRkaWLtyE0KbfE77oPy5DGAMBCAeIeAQY\n" ++"FggAIBYhBA64G88QNPXztj8ID/FhC7tiGbeRBQJcNaCLAhsMAAoJEPFhC7tiGbeR\n" ++"km0BAP8TQwraipqb1pJlLsEgDXeM5Jocz4fuePD78BsOBtORAP9gpCyKXdyJYGlA\n" ++"qjmG356yG6pCK9aPckTZ9IViPiHWCw==\n" ++"=tn3Q\n" + "-----END PGP PUBLIC KEY BLOCK-----\n"; + + static const char conflictMsg1[] = "-----BEGIN PGP MESSAGE-----\n" + "\n" +-"owGbwMvMwCG2z/HA4aX/5W0YT3MlMUTkb2xPSizi6ihlYRDjYJAVU2Sp4mTZNpV3\n" +-"5QwmLqkrMLWsTCCFDFycAjCR1vcMf4U0Qrs6qzqfHJ9puGOFduLN2nVmhsumxjBE\n" +-"mdw4lr1ehIWR4QdLuNBpe86PGx1PtNXfVAzm/hu+vfjCp5BVNjPTM9L0eAA=\n" +-"=MfBD\n" ++"owGbwMvMwCE2jfPij6eRW7UZTwsnMcSYLnT0Ki0uUXD3C1XILFHk6ihlYRDjYJAV\n" ++"U2R5t2LPhWNz9tx2D3lqANPEygTSwcDFKQAT+RjG8M9of873hQrMpinBVwKYv+rq\n" ++"XGmYW+ZcZJ+133KDq+itzlxGhg3L2X/6Khj+2Hd+He+KnXtunF2wNWxl7849e/Sy\n" ++"v6tc+8MBAA==\n" ++"=fZLe\n" + "-----END PGP MESSAGE-----\n"; + + static const char conflictMsg2[] = "-----BEGIN PGP MESSAGE-----\n" + "\n" +-"owGbwMvMwCGWyVDbmL9q4RvG01xJDBH5GyvS8vO5OkpZGMQ4GGTFFFnmpbjJHVG+\n" +-"b/DJQ6QIppaVCaSQgYtTACaySZHhr/SOPrdFJ89KrcwKY5i1XnflXYf2PK76SafK\n" +-"tkxXuXzvJAvDX4kCybuqFk3HXCexz2+IrnZ+5X5EqOnuo3ens2cte+uzlhMA\n" +-"=BIAi\n" ++"owGbwMvMwCH2MZF7d5Lk9omMp4WTGGJMFwZ4lRaXKLj7hSpklihydZSyMIhxMMiK\n" ++"KbLw7ZA+L2Dy9fM2ew5+mCZWJpAOBi5OAZhIUhIjw7bV+xS+cR0quqhmcY2Dl3WW\n" ++"8Ufr+rRNufOPyIdoO6nEXGH47/B+E1+oxS6e5f5n7MJ3aHBO+s345sipGV/4f665\n" ++"9mmiGjsA\n" ++"=8oJA\n" + "-----END PGP MESSAGE-----\n"; + + class TofuInfoTest: public QGpgMETest +-- +2.19.2 + diff --git a/user/gpgme/APKBUILD b/user/gpgme/APKBUILD index 21b537848..01f7e6030 100644 --- a/user/gpgme/APKBUILD +++ b/user/gpgme/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gpgme pkgver=1.12.0 -pkgrel=0 +pkgrel=1 pkgdesc="GnuPG Made Easy" url="https://www.gnupg.org/related_software/gpgme/" arch="all" @@ -10,9 +10,10 @@ arch="all" license="(LGPL-3.0+ OR GPL-2.0+) AND LGPL-2.1+ AND MIT AND GPL-3.0+" depends="gnupg" depends_dev="libgpg-error-dev libassuan-dev qt5-qtbase-dev" -makedepends="$depends_dev doxygen" -subpackages="$pkgname-dev $pkgname-doc gpgmepp qgpgme" -source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2" +makedepends="$depends_dev doxygen python3-dev" +subpackages="$pkgname-dev $pkgname-doc gpgmepp qgpgme py3-gpg:_py" +source="https://gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2 + 1.12.0-fix-t-tofuinfo.patch" build() { cd "$builddir" @@ -25,6 +26,7 @@ build() { --infodir=/usr/share/info \ --localstatedir=/var make + make -C lang/python } check() { @@ -43,16 +45,19 @@ qgpgme() { mv "$pkgdir"/usr/lib/libqgpgme.so* "$subpkgdir"/usr/lib/ } -check() { - cd "$builddir" - make check -} - gpgmepp() { pkgdesc="C++ bindings for GPGME" mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/libgpgmepp.so.* "$subpkgdir"/usr/lib/ } +_py() { + pkgdesc="$pkgdesc (Python bindings)" + depends="$pkgname=$pkgver-r$pkgrel python3" + + mkdir -p "$subpkgdir/usr/lib/" + mv "$pkgdir/usr/lib/python"* "$subpkgdir/usr/lib/" +} -sha512sums="c228b3df28377df882be536ada56dc9c73150048a58e591aa4495f89c854af95820152cd60139840f994c249e9c7df50d8b89eb9d6dc4ce02aa80bbfebcdd014 gpgme-1.12.0.tar.bz2" +sha512sums="c228b3df28377df882be536ada56dc9c73150048a58e591aa4495f89c854af95820152cd60139840f994c249e9c7df50d8b89eb9d6dc4ce02aa80bbfebcdd014 gpgme-1.12.0.tar.bz2 +c8748651021a6ea670329cffb9565b905272b092315e77dc6fa9fa23890f8a55c2159edbfa026e8af961f2ff0c0d524dc8332a2e9a24fce2b37ac7cc4bb88cb3 1.12.0-fix-t-tofuinfo.patch" diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD index c36074f8a..b5287b1d0 100644 --- a/user/mesa/APKBUILD +++ b/user/mesa/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mesa pkgver=18.3.2 -pkgrel=0 +pkgrel=2 pkgdesc="Mesa DRI OpenGL library" url="https://www.mesa3d.org" arch="all" -license="MIT AND X11 AND SGI-B-2.0 AND BSL-1.0" +license="MIT AND X11 AND SGI-B-2.0 AND BSL-1.0 AND LGPL-2.1+" depends= subpackages="$pkgname-dev $pkgname-dri-ati:_dri @@ -29,6 +29,7 @@ source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz amdgpu-pthread-header.patch disk_cache-stack-overflow.patch drmdeps.patch + fix-non-altivec-ppc32.patch " _dri_driverdir=/usr/lib/xorg/modules/dri @@ -47,8 +48,9 @@ x86* | pmmx) _vulkan_drivers="${_vulkan_drivers},intel" subpackages="$subpackages $pkgname-dri-intel:_dri $pkgname-dri-vmwgfx:_dri" ;; -arm*) +aarch64 | arm*) _gallium_drivers="${_gallium_drivers},vc4" + subpackages="$subpackages $pkgname-dri-vc4:_dri" case "$CARCH" in armhf) CFLAGS="$CFLAGS -mfpu=neon";; esac @@ -221,6 +223,9 @@ _dri() { swrast) _mv_dri swrast_dri kms_swrast_dri && _mv_gpipe swrast ;; + vc4) + _mv_dri vc4_dri + ;; vmwgfx) _mv_dri vmwgfx_dri && _mv_gpipe vmwgfx ;; @@ -235,4 +240,5 @@ sha512sums="34b66520728d720b1f3d3d63f8ba5c255d57b9e8fe427264419e4163b474df662ff6 c7d91a660a033df91fac9c557039efc8669f0c26b2d35997d50753938b70d1af0bd110dcab3f8236eafab7d4be5dd7cd128a3e057e67e7e6a38a73fd6a7ef62e musl-fix-includes.patch 245d0d64d858dfadeeb544f31f7d0bb6ecb746a7fd5ec99755d679ae1a1eef4198d66473fb24d333eb6786bb8657012771e8285d67f165dc61a031df801947aa amdgpu-pthread-header.patch f40ff04ac73c090c74d1955de6013c5aa41fb77f28b2b82d89cfc1880306a9ca1dde4581592db19f0a0ec6d85032f1ed5d953103ab0d075f9f0b7e459a028c45 disk_cache-stack-overflow.patch -6800bc62aebfba22a2562c858c27391b47c5675020bd67f040da93ffe4d5d8ac828907a44c7cee6a4ebe63821b58c2515b4012f1f23473670b1de8670426a430 drmdeps.patch" +6800bc62aebfba22a2562c858c27391b47c5675020bd67f040da93ffe4d5d8ac828907a44c7cee6a4ebe63821b58c2515b4012f1f23473670b1de8670426a430 drmdeps.patch +71a397cf9937e623d21abacb2726602f1b5165b18543e11fdfdaac748c221aeafbbda790492a2180b590dace9a17c931c1eac199de32e90c3fa3305706a4011f fix-non-altivec-ppc32.patch" diff --git a/user/mesa/fix-non-altivec-ppc32.patch b/user/mesa/fix-non-altivec-ppc32.patch new file mode 100644 index 000000000..846cf5031 --- /dev/null +++ b/user/mesa/fix-non-altivec-ppc32.patch @@ -0,0 +1,66 @@ +--- mesa-18.3.2/src/util/u_cpu_detect.c.old 2019-01-17 11:26:23.000000000 +0000 ++++ mesa-18.3.2/src/util/u_cpu_detect.c 2019-02-22 19:23:26.620000000 +0000 +@@ -41,6 +41,9 @@ + #if defined(PIPE_ARCH_PPC) + #if defined(PIPE_OS_APPLE) + #include <sys/sysctl.h> ++#elif defined(PIPE_OS_LINUX) ++#include <asm/cputable.h> ++#include <linux/auxvec.h> + #else + #include <signal.h> + #include <setjmp.h> +@@ -92,7 +95,7 @@ + #endif + + +-#if defined(PIPE_ARCH_PPC) && !defined(PIPE_OS_APPLE) ++#if defined(PIPE_ARCH_PPC) && !defined(PIPE_OS_APPLE) && !defined(PIPE_OS_LINUX) + static jmp_buf __lv_powerpc_jmpbuf; + static volatile sig_atomic_t __lv_powerpc_canjump = 0; + +@@ -126,7 +129,43 @@ + util_cpu_caps.has_altivec = 1; + } + } +-#else /* !PIPE_OS_APPLE */ ++#elif defined(PIPE_OS_LINUX) ++ /* Taken from FFmpeg 4.1.1 (LGPL-2.1+) */ ++ // The linux kernel could have the altivec support disabled ++ // even if the cpu has it. ++ int i, ret = 0; ++ int fd = open("/proc/self/auxv", O_RDONLY); ++ unsigned long buf[64] = { 0 }; ++ ssize_t count; ++ boolean enable_vsx = TRUE; ++ /* VSX instructions can be explicitly enabled/disabled via GALLIVM_VSX=1 or 0 */ ++ char *env_vsx = getenv("GALLIVM_VSX"); ++ if (env_vsx && env_vsx[0] == '0') { ++ enable_vsx = FALSE; ++ } ++ ++ if (fd < 0) ++ return 0; ++ ++ while ((count = read(fd, buf, sizeof(buf))) > 0) { ++ for (i = 0; i < count / sizeof(*buf); i += 2) { ++ if (buf[i] == AT_NULL) ++ goto out; ++ if (buf[i] == AT_HWCAP) { ++ if (buf[i + 1] & PPC_FEATURE_HAS_ALTIVEC) ++ util_cpu_caps.has_altivec = 1; ++#ifdef PPC_FEATURE_HAS_VSX ++ if (enable_vsx && buf[i + 1] & PPC_FEATURE_HAS_VSX) ++ util_cpu_caps.has_vsx = 1; ++#endif ++ goto out; ++ } ++ } ++ } ++ ++out: ++ close(fd); ++#else /* !PIPE_OS_APPLE, !PIPE_OS_LINUX */ + /* not on Apple/Darwin, do it the brute-force way */ + /* this is borrowed from the libmpeg2 library */ + signal(SIGILL, sigill_handler); diff --git a/user/qastools/APKBUILD b/user/qastools/APKBUILD new file mode 100644 index 000000000..1e35fe052 --- /dev/null +++ b/user/qastools/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=qastools +pkgver=0.21.0 +pkgrel=0 +pkgdesc="ALSA mixer and utilities for Qt" +url="https://xwmw.org/qastools/index.html" +arch="all" +license="GPL-3.0-only" +depends="bash" +makedepends="alsa-lib-dev cmake eudev-dev qt5-qtbase-dev qt5-qtsvg-dev + qt5-qttools-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://downloads.sourceforge.net/qastools/qastools_$pkgver.tar.xz" +builddir="$srcdir/${pkgname}_${pkgver}" +langdir="/usr/share/qastools/l10n" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="17c837ef508a5bf1853f597abd38c3c950914c8cefe98f83a47a911462e1da11f410e3fe3f8426e3f17a3aac8980ee6459f50de2480120813202b342a1e3509b qastools_0.21.0.tar.xz" diff --git a/user/rust/APKBUILD b/user/rust/APKBUILD index 1921a4306..8534e1112 100644 --- a/user/rust/APKBUILD +++ b/user/rust/APKBUILD @@ -115,7 +115,7 @@ build() { codegen-units = 1 debuginfo = true debuginfo-lines = true - debuginfo-only-std = false + debuginfo-only-std = true debuginfo-tools = true use-jemalloc = false backtrace = true @@ -138,6 +138,7 @@ build() { check() { cd "$builddir" + RUST_BACKTRACE=1 \ ./x.py test -j ${JOBS:-2} --no-doc --no-fail-fast \ src/test/codegen \ src/test/codegen-units \ @@ -301,9 +302,9 @@ _mv() { mv "$@" } sha512sums="d6688711452295c41468af214f036499074d82fbeedc3f03560275219c2fae910e623e38e3210176d86f78ba5533ea098da5ff21532c8ad1a5aac132bb74ee02 rustc-1.31.1-src.tar.xz -c414a250edcf5b9c390137a01dc728f22e3067adab43f91bc06a4bed7580bf0e6171e4a844167b5c4bc13774c9ef9e33e1f5cab018dac8b3df6d630a9a163e2c cargo-0.31.0-powerpc64-foxkit-linux-musl.tar.xz -c6eeb91d7de95401d118d287435ac24e014711f73e86fab7da0a082d7cf03abfe137563cfe6a88b1309cdb0fec11acfceac01cc3bbc2e83650026230ce0cf079 rust-std-1.30.1-powerpc64-foxkit-linux-musl.tar.xz -f6099a632de0b4201c3d4639a9c32244fb2fccee891af13fc7efdbaf546e37a67c80b0bce92a19ad746349c59a3627fded64ebcace34fb33c2773bb4aa799cfb rustc-1.30.1-powerpc64-foxkit-linux-musl.tar.xz +16596561ff87c66f64f4b40602184355d3695822b9b9e6e0e929f340664718698e6f5b378c9162b48f9cb180be5fd8e583e5e51a1c57c1cd55dcc80f468cb509 cargo-0.31.0-powerpc-foxkit-linux-musl.tar.xz +cdfc7a3d51d66338f31007daafab95570e4e465983add99db7a45f1a3e601588b19e1257fe3e7fcc6b7104ba445add2fa1cda71325a9ab6d196b4ad0dcef2fb5 rust-std-1.30.1-powerpc-foxkit-linux-musl.tar.xz +190ed9d84513a229f389fc5d1bf0b8e22202bd3b9802330ee2844c436ae13700bdaded091498be4f2c4c65b2f6ef55c1e2db41a918747ac60e8e11e331be2c29 rustc-1.30.1-powerpc-foxkit-linux-musl.tar.xz acab7c5ffa73cd83cf3ae23e69d2c05ccc3ca03aa4d5a15179af76f2e75b7c5a1bc8d2969c0a9a4b5ad36a50a8cce283e62db878797be6d0da252b414de004cd 0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch f9773277e91e91d0bd6749890b8d332a86522927d90548af02892c6d01b8fbb3b234993eec8e5b8d6a3b6f1cec310a112e274f47f70d30829ca61a0da8d45bb5 0002-Fix-LLVM-build.patch 9e87964d41e14f70acc1961a0162bbf3ebca73f1c2b2842c3b1c8b65776466c9299d6974fc6b94a4e06547ae8ce638c28cdedf24eeb2616976f9dd727b989c13 0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch diff --git a/user/wireguard-module-power8-64k/APKBUILD b/user/wireguard-module-power8-64k/APKBUILD new file mode 100644 index 000000000..09a54843d --- /dev/null +++ b/user/wireguard-module-power8-64k/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Luis Ressel <aranea@aixah.de> +# Maintainer: Luis Ressel <aranea@aixah.de> +# KEEP THIS IN SYNC with the other wireguard-module packages. +_kflavour="-power8-64k" +_kver="4.14.88-mc13" +pkgver=0.0.20190123 +pkgrel=0 +_pkgname="wireguard-module$_kflavour" +pkgname="$_pkgname-$_kver" +_pkgreal="WireGuard" +pkgdesc="Kernel module for the WireGuard VPN, built for easy-kernel" +url="https://www.wireguard.com/" +arch="ppc64" +options="!check !dbg !strip" # no test suite +license="GPL-2.0-only" +provides="$_pkgname=$pkgver" +depends="easy-kernel$_kflavour-modules-$_kver" +makedepends="easy-kernel$_kflavour-src-$_kver" +source="https://git.zx2c4.com/WireGuard/snapshot/$_pkgreal-$pkgver.tar.xz" +builddir="$srcdir/$_pkgreal-$pkgver" + +prepare() { + cd "$builddir" + sed -i -e '/depmod/d' src/Makefile # temporary hack +} + +build() { + cd "$builddir" + make -C src LDFLAGS="" KERNELDIR="/usr/src/linux-$_kver$_kflavour" module +} + +package() { + cd "$builddir" + make -C src KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install +} + +sha512sums="8be40cebabca2a40f98ee10d6fa93708b12b17c6b0eab9aa8b7fab353d78fbd5b280b7b90cb2973cf74a1b9d47c3d250bf3ede6d1318129a45d57e21329b7f59 WireGuard-0.0.20190123.tar.xz" diff --git a/user/wireguard-module-power8/APKBUILD b/user/wireguard-module-power8/APKBUILD new file mode 100644 index 000000000..0619c09a4 --- /dev/null +++ b/user/wireguard-module-power8/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Luis Ressel <aranea@aixah.de> +# Maintainer: Luis Ressel <aranea@aixah.de> +# KEEP THIS IN SYNC with the other wireguard-module packages. +_kflavour="-power8" +_kver="4.14.88-mc13" +pkgver=0.0.20190123 +pkgrel=0 +_pkgname="wireguard-module$_kflavour" +pkgname="$_pkgname-$_kver" +_pkgreal="WireGuard" +pkgdesc="Kernel module for the WireGuard VPN, built for easy-kernel" +url="https://www.wireguard.com/" +arch="ppc64" +options="!check !dbg !strip" # no test suite +license="GPL-2.0-only" +provides="$_pkgname=$pkgver" +depends="easy-kernel$_kflavour-modules-$_kver" +makedepends="easy-kernel$_kflavour-src-$_kver" +source="https://git.zx2c4.com/WireGuard/snapshot/$_pkgreal-$pkgver.tar.xz" +builddir="$srcdir/$_pkgreal-$pkgver" + +prepare() { + cd "$builddir" + sed -i -e '/depmod/d' src/Makefile # temporary hack +} + +build() { + cd "$builddir" + make -C src LDFLAGS="" KERNELDIR="/usr/src/linux-$_kver$_kflavour" module +} + +package() { + cd "$builddir" + make -C src KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install +} + +sha512sums="8be40cebabca2a40f98ee10d6fa93708b12b17c6b0eab9aa8b7fab353d78fbd5b280b7b90cb2973cf74a1b9d47c3d250bf3ede6d1318129a45d57e21329b7f59 WireGuard-0.0.20190123.tar.xz" diff --git a/user/wireguard-module/APKBUILD b/user/wireguard-module/APKBUILD index b1801f7f1..d5c59a7b9 100644 --- a/user/wireguard-module/APKBUILD +++ b/user/wireguard-module/APKBUILD @@ -1,10 +1,12 @@ # Contributor: Luis Ressel <aranea@aixah.de> # Maintainer: Luis Ressel <aranea@aixah.de> -_kernelver="4.14.88-mc13" +# KEEP THIS IN SYNC with the other wireguard-module packages. +_kflavour="" +_kver="4.14.88-mc13" pkgver=0.0.20190123 pkgrel=0 -_pkgname="wireguard-module" -pkgname="$_pkgname-$_kernelver" +_pkgname="wireguard-module$_kflavour" +pkgname="$_pkgname-$_kver" _pkgreal="WireGuard" pkgdesc="Kernel module for the WireGuard VPN, built for easy-kernel" url="https://www.wireguard.com/" @@ -12,8 +14,8 @@ arch="all" options="!check !dbg !strip" # no test suite license="GPL-2.0-only" provides="$_pkgname=$pkgver" -depends="easy-kernel-modules-$_kernelver" -makedepends="easy-kernel-src-$_kernelver" +depends="easy-kernel$_kflavour-modules-$_kver" +makedepends="easy-kernel$_kflavour-src-$_kver" source="https://git.zx2c4.com/WireGuard/snapshot/$_pkgreal-$pkgver.tar.xz" builddir="$srcdir/$_pkgreal-$pkgver" @@ -24,12 +26,12 @@ prepare() { build() { cd "$builddir" - make -C src LDFLAGS="" KERNELDIR="/usr/src/linux-$_kernelver" module + make -C src LDFLAGS="" KERNELDIR="/usr/src/linux-$_kver$_kflavour" module } package() { cd "$builddir" - make -C src KERNELDIR="/usr/src/linux-$_kernelver" INSTALL_MOD_PATH="$pkgdir" module-install + make -C src KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install } sha512sums="8be40cebabca2a40f98ee10d6fa93708b12b17c6b0eab9aa8b7fab353d78fbd5b280b7b90cb2973cf74a1b9d47c3d250bf3ede6d1318129a45d57e21329b7f59 WireGuard-0.0.20190123.tar.xz" diff --git a/user/wxwidgets/APKBUILD b/user/wxwidgets/APKBUILD new file mode 100644 index 000000000..51b93f709 --- /dev/null +++ b/user/wxwidgets/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=wxwidgets +pkgver=3.1.2 +pkgrel=0 +pkgdesc="C++ library for creating applications" +url="https://www.wxwidgets.org/" +arch="all" +options="!check" # Test suite requires X11. Passes on gwyn except wxHTML. +license="LGPL-2.1-only WITH wx-exception" +depends="" +checkdepends="adwaita-icon-theme ttf-liberation" +makedepends="glu-dev gstreamer-dev gst-plugins-base-dev gtk+3.0-dev + libexecinfo-dev libjpeg-turbo-dev libnotify-dev libsecret-dev libsm-dev + mesa-dev tiff-dev zlib-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2" +builddir="$srcdir/wxWidgets-$pkgver" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --disable-xlocale + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="e0c6cc58f87c7534be100b098b6db4c5a7a6b7972a8ccc0573dc38cda1b098e1d9f3ea541771173889806f093b4fb5bc0f2b57952eedf907fe7e5d7c01840cf6 wxWidgets-3.1.2.tar.bz2" |