Browse Source

Merge pull request #28 from sboger/main

Fix build by specifying kernel 5.10.60
GNU 2 years ago
parent
commit
83a7bfc434

+ 18 - 8
Code/patch/armbian_build_a06/patch/README

@@ -1,4 +1,6 @@
-cd ~
+mkdir devterm-build
+cd devterm-build
+
 git clone https://github.com/armbian/build.git
 git clone https://github.com/clockworkpi/DevTerm.git
 
@@ -6,14 +8,22 @@ cd build
 
 git reset --hard 43d179914ae9e1ebb5d72315d9f9f68f5fb3e330
 
-git apply ~/DevTerm/Code/patch/armbian_build_a06/patch/armbian.patch
-git apply ~/DevTerm/Code/patch/armbian_build_a06/patch/armbian_mirror.patch
+git apply ../DevTerm/Code/patch/armbian_build_a06/patch/armbian.patch
+git apply ../DevTerm/Code/patch/armbian_build_a06/patch/armbian_mirror.patch
+
+mkdir -p userpatches/kernel/rockchip64-current/lib.config 
+mkdir -p userpatches/u-boot/u-boot-rockchip64-mainline/
+
+cp -f ../DevTerm/Code/patch/armbian_build_a06/patch/kernel*.patch userpatches/kernel/rockchip64-current/
+cp -f ../DevTerm/Code/patch/armbian_build_a06/patch/uboot*.patch userpatches/u-boot/u-boot-rockchip64-mainline/
+cp -f ../DevTerm/Code/patch/armbian_build_a06/patch/lib.config userpatches/
+cp -f ../DevTerm/Code/patch/armbian_build_a06/patch/clockworkpi-a06.conf config/boards/
+
 
-cp ~/DevTerm/Code/patch/armbian_build_a06/patch/kernel*.patch userpatches/kernel/rockchip64-current/
-cp ~/DevTerm/Code/patch/armbian_build_a06/patch/uboot*.patch userpatches/u-boot/u-boot-rockchip64-mainline/
+# Compile on a compatible ubuntu linux system:
+./compile.sh BOARD=clockworkpi-a06 BRANCH=current RELEASE=hirsute BUILD_MINIMAL=no BUILD_DESKTOP=yes KERNEL_ONLY=no KERNEL_CONFIGURE=no DESKTOP_ENVIRONMENT=xfce DESKTOP_ENVIRONMENT_CONFIG_NAME=config_base COMPRESS_OUTPUTIMAGE=sha,gpg,img
 
-cp ~/DevTerm/Code/patch/armbian_build_a06/patch/config-example.conf userpatches/
+# Compile on any system that user has docker commandline access.
+./compile.sh docker BOARD=clockworkpi-a06 BRANCH=current RELEASE=hirsute BUILD_MINIMAL=no BUILD_DESKTOP=yes KERNEL_ONLY=no KERNEL_CONFIGURE=no DESKTOP_ENVIRONMENT=xfce DESKTOP_ENVIRONMENT_CONFIG_NAME=config_base COMPRESS_OUTPUTIMAGE=sha,gpg,img
 
-#Then exec ./compile.sh under armbian build
-cd ~/build && ./compile.sh 
 

+ 1 - 0
Code/patch/armbian_build_a06/patch/lib.config

@@ -0,0 +1 @@
+KERNELBRANCH='tag:v5.10.60'