diff --git a/README.md b/README.md index a7e375c..bac3145 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,11 @@ This is the external Buildroot repository used to build system images and updates for the MynaPlayer project. +Changelog +-------- + +A [changelog](https://git.lumina-sensum.com/LuminaSensum/buildroot-MynaPlayer/blob/stable-dev-board/changelog.md) is available so that users and developers can quickly check what changed between releases. + Building -------- @@ -89,7 +94,7 @@ ls buildroot/output_build/images/ # Find the file ending in *.raucb # You can also just flash MynaPlayer.img using dd but it takes a long time -mv buildroot/output_build/images/bundle-MynaPlayer-2020-08-06.fe2ca3ce-be36-4f33-94d4-e295cd0518be.raucb /var/www/www.jookia.org/ +mv buildroot/output_build/images/bundle-MynaPlayer.2020-09-06.raucb /var/www/www.jookia.org/ cp $PWD/easy-rsa/pki/ca.crt /var/www/www.jookia.org/ chmod a+r /var/www/www.jookia.org/ca.crt ``` @@ -100,11 +105,16 @@ wget 'https://www.jookia.org/ca.crt' cp /etc/rauc/keyring.pem{,.bak} mv ca.crt /etc/rauc/keyring.pem -rauc install https://www.jookia.org/bundle-MynaPlayer-2020-08-06.fe2ca3ce-be36-4f33-94d4-e295cd0518be.raucb +rauc install https://www.jookia.org/bundle-MynaPlayer.2020-09-06.raucb mv /etc/rauc/keyring.pem{.bak,} reboot ``` +* Notes: + * The bundle file name is derived from git describe, and might differ slightly if you use a branch with committed but not yet released work. E.g: bundle-MynaPlayer.2020-09-06-18-g3d0589f.raucb. + * If you have uncommitted work present in your branch, then the file name will have a 'dirty' tag added. + * If your git index and cache become corrupted for any reason, your bundle will have a 'broken' tag added. This doesn't indicate by any means that your image is broken! + Future updates won't need to copy the keyring, a single 'rauc install' invocation should download and install the image without trouble. diff --git a/board/myna-player-odyssey/rootfs_overlay/loader/entries/myna-player.conf b/board/myna-player-odyssey/rootfs_overlay/loader/entries/myna-player.conf index 2f87df0..639a08c 100644 --- a/board/myna-player-odyssey/rootfs_overlay/loader/entries/myna-player.conf +++ b/board/myna-player-odyssey/rootfs_overlay/loader/entries/myna-player.conf @@ -2,5 +2,5 @@ version 5.8rc7 linux boot/zImage devicetree boot/stm32mp157c-odyssey.dtb -options rootfstype=squashfs rootwait quiet systemd.log_color=off init=/sbin/pre-init +options rootfstype=ext4 ro rootwait quiet systemd.log_color=off init=/sbin/pre-init linux-appendroot true diff --git a/board/myna-player-odyssey/utilities/barebox-env/nv/autoboot_timeout b/board/myna-player-odyssey/utilities/barebox-env/nv/autoboot_timeout new file mode 100644 index 0000000..c227083 --- /dev/null +++ b/board/myna-player-odyssey/utilities/barebox-env/nv/autoboot_timeout @@ -0,0 +1 @@ +0 \ No newline at end of file diff --git a/board/myna-player-odyssey/utilities/barebox-env/nv/boot.default b/board/myna-player-odyssey/utilities/barebox-env/nv/boot.default new file mode 100644 index 0000000..d31014d --- /dev/null +++ b/board/myna-player-odyssey/utilities/barebox-env/nv/boot.default @@ -0,0 +1 @@ +bootchooser \ No newline at end of file diff --git a/board/myna-player-odyssey/utilities/barebox-env/nv/bootchooser.disable_on_zero_attempts b/board/myna-player-odyssey/utilities/barebox-env/nv/bootchooser.disable_on_zero_attempts new file mode 100644 index 0000000..c227083 --- /dev/null +++ b/board/myna-player-odyssey/utilities/barebox-env/nv/bootchooser.disable_on_zero_attempts @@ -0,0 +1 @@ +0 \ No newline at end of file diff --git a/board/myna-player-odyssey/utilities/barebox-env/nv/bootchooser.reset_attempts b/board/myna-player-odyssey/utilities/barebox-env/nv/bootchooser.reset_attempts new file mode 100644 index 0000000..f997ff9 --- /dev/null +++ b/board/myna-player-odyssey/utilities/barebox-env/nv/bootchooser.reset_attempts @@ -0,0 +1 @@ +all-zero \ No newline at end of file diff --git a/board/myna-player-odyssey/utilities/barebox-env/nv/bootchooser.retry b/board/myna-player-odyssey/utilities/barebox-env/nv/bootchooser.retry new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/board/myna-player-odyssey/utilities/barebox-env/nv/bootchooser.retry @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/board/myna-player-odyssey/utilities/barebox-env/nv/bootchooser.state_prefix b/board/myna-player-odyssey/utilities/barebox-env/nv/bootchooser.state_prefix new file mode 100644 index 0000000..38c56c1 --- /dev/null +++ b/board/myna-player-odyssey/utilities/barebox-env/nv/bootchooser.state_prefix @@ -0,0 +1 @@ +state.bootstate \ No newline at end of file diff --git a/board/myna-player-odyssey/utilities/barebox-env/nv/bootchooser.system0.boot b/board/myna-player-odyssey/utilities/barebox-env/nv/bootchooser.system0.boot new file mode 100644 index 0000000..b7e26ca --- /dev/null +++ b/board/myna-player-odyssey/utilities/barebox-env/nv/bootchooser.system0.boot @@ -0,0 +1 @@ +mmc1.2 \ No newline at end of file diff --git a/board/myna-player-odyssey/utilities/barebox-env/nv/bootchooser.system1.boot b/board/myna-player-odyssey/utilities/barebox-env/nv/bootchooser.system1.boot new file mode 100644 index 0000000..76ab638 --- /dev/null +++ b/board/myna-player-odyssey/utilities/barebox-env/nv/bootchooser.system1.boot @@ -0,0 +1 @@ +mmc1.3 \ No newline at end of file diff --git a/board/myna-player-odyssey/utilities/barebox-env/nv/bootchooser.targets b/board/myna-player-odyssey/utilities/barebox-env/nv/bootchooser.targets new file mode 100644 index 0000000..cf2ba7c --- /dev/null +++ b/board/myna-player-odyssey/utilities/barebox-env/nv/bootchooser.targets @@ -0,0 +1 @@ +system0 system1 \ No newline at end of file diff --git a/board/myna-player-odyssey/utilities/barebox-env/nv/bootm.provide_machine_id b/board/myna-player-odyssey/utilities/barebox-env/nv/bootm.provide_machine_id new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/board/myna-player-odyssey/utilities/barebox-env/nv/bootm.provide_machine_id @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/changelog.md b/changelog.md index 789e7eb..631682f 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,28 @@ +2020-09-22 / 2020-09-22 +======================= + + * Merge pull request #30 from LuminaSensum/WIP_barebox-env + * board/MynaPlayer odyssey: add default built-in barebox environment. + * Merge pull request #29 from LuminaSensum/WIP_terminfo-2 + * board/MynaPlayer odyssey: fix terminfo's additional files to include screen.linux. + * Merge pull request #28 from LuminaSensum/kernel-bump + * board/MynaPlayer odyssey: bump kernel to 5.8.10. + * Merge pull request #26 from LuminaSensum/WIP_build-id + * board/MynaPlayer odyssey: changed the way the file name and metadata of the images are constructed. + * Merge pull request #27 from LuminaSensum/WIP_changelog + * Added the changelog in the readme. + * Merge pull request #23 from LuminaSensum/WIP_preinit + * board/MynaPlayer odyssey: add pre-init script to setup overlay filesystem. + * Merge pull request #25 from LuminaSensum/WIP_terminfo + * board/MynaPlayer odyssey: add screen and tmux terminfo files into the target. + * Merge pull request #24 from LuminaSensum/WIP_rauc + * board/MynaPlayer odyssey: added basic service to mark boot as good with rauc. + * Merge pull request #22 from LuminaSensum/WIP_squashfs + * board/MynaPlayer odyssey: rework squashfs support + * Merge pull request #21 from LuminaSensum/WIP_ipv6 + * board/MynaPlayer odyssey: fix networking for good. + 2020-09-06 / 2020-09-06 ======================= diff --git a/configs/myna_player_odyssey_defconfig b/configs/myna_player_odyssey_defconfig index 10b6718..4389e3c 100644 --- a/configs/myna_player_odyssey_defconfig +++ b/configs/myna_player_odyssey_defconfig @@ -31,7 +31,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_MynaPlayer_PATH)/board/myna-player-odyssey/utilities/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_MynaPlayer_PATH)/board/myna-player-odyssey/configs/linux.config" BR2_LINUX_KERNEL_LZ4=y @@ -141,6 +141,7 @@ BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION="d4d3e9c87" BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG=y BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_MynaPlayer_PATH)/board/myna-player-odyssey/configs/barebox.config" +BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH="$(BR2_EXTERNAL_MynaPlayer_PATH)/board/myna-player-odyssey/utilities/barebox-env" BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_DISABLED_SERVICES=y