rixty
/
OpenVoiceOS
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS
1
1
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' into fix/gpio

This commit is contained in:
j1nx 2024-02-17 10:10:12 +00:00
parent 2a361ae00c 9e0642fb2d
commit 3bdd57fb1d
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -25,8 +25,8 @@ $(TARGETS): %: $(RELEASE_DIR) %-config
$(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=../$(BUILDROOT_EXTERNAL) 2>&1 | tee logs/buildroot_$@_output.txt $(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=../$(BUILDROOT_EXTERNAL) 2>&1 | tee logs/buildroot_$@_output.txt
rsync -ah --progress $(BUILDROOT)/output/images/disk.img $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).img rsync -ah --progress $(BUILDROOT)/output/images/disk.img $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).img
rsync -ah --progress $(BUILDROOT)/output/images/rootfs.swu $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).swu rsync -ah --progress $(BUILDROOT)/output/images/rootfs.swu $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).swu
xz -3 -T0 -v -f -k $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).img xz -3 -T0 -v -f $(BUILDROOT)/output/images/disk.img > $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).img.xz
xz -3 -T0 -v -f -k $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).swu xz -3 -T0 -v -f $(BUILDROOT)/output/images/rootfs.swu> $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).swu.xz
@if [ $@ = "ova_64" ]; then\ @if [ $@ = "ova_64" ]; then\
qemu-img convert -O vdi $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).img $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).vdi;\ qemu-img convert -O vdi $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).img $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).vdi;\
xz -3 -T0 -v -f -k $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).vdi;\ xz -3 -T0 -v -f -k $(RELEASE_DIR)/OpenVoiceOS_$@_$(BUILDDATE).vdi;\

2
buildroot

@ -1 +1 @@
Subproject commit e2b977c858a29c91a33324283e649a8aeab4a2dc Subproject commit 8e61f4deec675cc035d44412ca1d31caae40d709

3
buildroot-external/rootfs-overlay/home/ovos/.config/containers/storage.conf
View File

@ -1,2 +1,5 @@
[storage] [storage]
driver = "overlay" driver = "overlay"
[storage.options]
mount_program = "/usr/bin/fuse-overlayfs"