From 178374e498117eeb35b39255bb4c3c79ec3149a2 Mon Sep 17 00:00:00 2001 From: Fabio Belavenuto Date: Wed, 18 Jan 2023 08:57:16 -0300 Subject: [PATCH] Adding support to some future addons --- files/board/arpl/kernel_defconfig | 5 +++-- files/board/arpl/overlayfs/opt/arpl/init.sh | 4 +++- files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh | 6 +++++- files/configs/arpl_defconfig | 1 - 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/files/board/arpl/kernel_defconfig b/files/board/arpl/kernel_defconfig index 83ad4c51..1e3950ba 100644 --- a/files/board/arpl/kernel_defconfig +++ b/files/board/arpl/kernel_defconfig @@ -26,6 +26,7 @@ CONFIG_BLK_DEV_INITRD=y # CONFIG_RD_LZ4 is not set # CONFIG_RD_ZSTD is not set CONFIG_KALLSYMS_ALL=y +CONFIG_KCMP=y CONFIG_EMBEDDED=y # CONFIG_COMPAT_BRK is not set CONFIG_PROFILING=y @@ -364,14 +365,13 @@ CONFIG_HW_RANDOM=y CONFIG_NVRAM=y CONFIG_HPET=y # CONFIG_HPET_MMAP is not set +CONFIG_I2C=y CONFIG_I2C_I801=y CONFIG_WATCHDOG=y CONFIG_REGULATOR=y CONFIG_AGP=y CONFIG_AGP_AMD64=y CONFIG_AGP_INTEL=y -CONFIG_DRM=y -CONFIG_DRM_VIRTIO_GPU=m CONFIG_FB=y CONFIG_FIRMWARE_EDID=y CONFIG_FB_MODE_HELPERS=y @@ -434,6 +434,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_RTC_CLASS=y # CONFIG_RTC_HCTOSYS is not set CONFIG_DMADEVICES=y +CONFIG_SYNC_FILE=y CONFIG_VIRT_DRIVERS=y CONFIG_VBOXGUEST=m CONFIG_VIRTIO_PCI=m diff --git a/files/board/arpl/overlayfs/opt/arpl/init.sh b/files/board/arpl/overlayfs/opt/arpl/init.sh index 8853c5ef..cfb0ffa0 100755 --- a/files/board/arpl/overlayfs/opt/arpl/init.sh +++ b/files/board/arpl/overlayfs/opt/arpl/init.sh @@ -50,7 +50,9 @@ ln -s "${CACHE_PATH}/ssh" "/etc/ssh" # Link bash history to cache volume rm -rf ~/.bash_history ln -s ${CACHE_PATH}/.bash_history ~/.bash_history - +if ! grep -q "menu.sh" ~/.bash_history; then + echo "menu.sh " >> ~/.bash_history +fi # Check if exists directories into P3 partition, if yes remove and link it if [ -d "${CACHE_PATH}/model-configs" ]; then rm -rf "${MODEL_CONFIG_PATH}" diff --git a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh index eaf84c3e..67578656 100755 --- a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh +++ b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh @@ -132,6 +132,11 @@ echo -n "." mkdir -p "${RAMDISK_PATH}/addons" echo "#!/bin/sh" > "${RAMDISK_PATH}/addons/addons.sh" echo 'echo "addons.sh called with params ${@}"' >> "${RAMDISK_PATH}/addons/addons.sh" +echo "export PLATFORM=${PLATFORM}" >> "${RAMDISK_PATH}/addons/addons.sh" +echo "export MODEL=${MODEL}" >> "${RAMDISK_PATH}/addons/addons.sh" +echo "export BUILD=${BUILD}" >> "${RAMDISK_PATH}/addons/addons.sh" +echo "export LAYOUT=${LAYOUT}" >> "${RAMDISK_PATH}/addons/addons.sh" +echo "export KEYMAP=${KEYMAP}" >> "${RAMDISK_PATH}/addons/addons.sh" chmod +x "${RAMDISK_PATH}/addons/addons.sh" # Required addons: eudev, dtbpatch/maxdisks, powersched @@ -149,7 +154,6 @@ echo "/addons/powersched.sh \${1} " >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${L # User addons for ADDON in ${!ADDONS[@]}; do PARAMS=${ADDONS[${ADDON}]} - [ "${ADDON}" = "console" ] && PARAMS="${LAYOUT}/${KEYMAP}" if ! installAddon ${ADDON}; then echo "ADDON ${ADDON} not found!" | tee -a "${LOG_FILE}" exit 1 diff --git a/files/configs/arpl_defconfig b/files/configs/arpl_defconfig index 989b8183..b97b7711 100644 --- a/files/configs/arpl_defconfig +++ b/files/configs/arpl_defconfig @@ -79,4 +79,3 @@ BR2_TARGET_ROOTFS_CPIO_XZ=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_R8125=y -