debug

tossp#64
dreamdalezhang · May 15, 2022 · f57b02a · f57b02a
1 parent f322e75
commit f57b02a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
@@ -33,6 +33,7 @@ if [ $# -eq 0 ];then
     fi
 
     echo "Lay back and enjoy the show: Magic is about to happen!"
+    env
     make build_all
     echo "The redpill bootloader is created, the container will be ended now."
     exit 0

diff --git a/extensions/redpill-misc.json b/extensions/redpill-misc.json
@@ -9,6 +9,10 @@
     "help_url": "https://github.com/pocopico/redpill-load/raw/develop/redpill-misc"
   },
   "releases": {
+    "ds1621p_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds1621p_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds1621p_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "ds2422p_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
     "ds3615xs_25556": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
     "ds3615xs_41222": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
     "ds3615xs_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
@@ -22,12 +26,6 @@
     "ds3622xsp_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
     "ds3622xsp_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
     "ds3622xsp_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds1621p_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds1621p_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds1621p_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "dva3221_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "dva3221_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "dva3221_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
     "ds918p_25556": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
     "ds918p_41890": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
     "ds918p_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
@@ -38,6 +36,8 @@
     "ds920p_42550": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
     "ds920p_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
     "ds920p_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
-    "ds2422p_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json"
+    "dva3221_42218": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "dva3221_42621": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json",
+    "dva3221_42661": "https://github.com/jumkey/redpill-load/raw/develop/redpill-misc/recipes/universal.json"
   }
 }
diff --git a/global_config.json b/global_config.json
@@ -264,6 +264,10 @@
       "redpill_load": {
         "source_url": "https://github.com/jumkey/redpill-load.git",
         "branch": "develop"
+      },
+      "build_env": {
+        "jun_mod": 1,
+        "debug": 1
       }
     },
     {
@@ -399,6 +403,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
@@ -108,6 +108,8 @@ function runContainer(){
         $( [ "${LOCAL_RP_LOAD_USE}" == "true" ] && echo "--volume $(realpath ${LOCAL_RP_LOAD_PATH}):/opt/redpill-load") \
         $( [ "${LOCAL_RP_LKM_USE}" == "true" ] && echo "--volume $(realpath ${LOCAL_RP_LKM_PATH}):/opt/redpill-lkm") \
         $( [ -e "${USER_CONFIG_JSON}" ] && echo "--volume $(realpath ${USER_CONFIG_JSON}):/opt/redpill-load/user_config.json") \
+        $( [ "${BUILD_LOADER_JUN_MOD}" == "1" ] && echo "--env BRP_JUN_MOD=1") \
+        $( [ "${BUILD_LOADER_DEBUG}" == "1" ] && echo "--env BRP_DEBUG=1") \
         --volume ${REDPILL_LOAD_CACHE}:/opt/redpill-load/cache \
         --volume ${REDPILL_LOAD_IMAGES}:/opt/redpill-load/images \
         --env REDPILL_LKM_MAKE_TARGET=${REDPILL_LKM_MAKE_TARGET} \
@@ -118,8 +120,6 @@ 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")
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,7 @@ if [ $# -eq 0 ];then @@
         fi
         echo "Lay back and enjoy the show: Magic is about to happen!"
+        env
         make build_all
         echo "The redpill bootloader is created, the container will be ended now."
         exit 0
@@ Expand Down @@