Skip to contentSkip to conversation

package/pkg-utils.mk: add dl_dir to show-info output

PATCH Superseded Arnout Vandecappelle (Essensium/Mind) 4 participants 7 messages Aug 3, 2019 – Sep 26, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 package/pkg-utils.mk: add dl_dir to show-info output

It can be useful for scripts to be able to access a package's source file after download. That used to be easy, just DL_DIR/PKG_SOURCE. However, with the subdirectories in DL_DIR which can be overridden with PKG_DL_SUBDIR, that is no longer easy.

Therefore, this patch adds dl_dir to the package information. It prints just PKG_DL_SUBDIR, to avoid dumping absolute paths to the buildroot directory in the show-info output.

It can be used with the following jq script to get a newline-separated list of all downloaded files:

make show-info | jq -r '.[] | ("dl/" + .dl_dir + "/" + .downloads[]?.source)'

---
v2 -> v3:
- Remove accidental change

v1 -> v2:
- Use DL_SUBDIR (i.e. relative path) instead of DL_DIR (i.e. absolute path). (Yann)
- Move the definition one level higher, because it is anyway the same for all sources. (Yann)
- Update jq script in commit message to handle the above.

---
 package/pkg-utils.mk | 1 +
 1 file changed, 1 insertion(+)
package/pkg-utils.mk +1 -0
index b7280e930f..ef93345595 100644
@@ -94,6 +94,7 @@ endef
 define _json-info-pkg-details
 	"version": "$($(1)_DL_VERSION)",
 	"licenses": "$($(1)_LICENSE)",
+	"dl_dir": "$($(1)_DL_SUBDIR)",
 	"downloads": [
 	$(foreach dl,$(sort $($(1)_ALL_DOWNLOADS)),
 		{
Signature · 1 line
2.21.0
#1 lore raw

PATCH v3 1/1 package/pkg-utils.mk: add dl_dir to show-info output

Arnout, All,

On 2019-08-03 16:04 +0200, Arnout Vandecappelle (Essensium/Mind) spake thusly:

Quoted 9 lines

It can be useful for scripts to be able to access a package's source file after download. That used to be easy, just DL_DIR/PKG_SOURCE. However, with the subdirectories in DL_DIR which can be overridden with PKG_DL_SUBDIR, that is no longer easy.

Therefore, this patch adds dl_dir to the package information. It prints just PKG_DL_SUBDIR, to avoid dumping absolute paths to the buildroot directory in the show-info output.

Quoted 7 lines

It can be used with the following jq script to get a newline-separated list of all downloaded files:

make show-info | jq -r '.[] | ("dl/" + .dl_dir + "/" + .downloads[]?.source)'

Thanks for the jq script! :-)

Regards,
Yann E. MORIN.

Quoted 29 lines

---
v2 -> v3:
- Remove accidental change

v1 -> v2:
- Use DL_SUBDIR (i.e. relative path) instead of DL_DIR (i.e. absolute path). (Yann)
- Move the definition one level higher, because it is anyway the same for all sources. (Yann)
- Update jq script in commit message to handle the above.

---
 package/pkg-utils.mk | 1 +
 1 file changed, 1 insertion(+)
package/pkg-utils.mk +1 -0
index b7280e930f..ef93345595 100644
@@ -94,6 +94,7 @@ endef
 define _json-info-pkg-details
 	"version": "$($(1)_DL_VERSION)",
 	"licenses": "$($(1)_LICENSE)",
+	"dl_dir": "$($(1)_DL_SUBDIR)",
 	"downloads": [
 	$(foreach dl,$(sort $($(1)_ALL_DOWNLOADS)),
 		{
Signature · 1 line
2.21.0
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH v3 1/1 package/pkg-utils.mk: add dl_dir to show-info output

In reply to Arnout Vandecappelle (Essensium/Mind)
Quoted 12 lines · On Sat, 3 Aug 2019 16:04:33 +0200 "Arnout Vandecappelle (Essensium/Mind)"…

It can be useful for scripts to be able to access a package's source file after download. That used to be easy, just DL_DIR/PKG_SOURCE. However, with the subdirectories in DL_DIR which can be overridden with PKG_DL_SUBDIR, that is no longer easy.

Therefore, this patch adds dl_dir to the package information. It prints just PKG_DL_SUBDIR, to avoid dumping absolute paths to the buildroot directory in the show-info output.

It can be used with the following jq script to get a newline-separated list of all downloaded files:

Quoted 7 lines

make show-info | jq -r '.[] | ("dl/" + .dl_dir + "/" + .downloads[]?.source)'

---
v2 -> v3:
- Remove accidental change

Applied to master, thanks.

I asked on IRC to Yann what was the difference between this and "make external-deps". make external-deps only returns the file name, but not its location inside $(BR2_DL_DIR). Perhaps we should change external-deps, as it is no longer very useful as it is ? But of course that's kind of an API breakage... but moving files into subfolders in $(BR2_DL_DIR) was also kind of an API breakage anyway.

Thoughts?

Thomas

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

PATCH v3 1/1 package/pkg-utils.mk: add dl_dir to show-info output

Thomas, Arnout, All,

On 2019-09-25 22:02 +0200, Thomas Petazzoni spake thusly:

Quoted 2 lines

On Sat, 3 Aug 2019 16:04:33 +0200
"Arnout Vandecappelle (Essensium/Mind)" <[email protected]> wrote:

[--SNIP--]

Quoted 1 line
Quoted 1 line

make show-info | jq -r '.[] | ("dl/" + .dl_dir + "/" + .downloads[]?.source)'

[--SNIP--]

Quoted 8 lines

I asked on IRC to Yann what was the difference between this and "make external-deps". make external-deps only returns the file name, but not its location inside $(BR2_DL_DIR). Perhaps we should change external-deps, as it is no longer very useful as it is ? But of course that's kind of an API breakage... but moving files into subfolders in $(BR2_DL_DIR) was also kind of an API breakage anyway.

Thoughts?

As much as I like to keep backward compatibility when it makes sense, external-deps has been broken for ~18 months now (since we moved downloads to sub-directories), and no one complained. It's even been in an LTS for 7 months now, and still no complain so far...

Besides, show-info is a versatile and easily extendable solution to extract this kind of information from Buildroot.

So, what's the point in keeping external-deps?

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#4 lore raw

PATCH v3 1/1 package/pkg-utils.mk: add dl_dir to show-info output

Quoted 22 lines · Yann E. MORIN

Thomas, Arnout, All,

On 2019-09-25 22:02 +0200, Thomas Petazzoni spake thusly:

Quoted 2 lines

On Sat, 3 Aug 2019 16:04:33 +0200
"Arnout Vandecappelle (Essensium/Mind)" <[email protected]> wrote:

[--SNIP--]

Quoted 1 line
Quoted 1 line

make show-info | jq -r '.[] | ("dl/" + .dl_dir + "/" + .downloads[]?.source)'

[--SNIP--]

Quoted 8 lines

I asked on IRC to Yann what was the difference between this and "make external-deps". make external-deps only returns the file name, but not its location inside $(BR2_DL_DIR). Perhaps we should change external-deps, as it is no longer very useful as it is ? But of course that's kind of an API breakage... but moving files into subfolders in $(BR2_DL_DIR) was also kind of an API breakage anyway.

Thoughts?

As much as I like to keep backward compatibility when it makes sense, external-deps has been broken for ~18 months now (since we moved downloads to sub-directories), and no one complained. It's even been in an LTS for 7 months now, and still no complain so far...

Quoted 4 lines

Besides, show-info is a versatile and easily extendable solution to extract this kind of information from Buildroot.

So, what's the point in keeping external-deps?

Kill it with fire!

Regards,
Arnout

#5 lore raw

PATCH v3 1/1 package/pkg-utils.mk: add dl_dir to show-info output

Quoted 11 lines · On Wed, 25 Sep 2019 23:28:05 +0200 Arnout Vandecappelle <[email protected]> wrote:
Quoted 9 lines

As much as I like to keep backward compatibility when it makes sense, external-deps has been broken for ~18 months now (since we moved downloads to sub-directories), and no one complained. It's even been in an LTS for 7 months now, and still no complain so far...

Besides, show-info is a versatile and easily extendable solution to extract this kind of information from Buildroot.

So, what's the point in keeping external-deps?

Kill it with fire!

Do we really want to do that? Remember that we removed source-check, and Thomas DS wanted to reintroduce it because it was useful in his use-case ?

I'm all for dropping duplicated functionality to keep a sane code base and a clear user experience (when there's gazillions of ways to achieve the same thing, it's very confusing for users). But breaking stuff for existing users is not nice, and I know our BDFL is also not happy with breaking things.

Thomas

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

PATCH v3 1/1 package/pkg-utils.mk: add dl_dir to show-info output

Thomas, Arnout, Yann, All,

On 2019-09-26 08:55 +0200, Thomas Petazzoni spake thusly:

Quoted 8 lines
Quoted 2 lines · On Wed, 25 Sep 2019 23:28:05 +0200 Arnout Vandecappelle <[email protected]> wrote:
Quoted 1 line

So, what's the point in keeping external-deps?

Kill it with fire!

Do we really want to do that? Remember that we removed source-check, and Thomas DS wanted to reintroduce it because it was useful in his use-case ?

Quoted 5 lines

I'm all for dropping duplicated functionality to keep a sane code base and a clear user experience (when there's gazillions of ways to achieve the same thing, it's very confusing for users). But breaking stuff for existing users is not nice, and I know our BDFL is also not happy with breaking things.

So I would disagree with my out-of-work alter-ego, and I would consider that external-deps is not broken: it has always explicitly just returned the basename of the downloads and continues to do so. It is different from what show-info provides.

Whether some people find it useful or not (I don't) is another subject.

Regards,
Yann E. MORIN.

PS. Yes, keeping this dichotomy is getting me a bit schizophrenic! ;-) YEM.

Signature · 21 lines
                                        ____________
.-----------------.--------------------:       _    :------------------.
|  Yann E. MORIN  | Real-Time Embedded |    __/ )   | /"\ ASCII RIBBON |
| +33 534.541.179 | Software  Designer |  _/ - /'   | \ / CAMPAIGN     |
| +33 638.411.245 '--------------------: (_    `--, |  X  AGAINST      |
|      yann.morin (at) orange.com      |_="    ,--' | / \ HTML MAIL    |
'--------------------------------------:______/_____:------------------'


_________________________________________________________________________________________________________________________

Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc
pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler
a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration,
Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci.

This message and its attachments may contain confidential or privileged information that may be protected by law;
they should not be distributed, used or copied without authorisation.
If you have received this email in error, please notify the sender and delete this message and its attachments.
As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified.
Thank you.