Skip to contentSkip to conversation

scripts/autobuild-run: calculate dldir as an absolute path

PATCH New Thomas Petazzoni 3 participants 4 messages Sep 14, 2019 – Sep 15, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scripts/autobuild-run: calculate dldir as an absolute path

Right now, self.dldir is a relative path, equal to "instance-X/dl". Then, the Buildroot build is executed with BR2_DL_DIR=self.dldir, which means that self.dldir is interpreted relatively to the Buildroot source directory.

Due to this, we get the following directory organization:

instance-0
+ buildroot
+ instance-0
+ dl
+ instance.log
+ output

Instead of the excepted organization:

instance-0
+ buildroot
+ dl
+ instance.log
+ output

We fix this issue (which was introduced when the Builder class was created) by making self.dldir an absolute path.

---
 scripts/autobuild-run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/autobuild-run +1 -1
index ead81a0..7e3c7a0 100755
@@ -270,7 +270,7 @@ class Builder:
         # frequently needed directories
         self.idir = "instance-%d" % self.instance
         self.srcdir = os.path.join(self.idir, "buildroot")
-        self.dldir = os.path.join(self.idir, "dl")
+        self.dldir = os.path.abspath(os.path.join(self.idir, "dl"))
         # We need the absolute path to use with O=, because the relative
         # path to the output directory here is not relative to the
         # Buildroot sources, but to the location of the autobuilder
Signature · 1 line
2.21.0
#1 lore raw

PATCH 1/1 scripts/autobuild-run: calculate dldir as an absolute path

Quoted 22 lines · Thomas Petazzoni

Right now, self.dldir is a relative path, equal to "instance-X/dl". Then, the Buildroot build is executed with BR2_DL_DIR=self.dldir, which means that self.dldir is interpreted relatively to the Buildroot source directory.

Due to this, we get the following directory organization:

instance-0
+ buildroot
+ instance-0
+ dl
+ instance.log
+ output

Instead of the excepted organization:

instance-0
+ buildroot
+ dl
+ instance.log
+ output

Quoted 4 lines

We fix this issue (which was introduced when the Builder class was created) by making self.dldir an absolute path.

Regards,
Arnout

Quoted 18 lines
---
 scripts/autobuild-run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/autobuild-run +1 -1
index ead81a0..7e3c7a0 100755
@@ -270,7 +270,7 @@ class Builder:
         # frequently needed directories
         self.idir = "instance-%d" % self.instance
         self.srcdir = os.path.join(self.idir, "buildroot")
-        self.dldir = os.path.join(self.idir, "dl")
+        self.dldir = os.path.abspath(os.path.join(self.idir, "dl"))
         # We need the absolute path to use with O=, because the relative
         # path to the output directory here is not relative to the
         # Buildroot sources, but to the location of the autobuilder
#2 lore raw

PATCH 1/1 scripts/autobuild-run: calculate dldir as an absolute path

In reply to Thomas Petazzoni
Quoted 23 lines · Thomas Petazzoni

Right now, self.dldir is a relative path, equal to "instance-X/dl". Then, the Buildroot build is executed with BR2_DL_DIR=self.dldir, which means that self.dldir is interpreted relatively to the Buildroot source directory.

Due to this, we get the following directory organization:

instance-0
+ buildroot
+ instance-0
+ dl
+ instance.log
+ output

Instead of the excepted organization:

instance-0
+ buildroot
+ dl
+ instance.log
+ output

Quoted 4 lines

We fix this issue (which was introduced when the Builder class was created) by making self.dldir an absolute path.

I had not noticed this..

Thanks for fixing it!

Regards,
Atharva Lele

Quoted 20 lines
---
 scripts/autobuild-run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/autobuild-run +1 -2
index ead81a0..7e3c7a0 100755
@@ -270,7 +270,7 @@ class Builder:
         # frequently needed directories
         self.idir = "instance-%d" % self.instance
         self.srcdir = os.path.join(self.idir, "buildroot")
-        self.dldir = os.path.join(self.idir, "dl")
+        self.dldir = os.path.abspath(os.path.join(self.idir, "dl"))
         # We need the absolute path to use with O=, because the relative
         # path to the output directory here is not relative to the
         # Buildroot sources, but to the location of the autobuilder
--

2.21.0

#3 lore raw

PATCH 1/1 scripts/autobuild-run: calculate dldir as an absolute path

In reply to Thomas Petazzoni
Quoted 22 lines · On Sat, 14 Sep 2019 15:35:18 +0200 Thomas Petazzoni…

Right now, self.dldir is a relative path, equal to "instance-X/dl". Then, the Buildroot build is executed with BR2_DL_DIR=self.dldir, which means that self.dldir is interpreted relatively to the Buildroot source directory.

Due to this, we get the following directory organization:

instance-0
+ buildroot
+ instance-0
+ dl
+ instance.log
+ output

Instead of the excepted organization:

instance-0
+ buildroot
+ dl
+ instance.log
+ output

Quoted 7 lines

We fix this issue (which was introduced when the Builder class was created) by making self.dldir an absolute path.

---
 scripts/autobuild-run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to buildroot-test.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com