From bb6e0f5e2cb857fbf24903973f0794b541f543c5 Mon Sep 17 00:00:00 2001 From: Yuya Hamamachi Date: Wed, 4 Sep 2024 18:04:20 +0900 Subject: [PATCH] WIP: ca55: aosedge: Fix build issue Signed-off-by: Yuya Hamamachi --- .../aos-communicationmanager_git.bbappend | 2 +- .../recipes-aos/aos-dnsname/aos-dnsname.bbappend | 3 +-- .../recipes-aos/aos-firewall/aos-firewall.bbappend | 3 +-- .../aos-iamanager/aos-iamanager_git.bbappend | 2 +- .../aos-servicemanager_git.bbappend | 2 +- .../aos-updatemanager_git.bbappend | 13 +------------ .../recipes-aos/aos-vis/aos-vis_git.bbappend | 2 +- 7 files changed, 7 insertions(+), 20 deletions(-) diff --git a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-communicationmanager/aos-communicationmanager_git.bbappend b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-communicationmanager/aos-communicationmanager_git.bbappend index 90ad81e..6b047fb 100644 --- a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-communicationmanager/aos-communicationmanager_git.bbappend +++ b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-communicationmanager/aos-communicationmanager_git.bbappend @@ -1 +1 @@ -GO_IMPORT = "github.com/aosedge/aos_communicationmanager" +SRC_URI := "${@d.getVar('SRC_URI').replace('git@github.com/aoscloud', 'git@github.com/aosedge')}" diff --git a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-dnsname/aos-dnsname.bbappend b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-dnsname/aos-dnsname.bbappend index e58dbf1..6b047fb 100644 --- a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-dnsname/aos-dnsname.bbappend +++ b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-dnsname/aos-dnsname.bbappend @@ -1,2 +1 @@ -GO_IMPORT = "github.com/aosedge/aos_cni_dns" -# GO_IMPORT = "github.com/aosedge/aos_dnsname" +SRC_URI := "${@d.getVar('SRC_URI').replace('git@github.com/aoscloud', 'git@github.com/aosedge')}" diff --git a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-firewall/aos-firewall.bbappend b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-firewall/aos-firewall.bbappend index 519f8da..6b047fb 100644 --- a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-firewall/aos-firewall.bbappend +++ b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-firewall/aos-firewall.bbappend @@ -1,2 +1 @@ -# GO_IMPORT = "github.com/aosedge/aos_firewall" -GO_IMPORT = "github.com/aosedge/aos_cni_firewall" +SRC_URI := "${@d.getVar('SRC_URI').replace('git@github.com/aoscloud', 'git@github.com/aosedge')}" diff --git a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-iamanager/aos-iamanager_git.bbappend b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-iamanager/aos-iamanager_git.bbappend index c78dc8c..a97c3b2 100644 --- a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-iamanager/aos-iamanager_git.bbappend +++ b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-iamanager/aos-iamanager_git.bbappend @@ -6,4 +6,4 @@ do_install_append() { fi } -GO_IMPORT = "github.com/aosedge/aos_iamanager" +SRC_URI := "${@d.getVar('SRC_URI').replace('git@github.com/aoscloud', 'git@github.com/aosedge')}" diff --git a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-servicemanager/aos-servicemanager_git.bbappend b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-servicemanager/aos-servicemanager_git.bbappend index 6957287..6b047fb 100644 --- a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-servicemanager/aos-servicemanager_git.bbappend +++ b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-servicemanager/aos-servicemanager_git.bbappend @@ -1 +1 @@ -GO_IMPORT = "github.com/aosedge/aos_servicemanager" +SRC_URI := "${@d.getVar('SRC_URI').replace('git@github.com/aoscloud', 'git@github.com/aosedge')}" diff --git a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-updatemanager/aos-updatemanager_git.bbappend b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-updatemanager/aos-updatemanager_git.bbappend index a92bf50..4296e0a 100644 --- a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-updatemanager/aos-updatemanager_git.bbappend +++ b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-updatemanager/aos-updatemanager_git.bbappend @@ -6,16 +6,5 @@ do_install_append() { fi } -GO_IMPORT = "github.com/aosedge/aos_updatemanager" - -do_prepare_modules() { - file="${S}/src/${GO_IMPORT}/updatemodules/modules.go" - - echo 'package updatemodules' > ${file} - echo 'import (' >> ${file} - for module in ${AOS_UM_UPDATE_MODULES}; do - echo "\t_ \"github.com/aoscloud/aos_updatemanager/${module}\"" >> ${file} - done - echo ')' >> ${file} -} +SRC_URI := "${@d.getVar('SRC_URI').replace('git@github.com/aoscloud', 'git@github.com/aosedge')}" diff --git a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-vis/aos-vis_git.bbappend b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-vis/aos-vis_git.bbappend index 06ff58c..6b047fb 100644 --- a/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-vis/aos-vis_git.bbappend +++ b/application_cpu/meta-rcar-whitebox/meta-domd/recipes-aos/aos-vis/aos-vis_git.bbappend @@ -1 +1 @@ -GO_IMPORT = "github.com/aosedge/aos_vis" +SRC_URI := "${@d.getVar('SRC_URI').replace('git@github.com/aoscloud', 'git@github.com/aosedge')}"