diff --git a/device/testing/linux-htc-memul/APKBUILD b/device/testing/linux-htc-memul/APKBUILD index 4ffda82bf..735de4f11 100644 --- a/device/testing/linux-htc-memul/APKBUILD +++ b/device/testing/linux-htc-memul/APKBUILD @@ -3,7 +3,7 @@ pkgname=linux-htc-memul pkgver=3.4.113 -pkgrel=1 +pkgrel=2 pkgdesc="HTC One Mini 2 kernel fork" arch="armv7" _carch="arm" @@ -24,6 +24,7 @@ source=" gcc8-fix-put-user.patch gcc10-extern_YYLOC_global_declaration.patch kernel-use-the-gnu89-standard-explicitly.patch + linux3.4-ptrace-fix-ptrace-defect-cause-by-a-merge-fail.patch 0001-undefine-DIAG_XPST.patch 0002-fix-video-argb-setting.patch " @@ -57,5 +58,6 @@ dc4f519ec1ed4f642d281d89513b4eb2611feea72c1ff64c7da104d66ce497dbfddd3998f566e8b9 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch ad0182a483791fc88e058838bc331b2f04a75ba291e763767babdb815efadfc3b4fda97e69e2e3f00a426cabea088e35297a92bd287592597d1e309be68ee92c kernel-use-the-gnu89-standard-explicitly.patch +13f82d1ca9b621f026f12f91bbe03d913be41ebed717e9c657e0f3a4d39c0201ba651a7352c2d27b98bb6641b77ccc1b3ee7d4a7c9e91ddb1e347adcb5c9a780 linux3.4-ptrace-fix-ptrace-defect-cause-by-a-merge-fail.patch b98c43fd812329b9f3ac6df6810a24fb1a72a4d8476b7dcf2209ce56a3e5b5fe115b97f2e906cdbecdd46d7229688aae8de85932c1308aba6e8a47cb00fd8dda 0001-undefine-DIAG_XPST.patch 173af2c693d986a2892d7afc22568c3c692644a23245c0e55b4835b9c2f1e3731fbb5085183663741408a3ec9e128f9ba5390c92aea471d64b062cff4de3656f 0002-fix-video-argb-setting.patch" diff --git a/device/testing/linux-htc-memul/linux3.4-ptrace-fix-ptrace-defect-cause-by-a-merge-fail.patch b/device/testing/linux-htc-memul/linux3.4-ptrace-fix-ptrace-defect-cause-by-a-merge-fail.patch new file mode 120000 index 000000000..a129e5325 --- /dev/null +++ b/device/testing/linux-htc-memul/linux3.4-ptrace-fix-ptrace-defect-cause-by-a-merge-fail.patch @@ -0,0 +1 @@ +../../.shared-patches/linux/linux3.4-ptrace-fix-ptrace-defect-cause-by-a-merge-fail.patch \ No newline at end of file