Build DirectFB2 as extra package

Author: shengwen-tw

configs/riscv-cross-file

@@ -0,0 +1,18 @@
+[binaries]
+    c = 'riscv32-buildroot-linux-gnu-gcc'
+    strip = 'riscv32-buildroot-linux-gnu-strip'
+    pkgconfig = 'pkg-config'
+    python = '/usr/bin/python3'
+
+[properties]
+    pkg_config_libdir = ['@GLOBAL_SOURCE_ROOT@' / '../buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot/usr/local/lib/pkgconfig',
+                         '@GLOBAL_SOURCE_ROOT@' / '../buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot/usr/share/pkgconfig/',
+                         '@GLOBAL_SOURCE_ROOT@' / '../buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot/usr/lib/pkgconfig/'
+                        ]
+    sys_root = '@GLOBAL_SOURCE_ROOT@' / '../buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot'
+
+[host_machine]
+    system = 'linux'
+    cpu_family = 'riscv'
+    cpu = 'riscv32-ima'
+    endian = 'little'

scripts/build-image.sh

@@ -53,6 +53,10 @@ function do_buildroot
     ASSERT make $PARALLEL
     popd
 
+    if [[ $BUILD_EXTRA_PACKAGES -eq 1 ]]; then
+        do_extra_packages
+    fi
+
     if [[ $EXTERNAL_ROOT -eq 1 ]]; then
         echo "Copying rootfs.cpio to rootfs_full.cpio (external root mode)"
         cp -f buildroot/output/images/rootfs.cpio ./rootfs_full.cpio
@@ -86,12 +90,13 @@ function do_linux
 
 function show_help {
     cat << EOF
-Usage: $0 [--buildroot] [--linux] [--all] [--external-root] [--clean-build] [--help]
+Usage: $0 [--buildroot] [--linux] [--extra-packages] [--all] [--external-root] [--clean-build] [--help]
 
 Options:
   --buildroot         Build Buildroot rootfs
+  --extra-packages    Build extra packages along with Buildroot
   --linux             Build Linux kernel
-  --all               Build both Buildroot and Linux
+  --all               Build both Buildroot and Linux kernel
   --external-root     Use external rootfs instead of initramfs
   --clean-build       Remove entire buildroot/ and/or linux/ directories before build
   --help              Show this message
@@ -101,6 +106,7 @@ EOF
 
 BUILD_BUILDROOT=0
 BUILD_LINUX=0
+BUILD_EXTRA_PACKAGES=0
 EXTERNAL_ROOT=0
 CLEAN_BUILD=0
 
@@ -109,6 +115,9 @@ while [[ $# -gt 0 ]]; do
         --buildroot)
             BUILD_BUILDROOT=1
             ;;
+        --extra-packages)
+            BUILD_EXTRA_PACKAGES=1
+            ;;
         --linux)
             BUILD_LINUX=1
             ;;
@@ -133,11 +142,57 @@ while [[ $# -gt 0 ]]; do
     shift
 done
 
+function do_directfb
+{
+    export PATH=$PATH:$PWD/buildroot/output/host/bin
+    export BUILDROOT_OUT=$PWD/buildroot/output/
+    mkdir -p directfb
+
+    # Build DirectFB2
+    ASSERT git clone https://github.com/directfb2/DirectFB2.git
+    pushd DirectFB2
+    cp ../configs/riscv-cross-file .
+    ASSERT meson -Ddrmkms=true --cross-file riscv-cross-file build/riscv
+    ASSERT meson compile -C build/riscv
+    DESTDIR=$BUILDROOT_OUT/host/riscv32-buildroot-linux-gnu/sysroot meson install -C build/riscv
+    DESTDIR=../../../directfb meson install -C build/riscv
+    popd
+
+    # Build DirectFB2 examples
+    ASSERT git clone https://github.com/directfb2/DirectFB-examples.git
+    pushd DirectFB-examples/
+    cp ../configs/riscv-cross-file .
+    ASSERT meson --cross-file riscv-cross-file build/riscv
+    ASSERT meson compile -C build/riscv
+    DESTDIR=../../../directfb meson install -C build/riscv
+    popd
+}
+
+function do_extra_packages
+{
+    export PATH="$PWD/buildroot/output/host/bin:$PATH"
+    export CROSS_COMPILE=riscv32-buildroot-linux-gnu-
+
+    rm -rf extra_packages
+    mkdir -p extra_packages
+    mkdir -p extra_packages/root
+
+    do_directfb && OK
+
+    cp -r directfb/* extra_packages
+    cp target/run.sh extra_packages/root/
+}
+
 if [[ $BUILD_BUILDROOT -eq 0 && $BUILD_LINUX -eq 0 ]]; then
     echo "Error: No build target specified. Use --buildroot, --linux, or --all."
     show_help
 fi
 
+if [[ $BUILD_EXTRA_PACKAGES -eq 1 && $BUILD_BUILDROOT -eq 0 ]]; then
+    echo "Error: --extra-packages 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

scripts/rootfs_ext4.sh

@@ -11,6 +11,8 @@ echo "[*] Remove old rootfs directory..."
 rm -rf $DIR
 mkdir -p $DIR
 
+cp -r extra_packages/* $DIR 
+
 echo "[*] Extract CPIO"
 pushd $DIR
 cpio -idmv < ../$ROOTFS_CPIO 

target/run.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/bash
+
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
+export PATH=$PATH:/usr/local/bin/