testing/erlang: Fixing os_mon issues

Removing pre-build "os_mon/ebin" files so they can be properly rebuilt without nteventlog.
Setting "disksup_posix_only=true" so functions that depend on get_disk_data, which depens on the "df" command, can work.

3 files changed, 38 insertions, 11 deletions

diff --git a/testing/erlang/0010-fix-nteventlog-remove.patch b/testing/erlang/0010-fix-nteventlog-remove.patch
index ed49b3ade..c3d066bdf 100644
--- a/testing/erlang/0010-fix-nteventlog-remove.patch
+++ b/testing/erlang/0010-fix-nteventlog-remove.patch
@@ -1,8 +1,8 @@
---- otp_src_18.0-orig/lib/os_mon/ebin/os_mon.app
-+++ otp_src_18.0-fixed/lib/os_mon/ebin/os_mon.app
+--- otp_src_18.0/lib/os_mon/src/os_mon.app.src
++++ otp_src_18.0-fixed/lib/os_mon/src/os_mon.app.src
 @@ -22,7 +22,7 @@
     [{description, "CPO  CXC 138 46"},
-     {vsn, "2.4"},
+     {vsn, "%VSN%"},
      {modules, [os_mon, os_mon_mib, os_sup,
 -               disksup, memsup, cpu_sup, os_mon_sysinfo, nteventlog]},
 +               disksup, memsup, cpu_sup, os_mon_sysinfo]},
diff --git a/testing/erlang/0060-set-disksup_posix_only-to-true.patch b/testing/erlang/0060-set-disksup_posix_only-to-true.patch
new file mode 100644
index 000000000..a32c60c20
--- /dev/null
+++ b/testing/erlang/0060-set-disksup_posix_only-to-true.patch
@@ -0,0 +1,22 @@
+--- otp_src_18.0/lib/os_mon/src/disksup.erl
++++ otp_src_18.0-fixed/lib/os_mon/src/disksup.erl
+@@ -87,7 +87,7 @@
+ 
+ param_default(disk_space_check_interval) -> 30;
+ param_default(disk_almost_full_threshold) -> 0.80;
+-param_default(disksup_posix_only) -> false.
++param_default(disksup_posix_only) -> true.
+ 
+ %%----------------------------------------------------------------------
+ %% gen_server callbacks
+--- otp_src_18.0/lib/os_mon/test/disksup_SUITE.erl
++++ otp_src_18.0-fixed/lib/os_mon/test/disksup_SUITE.erl
+@@ -337,7 +337,7 @@
+     [];
+ restart(Config) when is_list(Config) ->
+     ok = application:set_env(os_mon, start_disksup, true),
+-    ok = application:set_env(os_mon, disksup_posix_only, false),
++    ok = application:set_env(os_mon, disksup_posix_only, true),
+     {ok, _Pid} = supervisor:restart_child(os_mon_sup, disksup),
+     ok.
+ 
diff --git a/testing/erlang/APKBUILD b/testing/erlang/APKBUILD
index 79f025358..c4e04a235 100644
--- a/testing/erlang/APKBUILD
+++ b/testing/erlang/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=erlang
 pkgver=18.0.2
 _srcver=18.0
-pkgrel=0
+pkgrel=1
 pkgdesc="General-purpose programming language and runtime environment"
 url="http://www.erlang.org/"
 license="ASL 2.0"
@@ -77,13 +77,15 @@ source="http://www.erlang.org/download/otp_src_$_srcver.tar.gz
         0020-remove-private-unit32.patch
         0030-replace_glibc_check.patch
         0040-otp-update-version-18.0.1.patch
-        0050-otp-update-version-18.0.2.patch"
+        0050-otp-update-version-18.0.2.patch
+        0060-set-disksup_posix_only-to-true.patch"
 
 _builddir="$srcdir"/otp_src_$_srcver
 
 prepare() {
 	local i
 	cd "$_builddir"
+	rm lib/os_mon/ebin/*
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
@@ -217,11 +219,12 @@ ef4b726309a749010553259080960753  0002-Remove-rpath.patch
 f4aa0cc27dc57ea4dcd57191b1948a4d  0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
 37861f7e1e02993018d6751d0d7bb83c  0006-Do-not-install-erlang-sources.patch
 b438c37818b5c82443682c3693dd7e53  0007-Split-off-webtool-dependency-from-tools.patch
-fcb02f2cc2050789aa85f6f0084836c3  0010-fix-nteventlog-remove.patch
+0dd300003ff68fc46dc3c839c2541d53  0010-fix-nteventlog-remove.patch
 062605d7f01f4685f1897ba2decc23a8  0020-remove-private-unit32.patch
 7a5c956b7bf79e34a0f980d1e2a65bee  0030-replace_glibc_check.patch
 e621bd76d8e19af2d60e4d1a11ddbca3  0040-otp-update-version-18.0.1.patch
-4ade398725d713b5cf577c4c072c2d95  0050-otp-update-version-18.0.2.patch"
+4ade398725d713b5cf577c4c072c2d95  0050-otp-update-version-18.0.2.patch
+d17fbaafa9f7820ade09b239c00aede6  0060-set-disksup_posix_only-to-true.patch"
 sha256sums="a0b69da34b4f218eb7d63d9e96fc120aa7257bb6c37a0f40fb388e188b4111aa  otp_src_18.0.tar.gz
 536e78192f915733cbbb264883af6d9b11c9e70c2c4d3d825b58c4dbec36db86  0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
 b2e5844215d7f5f5026a77342dd698d16103cc726d23f8265bcc8399d1a82bb9  0002-Remove-rpath.patch
@@ -230,11 +233,12 @@ b2e5844215d7f5f5026a77342dd698d16103cc726d23f8265bcc8399d1a82bb9  0002-Remove-rp
 71c8a55fe036d5a04ba2c008b51d8950c3f18d83edaffb9bef2a9d19dd2f79f3  0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
 b810ef25504fbce3f9a0d4ae1e02fc4225b01fd68daa88566f6f8de37e26b351  0006-Do-not-install-erlang-sources.patch
 9704a53bc4bd6f5624f9ce3f201128204011f4579f19b547df74d92ae22777cf  0007-Split-off-webtool-dependency-from-tools.patch
-70dd9d1c4914ccecdbb3623ee23eb9ae3c8df8a5e40e2e0177c754440afe55f9  0010-fix-nteventlog-remove.patch
+019c62ea3fee60068caa8c3152d7f96e76591fc5dc096abfcea48ec1593eb758  0010-fix-nteventlog-remove.patch
 0b63ff5ce4e642d4225d5cc4d52d88dd5daf83ce5a2549ba0e5a14ce05e17ac2  0020-remove-private-unit32.patch
 e3158dbb4bcb4677ceda39a374326c069de78a52e598ef8169a288b86a040a62  0030-replace_glibc_check.patch
 a014ad5c5da2512672af7a98ca072d6aa2615af2d1cc8e67a6cc611096cc922a  0040-otp-update-version-18.0.1.patch
-c51691da93e54e6b42c234706070dae74079cea00e6b720c9513663b2d7ed0a8  0050-otp-update-version-18.0.2.patch"
+c51691da93e54e6b42c234706070dae74079cea00e6b720c9513663b2d7ed0a8  0050-otp-update-version-18.0.2.patch
+3ffda0b3acbde755b496c1a974c20e1ca580432c403944c1c16836f48e248429  0060-set-disksup_posix_only-to-true.patch"
 sha512sums="84ec2a3834270c1babe153572d6187faa36c12128e604037d55be01719788c0dd79d46769ea7090d530b746206a25fe02346b02849abee10ee41ed4ac7567c02  otp_src_18.0.tar.gz
 172f9b0f61748bf2f04737df0451bcc9c0812db0f365f0ef7c7c244fceb991987f79a5274eea578a89cc7d077f84645d1395d9dbcbf14010268b896a080c2ccf  0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
 97c40c185b71b23ffcb924639af390b9a0be897070e396a9413e193e6d43048dfe3b86bcd0c5598b81a66ce1349de9e09f5228a452b51b6612cd947bbafb6377  0002-Remove-rpath.patch
@@ -243,8 +247,9 @@ b174e3c9103aa26e3b4993ae77b849a55f733e6f8e5dd7bb641a8548aea7fcc91b99d772c91ff886
 923addcb1f6472829ba13ccc91ad3cef161f269478404f0a19bc4997118e06edd7459011a60769eb393eac930f30d4bd6c5526301382a5f9815862237f4664d3  0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
 20a7200fe811b5256ef89bcbf19dd6ebb29c7c9109311f6d3adca2ade42c13ca63a28ff8f3e49308feaeda1e30a4e3a7e1083edf57b42219d0794dddc0f4a464  0006-Do-not-install-erlang-sources.patch
 d65fcfc3a9441941c6292c33d354964a82da11cc7a411dd0440719e490075ed588c1e70690e80650561749010d737394567f12ff73bd460f0d00c792c77cfae3  0007-Split-off-webtool-dependency-from-tools.patch
-ccd876c5e3e370a3cd85907240546be6be124f8b38e19fae1b152f6858ebd3f4f7421931a8e314dddf019ed9c75cc453c08633b20fa08c05810f66c92725a3ed  0010-fix-nteventlog-remove.patch
+b7387f92f8c27a0565c7885bba4b357183c62d422616e073bc5ffad338a0e22cb5165dcb3b95bf0b920ba00831599f2216027883f4be255aa6f6150b68b7a37c  0010-fix-nteventlog-remove.patch
 18f70c3a99ac8c44bc9d90dc3f0c072ad4df4ffe57a8d0677087c9e940ba138d7a7698d5cdbbe14875a6012d353a679fdb33d40fca3a3211f712af8c4b0cb0b4  0020-remove-private-unit32.patch
 b554882bee1a70322cc8c5b973986047deaf4528fe1371df39cf72b27b2497a859463bdf8847ea6ea96cb0caaa6bd143c96a5dee28839164a547a66a30fcffd0  0030-replace_glibc_check.patch
 5f6f5856fc60f7bc333fb2736bcf0d8dd475658621bb8ded8a9f664bb045ba5b0768ec990a05e5c35c5dfaa284f10567ff61b7a3c521a907553561c50c068ad1  0040-otp-update-version-18.0.1.patch
-cae82f07a8eb811f47a2a7553626d536e16a368fe8292dcee6c991f4f069e7821e0a2310cc86f65313b87ac6691a406ca92fc36b7ab32079b060813602c9f16a  0050-otp-update-version-18.0.2.patch"
+cae82f07a8eb811f47a2a7553626d536e16a368fe8292dcee6c991f4f069e7821e0a2310cc86f65313b87ac6691a406ca92fc36b7ab32079b060813602c9f16a  0050-otp-update-version-18.0.2.patch
+f3c50f8610e08173c365a575737079b0259db6fc0dfa5b1be63c281b52358bbce9e2595132a8f6a06772785d7d38d108f8da8515e2f7706cd03b6585aab4d071  0060-set-disksup_posix_only-to-true.patch"