Merge branch 'master' into chore/add-bigtreetech-cb1

mainsail-crew · Mar 26, 2024 · d93a557 · d93a557
2 parents 7427b67 + 34ec673
commit d93a557
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 36 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -190,8 +190,7 @@ jobs:
           source ./build-configs/configs-orangepi/board-${{ matrix.configfile }}.conf
 
           NOW="$(date +"%Y-%m-%d")"
-          VERSION=$(cat ./build/VERSION)
-          IMAGE="${NOW}-orangepi-${VERSION}-${{ matrix.configfile }}"
+          IMAGE="${NOW}-orangepi-${{ matrix.configfile }}"
 
           WORKSPACE=$(echo ${{ github.workspace }})
           cd $WORKSPACE/build/output/images/

diff --git a/actions/build-orangepi-image/action.yml b/actions/build-orangepi-image/action.yml
@@ -28,47 +28,27 @@ runs:
         source ./build-configs/configs-orangepi/config-default.conf
         source ./build-configs/configs-orangepi/board-${{ inputs.configfile }}.conf
         
-        echo "armbian_repository=${ARMBIAN_REPOSITORY}" >> $GITHUB_OUTPUT
-        echo "armbian_branch=${ARMBIAN_BRANCH}" >> $GITHUB_OUTPUT
-        
         echo "orangepi_repository=${ORANGEPI_REPOSITORY}" >> $GITHUB_OUTPUT
         echo "orangepi_branch=${ORANGEPI_BRANCH}" >> $GITHUB_OUTPUT
 
-    - name: Checkout armbian Repository
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 1
-        repository: ${{ steps.config.outputs.armbian_repository }}
-        ref: ${{ steps.config.outputs.armbian_branch }}
-        path: build
-
     - name: Checkout Custom Copy Repository
       uses: actions/checkout@v4
       with:
         fetch-depth: 1
         repository: ${{ steps.config.outputs.orangepi_repository }}
         ref: ${{ steps.config.outputs.orangepi_branch }}
-        path: orangepi-build
+        path: build
 
-    - name: Copy OrangePI Repository to armbian/build
+    - name: Create config file
       shell: bash
       run: |
-        cp -R ./orangepi-build/* ./build/
         mkdir -p ./build/userpatches
         cp ./build-configs/configs-orangepi/config-default.conf ./build/userpatches/config-settings.conf
         cat ./build-configs/configs-orangepi/board-${{ inputs.configfile }}.conf >> ./build/userpatches/config-settings.conf
         echo "::group::Output config-settings.conf"
         cat ./build/userpatches/config-settings.conf
         echo "::endgroup::"
 
-    - name: sed VERSION
-      shell: bash
-      run: |
-        sed -i 's/-trunk//' ./build/VERSION
-        echo "::group::Output VERSION"
-        cat ./build/VERSION
-        echo "::endgroup::"
-
     - name: Build Image
       shell: bash
       run: |

diff --git a/configs-orangepi/board-orangepi_zero3_1500mb_bookworm.conf b/configs-orangepi/board-orangepi_zero3_1500mb_bookworm.conf
@@ -1,4 +1,3 @@
 BOARD=orangepizero3
 RELEASE=bookworm
-BRANCH=next
 MEM_TYPE=1500MB
diff --git a/configs-orangepi/board-orangepi_zero3_1500mb_bullseye.conf b/configs-orangepi/board-orangepi_zero3_1500mb_bullseye.conf
@@ -1,3 +1,2 @@
 BOARD=orangepizero3
-BRANCH=next
 MEM_TYPE=1500MB
diff --git a/configs-orangepi/board-orangepi_zero3_others_bookworm.conf b/configs-orangepi/board-orangepi_zero3_others_bookworm.conf
@@ -1,4 +1,3 @@
 BOARD=orangepizero3
 RELEASE=bookworm
-BRANCH=next
 MEM_TYPE=Others
diff --git a/configs-orangepi/board-orangepi_zero3_others_bullseye.conf b/configs-orangepi/board-orangepi_zero3_others_bullseye.conf
@@ -1,3 +1,2 @@
 BOARD=orangepizero3
-BRANCH=next
 MEM_TYPE=Others
diff --git a/configs-orangepi/config-default.conf b/configs-orangepi/config-default.conf
@@ -1,7 +1,3 @@
-# armbian repo settings
-ARMBIAN_REPOSITORY="armbian/build"
-ARMBIAN_BRANCH="v24.02"
-
 # orangepi-build repo settings
 ORANGEPI_REPOSITORY="orangepi-xunlong/orangepi-build"
 ORANGEPI_BRANCH="next"
@@ -18,7 +14,7 @@ DEST_LANG="en_US.UTF-8"			# sl_SI.UTF-8, en_US.UTF-8
 
 EXTERNAL_NEW="prebuilt"			# compile and install or install prebuilt additional packages
 INSTALL_HEADERS=""			    # install kernel headers package
-LIB_TAG="${ARMBIAN_BRANCH}"	    # change to "branchname" to use any branch currently available.
+LIB_TAG="master"	            # change to "branchname" to use any branch currently available.
 USE_TORRENT="yes"			    # use torrent network for faster toolchain and cache download
 DOWNLOAD_MIRROR=""  			# set to "china" to use mirrors.tuna.tsinghua.edu.cn
 
@@ -41,4 +37,4 @@ BUILD_OPT=image
 BUILD_MINIMAL=no
 BUILD_DESKTOP=no
 BOOTFS_TYPE=fat
-REPOSITORY_INSTALL=img
+COMPRESS_OUTPUTIMAGE="no"
diff --git a/...angepi/board-orangepi_zero2_bookworm.conf → configs/board-orangepi_zero2_bookworm.conf b/...angepi/board-orangepi_zero2_bookworm.conf → configs/board-orangepi_zero2_bookworm.conf
@@ -1,3 +1,2 @@
 BOARD=orangepizero2
 RELEASE=bookworm
-BRANCH=next
diff --git a/...angepi/board-orangepi_zero2_bullseye.conf → configs/board-orangepi_zero2_bullseye.conf b/...angepi/board-orangepi_zero2_bullseye.conf → configs/board-orangepi_zero2_bullseye.conf
@@ -1,2 +1 @@
 BOARD=orangepizero2
-BRANCH=next