From 4b092feb6545668142e1dbbcd73d952bca5506af Mon Sep 17 00:00:00 2001 From: Bohdan Buinich Date: Sat, 27 Jan 2024 02:33:31 +0200 Subject: [PATCH] fix after merge --- .../board/ovos/pc/post-build.sh | 57 --------------- .../board/ovos/pc/post-image.sh | 34 --------- .../board/ovos/raspberrypi/post-build.sh | 73 ------------------- buildroot-external/scripts/post-build.sh | 8 +- 4 files changed, 4 insertions(+), 168 deletions(-) delete mode 100755 buildroot-external/board/ovos/pc/post-build.sh delete mode 100755 buildroot-external/board/ovos/pc/post-image.sh delete mode 100755 buildroot-external/board/ovos/raspberrypi/post-build.sh diff --git a/buildroot-external/board/ovos/pc/post-build.sh b/buildroot-external/board/ovos/pc/post-build.sh deleted file mode 100755 index f6c73e13..00000000 --- a/buildroot-external/board/ovos/pc/post-build.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh - -set -u -set -e - -BOARD_DIR="$(dirname $0)" - -. "${BR2_EXTERNAL_OPENVOICEOS_PATH}/meta" -. "${BOARD_DIR}/meta" - -# Write os-release -{ - echo "NAME=\"${OVOS_NAME}\"" - echo "VERSION=\"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD} ${BOARD_NAME}\"" - echo "ID=${OVOS_ID}" - echo "VERSION_ID=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}" - echo "PRETTY_NAME=\"${OVOS_NAME} ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD} ${BOARD_NAME}\"" - echo "CPE_NAME=cpe:2.3:o:openvoiceos:${OVOS_ID}:${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}:*:${DEPLOYMENT}:*:*:*:${BOARD_ID}:*" - echo "HOME_URL=https://github.com/OpenVoiceOS/OpenVoiceOS" - echo "DOCUMENTATION_URL=https://github.com/OpenVoiceOS/OpenVoiceOS/tree/develop/documentation" - echo "SUPPORT_URL=https://github.com/OpenVoiceOS/OpenVoiceOS/issues" - echo "VARIANT=\"${OVOS_NAME} - Buildroot Edition\"" - echo "VARIANT_ID=${OVOS_ID}-${BOARD_ID}-buildroot" -} > "${TARGET_DIR}/usr/lib/os-release" - -# Write machine-info -{ - echo "CHASSIS=${CHASSIS}" - echo "DEPLOYMENT=${DEPLOYMENT}" -} > "${TARGET_DIR}/etc/machine-info" - -cp -f ../buildroot-external/board/ovos/ova/grub-efi.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg -cp -f ../buildroot-external/board/ovos/ova/cmdline.txt ${BINARIES_DIR} -cp -f ../buildroot-external/board/ovos/ova/sw-description ${BINARIES_DIR} - -grub-editenv "${BINARIES_DIR}/efi-part/EFI/BOOT/grubenv" create - -echo "Check for compressed kernel in ${TARGET_DIR}" -if [ -f "${TARGET_DIR}/boot/bzImage" ]; then - echo "Found bzImage, renaming to kernel" - mv ${TARGET_DIR}/boot/bzImage ${TARGET_DIR}/boot/kernel -fi - -# Prepare home data -rm -f ${BINARIES_DIR}/homefs.ext4 -truncate --size="6890M" ${BINARIES_DIR}/homefs.ext4 -mkfs.ext4 -L "homefs" -E lazy_itable_init=0,lazy_journal_init=0 ${BINARIES_DIR}/homefs.ext4 - -# Mount home image -mkdir -p ${BINARIES_DIR}/home -sudo mount -o loop,discard ${BINARIES_DIR}/homefs.ext4 ${BINARIES_DIR}/home - -# sync home folder -sudo rsync -ah --progress ${TARGET_DIR}/home/* ${BINARIES_DIR}/home/ - -# Unmount home image -sudo umount ${BINARIES_DIR}/homefs.ext4 diff --git a/buildroot-external/board/ovos/pc/post-image.sh b/buildroot-external/board/ovos/pc/post-image.sh deleted file mode 100755 index 0a93ef16..00000000 --- a/buildroot-external/board/ovos/pc/post-image.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -set -e - -BOARD_DIR="$(dirname $0)" -BOARD_NAME="$(basename ${BOARD_DIR})" -GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOARD_NAME}.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" -SWUPDATE_FILES="sw-description rootfs.squashfs" - -# Pass an empty rootpath. genimage makes a full copy of the given rootpath to -# ${GENIMAGE_TMP}/root so passing TARGET_DIR would be a waste of time and disk -# space. We don't rely on genimage to build the rootfs image, just to insert a -# pre-built one in the disk image. - -trap 'rm -rf "${ROOTPATH_TMP}"' EXIT -ROOTPATH_TMP="$(mktemp -d)" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${ROOTPATH_TMP}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" - -pushd ${BINARIES_DIR} -for f in ${SWUPDATE_FILES} ; do - echo ${f} -done | cpio -ov -H crc > rootfs.swu -popd - -exit $? diff --git a/buildroot-external/board/ovos/raspberrypi/post-build.sh b/buildroot-external/board/ovos/raspberrypi/post-build.sh deleted file mode 100755 index 8a0bdd14..00000000 --- a/buildroot-external/board/ovos/raspberrypi/post-build.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh - -set -u -set -e - -BOARD_DIR="$(dirname $0)" - -. "${BR2_EXTERNAL_OPENVOICEOS_PATH}/meta" -. "${BOARD_DIR}/meta" - -# Write os-release -{ - echo "NAME=\"${OVOS_NAME}\"" - echo "VERSION=\"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD} ${BOARD_NAME}\"" - echo "ID=${OVOS_ID}" - echo "VERSION_ID=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}" - echo "PRETTY_NAME=\"${OVOS_NAME} ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD} ${BOARD_NAME}\"" - echo "CPE_NAME=cpe:2.3:o:openvoiceos:${OVOS_ID}:${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}:*:${DEPLOYMENT}:*:*:*:${BOARD_ID}:*" - echo "HOME_URL=https://github.com/OpenVoiceOS/OpenVoiceOS" - echo "DOCUMENTATION_URL=https://github.com/OpenVoiceOS/OpenVoiceOS/tree/develop/documentation" - echo "SUPPORT_URL=https://github.com/OpenVoiceOS/OpenVoiceOS/issues" - echo "VARIANT=\"${OVOS_NAME} - Buildroot Edition\"" - echo "VARIANT_ID=${OVOS_ID}-${BOARD_ID}-buildroot" -} > "${TARGET_DIR}/usr/lib/os-release" - -# Write machine-info -{ - echo "CHASSIS=${CHASSIS}" - echo "DEPLOYMENT=${DEPLOYMENT}" -} > "${TARGET_DIR}/etc/machine-info" - -cp -f ../buildroot-external/board/ovos/raspberrypi/cmdline.txt ${BINARIES_DIR}/rpi-firmware/cmdline.txt -grub-editenv "${BINARIES_DIR}/efi-part/EFI/BOOT/grubenv" create - -echo "Check for kernel in ${TARGET_DIR}" -if [ -f "${TARGET_DIR}/boot/Image" ]; then - echo "Found Image, renaming to kernel" - mv ${TARGET_DIR}/boot/Image ${TARGET_DIR}/boot/kernel -fi - -# Copy the right config.txt file -for arg in "$@" -do - case "${arg}" in - --rpi3) - cp -f ../buildroot-external/board/ovos/raspberrypi/rpi3/config.txt ${BINARIES_DIR}/rpi-firmware/config.txt - cp -f ../buildroot-external/board/ovos/raspberrypi/rpi3/RPI_EFI.fd ${BINARIES_DIR}/rpi-firmware/RPI_EFI.fd - cp -f ../buildroot-external/board/ovos/raspberrypi/grub-efi.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg - cp -f ../buildroot-external/board/ovos/raspberrypi/rpi3/sw-description ${BINARIES_DIR} - ;; - --rpi4) - cp -f ../buildroot-external/board/ovos/raspberrypi/rpi4/config.txt ${BINARIES_DIR}/rpi-firmware/config.txt - cp -f ../buildroot-external/board/ovos/raspberrypi/rpi4/RPI_EFI.fd ${BINARIES_DIR}/rpi-firmware/RPI_EFI.fd - cp -f ../buildroot-external/board/ovos/raspberrypi/grub-efi.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg - cp -f ../buildroot-external/board/ovos/raspberrypi/rpi4/sw-description ${BINARIES_DIR} - ;; - esac -done - -# Prepare home data -rm -f ${BINARIES_DIR}/homefs.ext4 -truncate --size="6890M" ${BINARIES_DIR}/homefs.ext4 -mkfs.ext4 -L "homefs" -E lazy_itable_init=0,lazy_journal_init=0 ${BINARIES_DIR}/homefs.ext4 - -# Mount home image -mkdir -p ${BINARIES_DIR}/home -sudo mount -o loop,discard ${BINARIES_DIR}/homefs.ext4 ${BINARIES_DIR}/home - -# sync home folder -sudo rsync -avPHSX ${TARGET_DIR}/home/* ${BINARIES_DIR}/home/ - -# Unmount home image -sudo umount ${BINARIES_DIR}/homefs.ext4 diff --git a/buildroot-external/scripts/post-build.sh b/buildroot-external/scripts/post-build.sh index 00ee0f77..c29ef873 100755 --- a/buildroot-external/scripts/post-build.sh +++ b/buildroot-external/scripts/post-build.sh @@ -82,8 +82,8 @@ handle_kernel_renaming() { mv "${TARGET_DIR}/boot/bzImage" "${TARGET_DIR}/boot/kernel" fi ;; - "x86_64") - # No kernel renaming logic needed for x86_64 + "pc") + # No kernel renaming logic needed for pc(x86_64) ;; esac } @@ -105,7 +105,7 @@ main() { local home_mount_point="${BINARIES_DIR}/home" mkdir -p "${home_mount_point}" sudo mount -o loop,discard "${home_img}" "${home_mount_point}" - sudo rsync -ah --progress "${TARGET_DIR}/home/"* "${home_mount_point}/" + sudo rsync -avPHSX "${TARGET_DIR}/home/"* "${home_mount_point}/" sudo umount "${home_img}" } @@ -116,4 +116,4 @@ if [ "$#" -ne 2 ]; then fi # Call the main function -main \ No newline at end of file +main