test

acceptin · May 14, 2022 · f322e75 · f322e75
1 parent 8f62284
commit f322e75
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/docker/Makefile b/docker/Makefile
@@ -34,11 +34,7 @@ build_redpill_load:
 	@read -a KVERS <<< "$$(modinfo --field=vermagic redpill-lkm/redpill.ko)" && \
 	cp -f $(REDPILL_LKM_SRC)/redpill.ko $(REDPILL_LOAD_SRC)/ext/rp-lkm/redpill-linux-v$${KVERS[0]}.ko
 	./helper.sh
-	@if [ "$(TARGET_NAME)" == "DS1621+" || "$(TARGET_NAME)" == "DS920+" || "$(TARGET_NAME)" == "DS3622xs+" ]; then \
-		pushd $(REDPILL_LOAD_SRC) &&  BRP_JUN_MOD=1 BRP_DEBUG=1 ./build-loader.sh '$(TARGET_NAME)' '$(TARGET_VERSION)-$(TARGET_REVISION)'; \
-	else \
-		pushd $(REDPILL_LOAD_SRC) && ./build-loader.sh '$(TARGET_NAME)' '$(TARGET_VERSION)-$(TARGET_REVISION)'; \
-	fi
+	pushd $(REDPILL_LOAD_SRC) && ./build-loader.sh '$(TARGET_NAME)' '$(TARGET_VERSION)-$(TARGET_REVISION)';
 
 
 .PHONY: build_all

diff --git a/global_config.json b/global_config.json
@@ -44,6 +44,10 @@
       "redpill_load": {
         "source_url": "https://github.com/jumkey/redpill-load.git",
         "branch": "develop"
+      },
+      "build_env": {
+        "jun_mod": 1,
+        "debug": 1
       }
     },
     {

diff --git a/redpill_tool_chain.sh b/redpill_tool_chain.sh
@@ -118,6 +118,8 @@ function runContainer(){
         --env REVISION="${TARGET_REVISION}" \
         --env LOCAL_RP_LKM_USE="${LOCAL_RP_LKM_USE}" \
         --env LOCAL_RP_LOAD_USE="${LOCAL_RP_LOAD_USE}" \
+        $( [ "${BUILD_LOADER_JUN_MOD}" == "1" ] && echo "--env BRP_JUN_MOD=1") \
+        $( [ "${BUILD_LOADER_DEBUG}" == "1" ] && echo "--env BRP_DEBUG=1") \
         ${DOCKER_IMAGE_NAME}:${ID} $( [ "${CMD}" == "run" ] && echo "/bin/bash") $( [ "${CMD}" == "pat" ] && echo "/opt/helper.sh")
 }
 
@@ -314,6 +316,9 @@ if [[ "${ACTION}" != "del" && "${ACTION}" != "add" && "${ACTION}" != "sn" && "${
     REDPILL_LOAD_REPO=$(getValueByJsonPath ".redpill_load.source_url" "${BUILD_CONFIG}")
     REDPILL_LOAD_BRANCH=$(getValueByJsonPath ".redpill_load.branch" "${BUILD_CONFIG}")
 
+    BUILD_LOADER_JUN_MOD=$(getValueByJsonPath ".build_env.jun_mod" "${BUILD_CONFIG}")
+    BUILD_LOADER_DEBUG=$(getValueByJsonPath ".build_env.debug" "${BUILD_CONFIG}")
+
     EXTRACTED_KSRC="/linux*"
     if [ "${COMPILE_WITH}" == "toolkit_dev" ]; then
         # TODO: fix: wait new toolkit