diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index 784db0e7..3a7919c9 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -41,6 +41,7 @@ jobs: language= '' model = '' version = '' + kernel = '' addons = '' modules = '' try: @@ -51,6 +52,7 @@ jobs: language = jsonbody.get('language', '') model = jsonbody.get('model', '') version = jsonbody.get('version', '') + kernel = jsonbody.get('kernel', '') addons = jsonbody.get('addons', '') modules = jsonbody.get('modules', '') except ValueError as e: @@ -67,6 +69,7 @@ jobs: set_output("language", language) set_output("model", model) set_output("version", version) + set_output("kernel", kernel) set_output("addons", addons) set_output("modules", modules) @@ -196,12 +199,26 @@ jobs: exit 1 fi + if [ -n "${{ env.kernel }}" ]; then + echo -en "set kernel" + USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml" + writeConfigKey "kernel" "${{ env.kernel }}" "${USER_CONFIG_FILE}" + echo "" + fi + sudo ./localbuild.sh config "${MODEL}" "${VERSION}" if [ $? -ne 0 ]; then echo "config failed" exit 1 fi + if [ -n "${{ env.kernel }}" ]; then + echo -en "set kernel" + USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml" + writeConfigKey "kernel" "${{ env.kernel }}" "${USER_CONFIG_FILE}" + echo "" + fi + if [ -n "${{ env.addons }}" ]; then echo -en "set addons" USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml" @@ -214,7 +231,8 @@ jobs: done echo "" fi - if [ -n "${{ env.modules }}" ]; then + + if [ ! "custom" = "${{ env.kernel }}" ] && [ -n "${{ env.modules }}" ]; then echo -en "set modules" USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml" writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}" @@ -250,9 +268,11 @@ jobs: echo "" >> README.txt echo "DSM:" >> README.txt - echo " MODEL: $(readConfigKey "model" "${USER_CONFIG_FILE}")" >> README.txt - echo " PATURL: $(readConfigKey "paturl" "${USER_CONFIG_FILE}")" >> README.txt - echo " PATSUM: $(readConfigKey "patsum" "${USER_CONFIG_FILE}")" >> README.txt + echo " MODEL: $(readConfigKey "model" "${USER_CONFIG_FILE}")" >> README.txt + echo " VERSION: $(readConfigKey "productver" "${USER_CONFIG_FILE}")" >> README.txt + echo " KERNEL: $(readConfigKey "kernel" "${USER_CONFIG_FILE}")" >> README.txt + echo " PATURL: $(readConfigKey "paturl" "${USER_CONFIG_FILE}")" >> README.txt + echo " PATSUM: $(readConfigKey "patsum" "${USER_CONFIG_FILE}")" >> README.txt echo "" >> README.txt echo "" >> README.txt diff --git a/docs/issues.html b/docs/issues.html index 95139a04..86ef2baf 100644 --- a/docs/issues.html +++ b/docs/issues.html @@ -65,6 +65,7 @@ $("#model").on("change", changeModel); $("#version").on("change", changeVersion); $("#language").on("change", changeVersion); + $("#kernel").on("change", chanageKernel); $('#addons').val("acpid,mountloader,reboottoloader"); setModels(); }); @@ -112,6 +113,7 @@ function changeVersion() { createAddonsBtn(); createModulesBtn(); + chanageKernel(); } function createAddonsBtn() { var language = $("#language").val(); @@ -159,6 +161,24 @@ $('#modules').val(extstr.join(",")); } } + + function chanageKernel() { + var model = $("#model").val(); + var version = $("#version").val(); + var kernel = $("#kernel").val(); + if (model == "SA6400" && version == "7.2") { + $("#kernel_item").show(); + if (kernel == "custom") { + $('#modules_item').hide(); + } else { + $('#modules_item').show(); + } + } else { + $('#modules_item').show(); + $("#kernel_item").hide(); + } + } + function onclickext(type, ext) { var btnobj = $("#btn_" + ext); var extstr = $('#' + type).val().split(","); @@ -185,9 +205,10 @@ let formData = new FormData(form); var title = "custom"; var body = {}; - var _parameters = ["title", "format", "language", "model", "version", "addons", "modules"]; + var _parameters = ["title", "format", "language", "model", "version", "kernel", "addons", "modules"]; for (var key in _parameters) { var name = _parameters[key]; + if ($("#" + name).is(":hidden")) { continue; } if (name == "title") { if ($("#" + name).val()) { title += " " + $("#" + name).val(); @@ -248,16 +269,17 @@ -