From 51bbe6f0abe8f44aff8d488a6ab4b29972cd807b Mon Sep 17 00:00:00 2001 From: jbnadal Date: Tue, 6 Jun 2017 17:32:00 +0200 Subject: [PATCH] update rootfs and configuration. --- projects/rpi_domo/configs/buildroot_defconfig | 5 +++-- projects/rpi_domo/configs/genimage.config | 13 ++----------- projects/rpi_domo/post-build.sh | 7 +++++++ 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/projects/rpi_domo/configs/buildroot_defconfig b/projects/rpi_domo/configs/buildroot_defconfig index d6e68285..d9b5d0e0 100644 --- a/projects/rpi_domo/configs/buildroot_defconfig +++ b/projects/rpi_domo/configs/buildroot_defconfig @@ -24,7 +24,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR_BOARD)/scripts/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR_BOARD)/scripts/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="ssh://git@serveur.nadal-fr.com:5023/PI/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="ssh://git@git.nadal-fr.com:5023/PI/linux.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="tags/4_4_43" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/patches/linux/rpi" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y @@ -35,7 +35,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="$(BOARD)/configs/busybox.config" BR2_PACKAGE_NTFS_3G=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_UBOOT_TOOLS=y -BR2_PACKAGE_LIBNL=y BR2_PACKAGE_NCURSES=y BR2_PACKAGE_AVAHI=y BR2_PACKAGE_AVAHI_DAEMON=y @@ -54,6 +53,8 @@ BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x4000" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_NETIFD=y BR2_PACKAGE_PROCD=y +BR2_PACKAGE_UBOX=y BR2_PACKAGE_CHACOND=y BR2_PACKAGE_SPRINKLERD=y diff --git a/projects/rpi_domo/configs/genimage.config b/projects/rpi_domo/configs/genimage.config index 0087b590..812341d3 100644 --- a/projects/rpi_domo/configs/genimage.config +++ b/projects/rpi_domo/configs/genimage.config @@ -22,15 +22,6 @@ image boot.vfat { size = 30M } -image data.vfat { - vfat { - files = { - "rpi-firmware/config.txt" - } - } - size = 10M -} - image sdcard.img { hdimage { } @@ -42,7 +33,7 @@ image sdcard.img { } partition data { - partition-type = 0xC - image = "data.vfat" + partition-type = 0x83 + image = "data.ext2" } } diff --git a/projects/rpi_domo/post-build.sh b/projects/rpi_domo/post-build.sh index 2456ad52..f8277f3e 100755 --- a/projects/rpi_domo/post-build.sh +++ b/projects/rpi_domo/post-build.sh @@ -17,6 +17,13 @@ echo "BR_PROJECT: " ${BR_PROJECT} cp -a ${BR_PROJECT}/configs/config.txt ${BR_STAGING}/buildroot/images/ +if [ ! -f ${AW_STAGING}/buildroot/images/data.ext2 ]; +then + echo "generate data image (10M)." + dd if=/dev/zero of=${BR_STAGING}/buildroot/images/data.ext2 bs=1k count=10000 + ${BR_STAGING}/cross/usr/sbin/mkfs.ext2 -i 1024 -b 1024 -F ${BR_STAGING}/buildroot/images/data.ext2 +fi + cp -a ${BR_STAGING}/buildroot/images/uboot-env.bin ${BR_STAGING}/buildroot/images/uboot.env make -C ${BR_PROJECT} dtb