VIM3/3L: don't install dt-overlay package for mainline

Signed-off-by: Nick Xie <nick@khadas.com>
khadas · May 23, 2024 · 506d351 · 506d351
1 parent 6b52402
commit 506d351
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/config/boards/VIM3.conf b/config/boards/VIM3.conf
@@ -62,6 +62,7 @@ case "$LINUX" in
 		GPU_TYPE=""
 		MODESETTING_CONF="01-panfrost.conf"
 		BOOT_ENV_FILE_EXT="VIM3_env_ext.txt"
+		SKIP_DT_OVERLAY_PACKAGE="yes"
 		;;
 	5.15)
 		LINUX_DTB="$LINUX_COMMON_DRIVERS_DIR/arch/arm64/boot/dts/amlogic/kvim3.dtb"

diff --git a/config/boards/VIM3L.conf b/config/boards/VIM3L.conf
@@ -62,6 +62,7 @@ case "$LINUX" in
 		GPU_TYPE=""
 		MODESETTING_CONF=""
 		BOOT_ENV_FILE_EXT="VIM3L_env_ext.txt"
+		SKIP_DT_OVERLAY_PACKAGE="yes"
 		;;
 	5.15)
 		LINUX_DTB="$LINUX_COMMON_DRIVERS_DIR/arch/arm64/boot/dts/amlogic/kvim3l.dtb"

diff --git a/config/functions/build-common-deb b/config/functions/build-common-deb
@@ -16,11 +16,13 @@ build_common_deb() {
 	rm -rf $BUILD/.stamps/wiringpi_debs
 	build_package "wiringpi_debs:target"
 
-	info_msg "Building DT Overlays packages..."
-	# FIXME
-	# remove build stamp to force build for other arch
-	rm -rf $BUILD/.stamps/dt-overlays-debs
-	build_package "dt-overlays-debs:target"
+	if [ "$SKIP_DT_OVERLAY_PACKAGE" != "yes" ]; then
+		info_msg "Building DT Overlays packages..."
+		# FIXME
+		# remove build stamp to force build for other arch
+		rm -rf $BUILD/.stamps/dt-overlays-debs
+		build_package "dt-overlays-debs:target"
+	fi
 }
 
 ## Build common deb package
@@ -37,10 +39,11 @@ install_common_deb() {
 		install_deb_chroot $BUILD_DEBS/$VERSION/$KHADAS_BOARD/${DISTRIBUTION}-${DISTRIB_RELEASE}/wiringpi_debs/python3-wiringpi_*.deb
 	fi
 
-	# Install DT Overlays in chroot
-	if [ -n "$(ls $BUILD_DEBS/$VERSION/$KHADAS_BOARD/${DISTRIBUTION}-${DISTRIB_RELEASE}/dt-overlays-debs/ -1)" ]; then
-		info_msg "Installing DT Overlays packages..."
-		install_deb_chroot $BUILD_DEBS/$VERSION/$KHADAS_BOARD/${DISTRIBUTION}-${DISTRIB_RELEASE}/dt-overlays-debs/*.deb
+	if [ "$SKIP_DT_OVERLAY_PACKAGE" != "yes" ]; then
+		# Install DT Overlays in chroot
+		if [ -n "$(ls $BUILD_DEBS/$VERSION/$KHADAS_BOARD/${DISTRIBUTION}-${DISTRIB_RELEASE}/dt-overlays-debs/ -1)" ]; then
+			info_msg "Installing DT Overlays packages..."
+			install_deb_chroot $BUILD_DEBS/$VERSION/$KHADAS_BOARD/${DISTRIBUTION}-${DISTRIB_RELEASE}/dt-overlays-debs/*.deb
+		fi
 	fi
-
 }