diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 810d43fb..faa6dac0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,6 +27,7 @@ jobs: run: | sudo apt-get update sudo apt-get install -y libelf-dev qemu-utils + sudo cp -f files/board/arpl/overlayfs/usr/bin/yq /usr/bin/yq # Prepare buildroot for first make (for cache) - name: Prepare buildroot @@ -94,7 +95,11 @@ jobs: zip -9 "arpl-${{ steps.build.outputs.VERSION }}.img.zip" arpl.img zip -9 "arpl-${{ steps.build.outputs.VERSION }}.vmdk-dyn.zip" arpl-dyn.vmdk zip -9 "arpl-${{ steps.build.outputs.VERSION }}.vmdk-flat.zip" arpl.vmdk arpl-flat.vmdk - (cd .buildroot/output/images && sha256sum bzImage rootfs.cpio.xz) >> sha256sum + sha256sum update-list.yml > sha256sum + yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml | while read F; do + (cd `dirname ${F}` && sha256sum `basename ${F}` > sha256sum) + done + yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml | xargs zip -9D "update-${{ steps.build.outputs.VERSION }}.zip" sha256sum update-list.yml # Upload artifact - name: Upload @@ -115,6 +120,4 @@ jobs: arpl-${{ steps.build.outputs.VERSION }}.img.zip arpl-${{ steps.build.outputs.VERSION }}.vmdk-dyn.zip arpl-${{ steps.build.outputs.VERSION }}.vmdk-flat.zip - .buildroot/output/images/bzImage - .buildroot/output/images/rootfs.cpio.xz - sha256sum + update-${{ steps.build.outputs.VERSION }}.zip diff --git a/TODO b/TODO index c9cc2282..a4493c62 100644 --- a/TODO +++ b/TODO @@ -1,8 +1,6 @@ A fazer - Checar NVME no modelo DS920+, DS918+ - - J4125, HP G7 N40L desligando (#110 #160) - Checar módulo tg3 no próprio loader (BCM57780 [14e4:1692]) (#31) - - Ver se vale a pena colocar uma opção para configurações extras, como escolher qual módulo realtek usar (R8168 ou R8169) Concluidos: - Generalizar código dos addons @@ -35,3 +33,5 @@ Concluidos: - Adicionar mais binários para o addon dbgutils (nano, strace, etc) - Checar se tem como atualizar microcode via addon/modules/whatever... (NOP) - Estudar acrescentar modo simples e avançado do menu (NOP) + - J4125, HP G7 N40L desligando (#110 #160) + - Ver se vale a pena colocar uma opção para configurações extras, como escolher qual módulo realtek usar (R8168 ou R8169) diff --git a/files/board/arpl/p3/modules/apollolake-4.4.180.tgz b/files/board/arpl/p3/modules/apollolake-4.4.180.tgz index 725285a0..40a8d63b 100644 Binary files a/files/board/arpl/p3/modules/apollolake-4.4.180.tgz and b/files/board/arpl/p3/modules/apollolake-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/broadwell-4.4.180.tgz b/files/board/arpl/p3/modules/broadwell-4.4.180.tgz index 4a9dd6cd..96598fae 100644 Binary files a/files/board/arpl/p3/modules/broadwell-4.4.180.tgz and b/files/board/arpl/p3/modules/broadwell-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz b/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz index d0180ee4..d1f8cf44 100644 Binary files a/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz and b/files/board/arpl/p3/modules/broadwellnk-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/denverton-4.4.180.tgz b/files/board/arpl/p3/modules/denverton-4.4.180.tgz index a76f6880..5725b48e 100644 Binary files a/files/board/arpl/p3/modules/denverton-4.4.180.tgz and b/files/board/arpl/p3/modules/denverton-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/geminilake-4.4.180.tgz b/files/board/arpl/p3/modules/geminilake-4.4.180.tgz index f566fab0..5281b97a 100644 Binary files a/files/board/arpl/p3/modules/geminilake-4.4.180.tgz and b/files/board/arpl/p3/modules/geminilake-4.4.180.tgz differ diff --git a/files/board/arpl/p3/modules/v1000-4.4.180.tgz b/files/board/arpl/p3/modules/v1000-4.4.180.tgz index c32a82bf..f49fb5d3 100644 Binary files a/files/board/arpl/p3/modules/v1000-4.4.180.tgz and b/files/board/arpl/p3/modules/v1000-4.4.180.tgz differ diff --git a/img-gen.sh b/img-gen.sh index 7708f72f..11db9ba8 100755 --- a/img-gen.sh +++ b/img-gen.sh @@ -87,3 +87,9 @@ rm -f *.zip zip -9 "arpl-${VERSION}.img.zip" arpl.img zip -9 "arpl-${VERSION}.vmdk-dyn.zip" arpl-dyn.vmdk zip -9 "arpl-${VERSION}.vmdk-flat.zip" arpl.vmdk arpl-flat.vmdk +sha256sum update-list.yml > sha256sum +yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml | while read F; do + (cd `dirname ${F}` && sha256sum `basename ${F}` > sha256sum) +done +yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml | xargs zip -9D "update-${VERSION}.zip" sha256sum update-list.yml +rm -f sha256sum diff --git a/update-list.yml b/update-list.yml new file mode 100644 index 00000000..d0301ddc --- /dev/null +++ b/update-list.yml @@ -0,0 +1,5 @@ +replace: + ".buildroot/output/images/bzImage": "/mnt/p3/bzImage-arpl" + ".buildroot/output/images/rootfs.cpio.xz": "/mnt/p3/initrd-arpl" + "files/board/arpl/p1/grub/grub.cfg": "/mnt/p1/grub/grub/cfg" +remove: