Support building X11 with Buildroot optionally

Author: shengwen-tw

configs/x11.config

@@ -0,0 +1,35 @@
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_INSTALL_LIBSTDCPP=y
+BR2_PACKAGE_GLMARK2=y
+BR2_PACKAGE_KMSCUBE=y
+BR2_PACKAGE_MESA3D_DEMOS=y
+BR2_PACKAGE_MESA3D=y
+BR2_PACKAGE_MESA3D_GALLIUM_DRIVER=y
+BR2_PACKAGE_MESA3D_DRIVER=y
+BR2_PACKAGE_MESA3D_NEEDS_X11=y
+BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
+BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL=y
+BR2_PACKAGE_MESA3D_GBM=y
+BR2_PACKAGE_MESA3D_OPENGL_GLX=y
+BR2_PACKAGE_MESA3D_OPENGL_EGL=y
+BR2_PACKAGE_MESA3D_OPENGL_ES=y
+BR2_PACKAGE_PROVIDES_LIBGBM="mesa3d"
+BR2_PACKAGE_XORG7=y
+BR2_PACKAGE_XSERVER_XORG_SERVER=y
+BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR=y
+BR2_PACKAGE_XLIB_LIBX11=y
+BR2_PACKAGE_XAPP_TWM=y
+BR2_PACKAGE_XAPP_XAUTH=y
+BR2_PACKAGE_XAPP_XCLOCK=y
+BR2_PACKAGE_XAPP_XINIT=y
+BR2_PACKAGE_XDRIVER_XF86_INPUT_LIBINPUT=y
+BR2_PACKAGE_XTERM=y
+BR2_PACKAGE_EUDEV=y
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+BR2_PACKAGE_PROVIDES_UDEV="eudev"
+BR2_PACKAGE_HAS_UDEV=y
+BR2_PACKAGE_LIBGLEW=y
+BR2_PACKAGE_HAS_LIBGBM=y
+BR2_PACKAGE_HAS_LIBGLES=y
+BR2_PACKAGE_LIBINPUT=y
+BR2_PACKAGE_LIBDRI2=y

scripts/build-image.sh

@@ -31,6 +31,29 @@ function safe_copy {
     fi
 }
 
+function copy_buildroot_config
+{
+    local buildroot_config="configs/buildroot.config"
+    local x11_config="configs/x11.config"
+    local output_config="buildroot/.config"
+    local merge_tool="buildroot/support/kconfig/merge_config.sh"
+
+    if [ ! -f "$output_config" ]; then
+        echo "Preparing initial Buildroot config..."
+
+        # Check X11 option
+        if [[ $BUILD_X11 -eq 1 ]]; then
+            # Compile Buildroot with X11
+            "$merge_tool" -m -r -O buildroot "$buildroot_config" "$x11_config"
+        else
+            # Compile Buildroot without X11
+            cp -f "$buildroot_config" "$output_config"
+        fi
+    else
+        echo "$output_config already exists, skipping copy"
+    fi
+}
+
 function do_buildroot
 {
     if [ ! -d buildroot ]; then
@@ -40,7 +63,7 @@ function do_buildroot
         echo "buildroot/ already exists, skipping clone"
     fi
 
-    safe_copy configs/buildroot.config buildroot/.config
+    copy_buildroot_config
     safe_copy configs/busybox.config buildroot/busybox.config
     cp -f target/init buildroot/fs/cpio/init
 
@@ -94,6 +117,7 @@ Usage: $0 [--buildroot] [--linux] [--extra-packages] [--all] [--external-root] [
 
 Options:
   --buildroot         Build Buildroot rootfs
+  --x11               Build Buildroot with X11
   --extra-packages    Build extra packages along with Buildroot
   --linux             Build Linux kernel
   --all               Build both Buildroot and Linux kernel
@@ -105,8 +129,9 @@ EOF
 }
 
 BUILD_BUILDROOT=0
-BUILD_LINUX=0
+BUILD_X11=0
 BUILD_EXTRA_PACKAGES=0
+BUILD_LINUX=0
 EXTERNAL_ROOT=0
 CLEAN_BUILD=0
 
@@ -115,6 +140,9 @@ while [[ $# -gt 0 ]]; do
         --buildroot)
             BUILD_BUILDROOT=1
             ;;
+        --x11)
+            BUILD_X11=1
+            ;;
         --extra-packages)
             BUILD_EXTRA_PACKAGES=1
             ;;
@@ -193,6 +221,11 @@ if [[ $BUILD_EXTRA_PACKAGES -eq 1 && $BUILD_BUILDROOT -eq 0 ]]; then
     show_help
 fi
 
+if [[ $BUILD_X11 -eq 1 && $BUILD_BUILDROOT -eq 0 ]]; then
+    echo "Error: --x11 requires --buildroot to be specified."
+    show_help
+fi
+
 if [[ $CLEAN_BUILD -eq 1 && $BUILD_BUILDROOT -eq 1 && -d buildroot ]]; then
     echo "Removing buildroot/ for clean build..."
     rm -rf buildroot