From 9428c633fb68d7786ded3065342cf9a98ad4c951 Mon Sep 17 00:00:00 2001 From: Ing Date: Sun, 15 Oct 2023 22:46:02 +0800 Subject: [PATCH] move external depends --- .github/workflows/main.yml | 10 +++++----- files/board/arpl/busybox_defconfig | 2 +- files/board/arpl/kernel_defconfig | 2 +- {external => files/external}/Config.in | 0 {external => files/external}/external.desc | 0 {external => files/external}/external.mk | 0 {external => files/external}/libsixel/Config.in | 0 {external => files/external}/libsixel/libsixel.hash | 0 {external => files/external}/libsixel/libsixel.mk | 0 {external => files/external}/r8125/Config.in | 0 {external => files/external}/r8125/r8125.hash | 0 {external => files/external}/r8125/r8125.mk | 0 {external => files/external}/r8169/Config.in | 0 {external => files/external}/r8169/r8169.hash | 0 {external => files/external}/r8169/r8169.mk | 0 15 files changed, 7 insertions(+), 7 deletions(-) rename {external => files/external}/Config.in (100%) rename {external => files/external}/external.desc (100%) rename {external => files/external}/external.mk (100%) rename {external => files/external}/libsixel/Config.in (100%) rename {external => files/external}/libsixel/libsixel.hash (100%) rename {external => files/external}/libsixel/libsixel.mk (100%) rename {external => files/external}/r8125/Config.in (100%) rename {external => files/external}/r8125/r8125.hash (100%) rename {external => files/external}/r8125/r8125.mk (100%) rename {external => files/external}/r8169/Config.in (100%) rename {external => files/external}/r8169/r8169.hash (100%) rename {external => files/external}/r8169/r8169.mk (100%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 52e271c6..51691e63 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -74,14 +74,14 @@ jobs: cp -Ru files/* .buildroot cd .buildroot echo "Generating default config" - make BR2_EXTERNAL=../external arpl_defconfig + make BR2_EXTERNAL=./external arpl_defconfig # Download sources if not cached - name: Download buildroot packages source if: steps.dl-cache.outputs.cache-hit != 'true' run: | cd .buildroot - make BR2_EXTERNAL=../external source + make BR2_EXTERNAL=./external source # Prepare buildroot for first make - name: Prepare buildroot @@ -89,7 +89,7 @@ jobs: run: | echo "First make" cd .buildroot - make BR2_EXTERNAL=../external + make BR2_EXTERNAL=./external # calculates the version number and push - name: Calculate version @@ -160,9 +160,9 @@ jobs: cd .buildroot echo "Generating default config" - make BR2_EXTERNAL=../external arpl_defconfig + make BR2_EXTERNAL=./external arpl_defconfig echo "Building..." - make BR2_EXTERNAL=../external + make BR2_EXTERNAL=./external cd - # qemu-img convert -O vmdk arpl.img arpl-dyn.vmdk # qemu-img convert -O vmdk -o adapter_type=lsilogic arpl.img -o subformat=monolithicFlat arpl.vmdk diff --git a/files/board/arpl/busybox_defconfig b/files/board/arpl/busybox_defconfig index 5b07bb9b..3084c158 100644 --- a/files/board/arpl/busybox_defconfig +++ b/files/board/arpl/busybox_defconfig @@ -3,7 +3,7 @@ # Busybox version: x.xx.x # Wed Jun 22 14:12:15 2022 # -# make: make BR2_EXTERNAL=../external busybox-menuconfig +# make: make BR2_EXTERNAL=./external busybox-menuconfig # path: /output/build/busybox-x.x.xx/.config CONFIG_HAVE_DOT_CONFIG=y diff --git a/files/board/arpl/kernel_defconfig b/files/board/arpl/kernel_defconfig index dc3e2614..b4b781a8 100644 --- a/files/board/arpl/kernel_defconfig +++ b/files/board/arpl/kernel_defconfig @@ -2,7 +2,7 @@ # Automatically generated file; DO NOT EDIT. # Linux/x86_64 6.x.xx Kernel Configuration # -# make: make BR2_EXTERNAL=../external linux-menuconfig +# make: make BR2_EXTERNAL=./external linux-menuconfig # path: /output/build/linux-6.x.xx/.config # CONFIG_LOCALVERSION_AUTO is not set diff --git a/external/Config.in b/files/external/Config.in similarity index 100% rename from external/Config.in rename to files/external/Config.in diff --git a/external/external.desc b/files/external/external.desc similarity index 100% rename from external/external.desc rename to files/external/external.desc diff --git a/external/external.mk b/files/external/external.mk similarity index 100% rename from external/external.mk rename to files/external/external.mk diff --git a/external/libsixel/Config.in b/files/external/libsixel/Config.in similarity index 100% rename from external/libsixel/Config.in rename to files/external/libsixel/Config.in diff --git a/external/libsixel/libsixel.hash b/files/external/libsixel/libsixel.hash similarity index 100% rename from external/libsixel/libsixel.hash rename to files/external/libsixel/libsixel.hash diff --git a/external/libsixel/libsixel.mk b/files/external/libsixel/libsixel.mk similarity index 100% rename from external/libsixel/libsixel.mk rename to files/external/libsixel/libsixel.mk diff --git a/external/r8125/Config.in b/files/external/r8125/Config.in similarity index 100% rename from external/r8125/Config.in rename to files/external/r8125/Config.in diff --git a/external/r8125/r8125.hash b/files/external/r8125/r8125.hash similarity index 100% rename from external/r8125/r8125.hash rename to files/external/r8125/r8125.hash diff --git a/external/r8125/r8125.mk b/files/external/r8125/r8125.mk similarity index 100% rename from external/r8125/r8125.mk rename to files/external/r8125/r8125.mk diff --git a/external/r8169/Config.in b/files/external/r8169/Config.in similarity index 100% rename from external/r8169/Config.in rename to files/external/r8169/Config.in diff --git a/external/r8169/r8169.hash b/files/external/r8169/r8169.hash similarity index 100% rename from external/r8169/r8169.hash rename to files/external/r8169/r8169.hash diff --git a/external/r8169/r8169.mk b/files/external/r8169/r8169.mk similarity index 100% rename from external/r8169/r8169.mk rename to files/external/r8169/r8169.mk