diff mbox series

classes/go-vendor: Use UNPACKDIR instead of WORKDIR

Message ID 20241126214448.2781380-1-JPEWhacker@gmail.com
State New
Headers show
Series classes/go-vendor: Use UNPACKDIR instead of WORKDIR | expand

Commit Message

Joshua Watt Nov. 26, 2024, 9:44 p.m. UTC
modules.txt is provided using file:// in SRC_URI, therefore it will be
found in UNPACKDIR instead of WORKDIR

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
---
 meta/classes/go-vendor.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Khem Raj Nov. 26, 2024, 10:41 p.m. UTC | #1
On Tue, Nov 26, 2024 at 1:45 PM Joshua Watt via lists.openembedded.org
<JPEWhacker=gmail.com@lists.openembedded.org> wrote:
>
> modules.txt is provided using file:// in SRC_URI, therefore it will be
> found in UNPACKDIR instead of WORKDIR
>
> Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
> ---
>  meta/classes/go-vendor.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/go-vendor.bbclass b/meta/classes/go-vendor.bbclass
> index 1bbb99ac794..38ea69ab50a 100644
> --- a/meta/classes/go-vendor.bbclass
> +++ b/meta/classes/go-vendor.bbclass
> @@ -156,7 +156,7 @@ python do_go_vendor() {
>                  shutil.copy2(rootdirLicese, subdirLicense)
>
>      # Copy vendor manifest
> -    modules_txt_src = os.path.join(d.getVar('WORKDIR'), "modules.txt")
> +    modules_txt_src = os.path.join(d.getVar('UNPACKDIR'), "modules.txt")

yes, thanks for fixing it.

>      bb.debug(1, "cp %s --> %s" % (modules_txt_src, vendor_dir))
>      shutil.copy2(modules_txt_src, vendor_dir)
>
> --
> 2.47.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#207885): https://lists.openembedded.org/g/openembedded-core/message/207885
> Mute This Topic: https://lists.openembedded.org/mt/109797450/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta/classes/go-vendor.bbclass b/meta/classes/go-vendor.bbclass
index 1bbb99ac794..38ea69ab50a 100644
--- a/meta/classes/go-vendor.bbclass
+++ b/meta/classes/go-vendor.bbclass
@@ -156,7 +156,7 @@  python do_go_vendor() {
                 shutil.copy2(rootdirLicese, subdirLicense)
 
     # Copy vendor manifest
-    modules_txt_src = os.path.join(d.getVar('WORKDIR'), "modules.txt")
+    modules_txt_src = os.path.join(d.getVar('UNPACKDIR'), "modules.txt")
     bb.debug(1, "cp %s --> %s" % (modules_txt_src, vendor_dir))
     shutil.copy2(modules_txt_src, vendor_dir)