eudev: update build script

Signed-off-by: AuxXxilium <[email protected]>
AuxXxilium · Nov 27, 2023 · 50cb731 · 50cb731
1 parent 58d6b6c
commit 50cb731
Showing 1 changed file with 14 additions and 19 deletions.
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -48,8 +48,15 @@ jobs:
 
           git clone https://github.com/SynologyOpenSource/pkgscripts-ng.git ${ROOT_PATH}/pkgscripts-ng
           cd ${ROOT_PATH}/pkgscripts-ng
+          git checkout DSM${{ matrix.version }}
+          sudo ./EnvDeploy -v ${{ matrix.version }} -l  # Get Available platforms
           sudo ./EnvDeploy -q -v ${{ matrix.version }} -p ${{ matrix.platform }}
 
+          # Fault tolerance of pkgscripts-ng
+          if [ "${{ matrix.platform }}" == "broadwellntbap" -a "${{ matrix.version }}" == "7.1" ]; then
+            sed -i '/		broadwellnk	BROADWELLNK/a\		broadwellntbap  BROADWELLNTBAP                  linux-4.4.x             Intel Broadwell with ntb kernel config in AP mode' ${ROOT_PATH}/pkgscripts-ng/include/platforms
+          fi
+
           #ENV
           mkdir -p ${ROOT_PATH}/source
 
@@ -63,42 +70,30 @@ jobs:
           sed -i '/PLATFORM_FAMILY/a\\techo "PRODUCT=$PRODUCT" >> $file\n\techo "KSRC=$KERNEL_SEARCH_PATH" >> $file\n\techo "LINUX_SRC=$KERNEL_SEARCH_PATH" >> $file' include/build
           ./SynoBuild -c -p ${{ matrix.platform }}
 
-          while read -r line; do if [ ${line:0:1} != "#" ]; then export ${line%%=*}="${line#*=}"; fi; done < /env${BUILD_ARCH}.mak
+          while read line; do if [ ${line:0:1} != "#" ]; then export ${line%%=*}="${line#*=}"; fi; done < /env${BUILD_ARCH}.mak
           if [ -f "${KSRC}/Makefile" ]; then
             # gcc issue "unrecognized command-line option '--param=allow-store-data-races=0'".
             [ "${{ matrix.version }}" == "7.2" ] && sed -i 's/--param=allow-store-data-races=0/--allow-store-data-races/g' ${KSRC}/Makefile
 
-            VERSION=$(cat ${KSRC}/Makefile | grep ^VERSION | awk -F' ' '{print $3}')
-            PATCHLEVEL=$(cat ${KSRC}/Makefile | grep ^PATCHLEVEL | awk -F' ' '{print $3}')
-            SUBLEVEL=$(cat ${KSRC}/Makefile | grep ^SUBLEVEL | awk -F' ' '{print $3}')
+            VERSION=`cat ${KSRC}/Makefile | grep ^VERSION | awk -F' ' '{print $3}'`
+            PATCHLEVEL=`cat ${KSRC}/Makefile | grep ^PATCHLEVEL | awk -F' ' '{print $3}'`
+            SUBLEVEL=`cat ${KSRC}/Makefile | grep ^SUBLEVEL | awk -F' ' '{print $3}'`
             [ -f "/env32.mak" ] && echo "KVER=${VERSION}.${PATCHLEVEL}.${SUBLEVEL}" >> /env32.mak
             [ -f "/env64.mak" ] && echo "KVER=${VERSION}.${PATCHLEVEL}.${SUBLEVEL}" >> /env64.mak
-            CCVER=$($CC --version | head -n 1 | awk -F' ' '{print $3}')
+            CCVER=`$CC -v 2>&1 | tail -n 1 | awk -F' ' '{print $3}'`
             [ -f "/env32.mak" ] && echo "CCVER=${CCVER}" >> /env32.mak
             [ -f "/env64.mak" ] && echo "CCVER=${CCVER}" >> /env64.mak
           fi
           EOF
 
           [ -f ${ENV_PATH}/env64.mak ] && ENV_FILE=${ENV_PATH}/env64.mak || ([ -f ${ENV_PATH}/env32.mak ] && ENV_FILE=${ENV_PATH}/env32.mak)
           if [ -n "${ENV_FILE}" ]; then
-            KVER=$(grep 'KVER=' ${ENV_FILE} | awk -F'=' '{print $2}')
-            CCVER=$(grep 'CCVER=' ${ENV_FILE} | awk -F'=' '{print $2}')
+            KVER=`grep 'KVER=' ${ENV_FILE} | awk -F'=' '{print $2}'`
+            CCVER=`grep 'CCVER=' ${ENV_FILE} | awk -F'=' '{print $2}'`
             [ -n "${KVER}" ] && echo "KVER=${KVER}" >> $GITHUB_ENV
             [ -n "${CCVER}" ] && echo "CCVER=${CCVER}" >> $GITHUB_ENV
           fi
 
-      - name: Get Src
-        run: |
-          ROOT_PATH=${{ github.workspace }}
-
-          mkdir -p ${ROOT_PATH}/source/output
-
-          KVER=${{ env.KVER }}
-
-          sudo cp -a ${ROOT_PATH}/eudev/src ${ROOT_PATH}/source/input
-
-          sudo cp -a ${ROOT_PATH}/source ${ROOT_PATH}/build_env/ds.${{ matrix.platform }}-${{ matrix.version }}/
-
       - name: Make
         run: |
           ROOT_PATH=${{ github.workspace }}