hashes: add more custom versions to the exclusion list (branch yem/no-hash-custom)
cover hashes: add more custom versions to the exclusion list (branch yem/no-hash-custom)
Hello All!
This series adds more custom versions to the list of files excluded from the hash check.
As a side effect, it also fixes assigning to that exclusion list, adds a hash to Xenomai, and switches gummiboot to use http:// instead of git://.
Regards,
Yann E. MORIN.
The following changes since commit 6b1f66643d782fc6f00e7436d41ceea6d88ad6bf:
dhcpcd: fix ipv6 related compile failure (2015-04-28 21:44:55 +0200)
are available in the git repository at:
git://git.busybox.net/~ymorin/git/buildroot yem/no-hash-custom
for you to fetch changes up to c7721b4bf0d66994d78b3ad75a5371bdbe390d9a:
package/xenomai: ignore custom versions (2015-04-29 00:32:16 +0200)
----------------------------------------------------------------
Yann E. MORIN (7):
boot/gummiboot: switch to http for git clone
pkg-infra: assign BR_NO_CHECK_HASH_FOR so it is recursively-expanded boot/uboot: do not check hash for custom versions boot/barebox: do not check hash for custom versions boot/mxs-bootlets: do not check hash of custom tarball
linux: do not check hashes for custom versions and tarballs package/xenomai: ignore custom versions
boot/barebox/barebox.mk | 4 ++++ boot/gummiboot/gummiboot.mk | 3 ++- boot/mxs-bootlets/mxs-bootlets.mk | 1 + boot/uboot/uboot.mk | 4 ++++ linux/linux.mk | 5 +++++ package/pkg-download.mk | 4 +++- package/xenomai/xenomai.mk | 3 +++ 7 files changed, 22 insertions(+), 2 deletions(-)
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/7 boot/gummiboot: switch to http for git clone
The git:// protocol may not go through conservative corporate firewalls. Use http, that goes out through about anything.
--- boot/gummiboot/gummiboot.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
boot/gummiboot/gummiboot.mk +2 -1
@@ -4,7 +4,8 @@ # ################################################################################ -GUMMIBOOT_SITE = git://anongit.freedesktop.org/gummiboot +GUMMIBOOT_SITE = http://cgit.freedesktop.org/gummiboot +GUMMIBOOT_SITE_METHOD = git GUMMIBOOT_VERSION = 43 GUMMIBOOT_LICENSE = LGPLv2.1+ GUMMIBOOT_LICENSE_FILES = LICENSE
Signature · 1 line
1.9.1
Thomas Petazzoni
AppliedPATCH 1/7 boot/gummiboot: switch to http for git clone
Dear Yann E. MORIN,
Quoted 7 lines · Yann E. MORIN
The
git://protocol may not go through conservative corporate firewalls. Use http, that goes out through about anything.Signed-off-by "Yann E. MORIN" <[email protected]>--- boot/gummiboot/gummiboot.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Applied, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 2/7 pkg-infra: assign BR_NO_CHECK_HASH_FOR so it is recursively-expanded
In reply to Yann E. MORINCurrently, assigning to BR_NO_CHECK_HASH_FOR in conditionals, but referencing vairaible assigned to later, fails. Here's a failing test-case, which is the reduced test-case of how we handle BR_NO_CHECK_HASH_FOR for now:
export FOO
ifeq ($(BAR_V),)
BAR_V=1
else
FOO += $(BAR_S)
endif
BAR_S = bar-$(BAR_V).tar
all:
@echo "BAR_S=\"$(BAR_S)\""
@$(SHELL) -c 'echo "FOO=\"$${FOO}\""'Run it with:
$ make
BAR_S="bar-1.tar"
FOO=""
$ make BAR_V=2
BAR_S="bar-2.tar"
FOO=" "Now, change the firstline to read:
export FOO =
And we now get:
$ make
BAR_S="bar-1.tar"
FOO=""
$ make BAR_V=2
BAR_S="bar-2.tar"
FOO=" bar-2.tar"This new behaviour will be needed later for Xenomai, which handles the version string in an unusual way.
(Note how there's a leading space in both cases? In Buildroot, we do not care that extra space, it is simply ignored).
--- package/pkg-download.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
package/pkg-download.mk +3 -1
@@ -56,7 +56,9 @@ domainseparator = $(if $(1),$(1),/) github = https://github.com/$(1)/$(2)/archive/$(3) # Expressly do not check hashes for those files -export BR_NO_CHECK_HASH_FOR +# It needs to be assigned so as to be a recursively-expanded variable, and +# so that it can be assigned inside conditionals. +export BR_NO_CHECK_HASH_FOR = ################################################################################ # The DOWNLOAD_* helpers are in charge of getting a working copy
Signature · 1 line
1.9.1
PATCH 2/7 pkg-infra: assign BR_NO_CHECK_HASH_FOR so it is recursively-expanded
Quoted 2 lines · Yann E. MORIN
Currently, assigning to
BR_NO_CHECK_HASH_FORin conditionals, but referencing vairaible assigned to later, fails. Here's a failing
variable
Quoted 10 lines
test-case, which is the reduced test-case of how we handle
BR_NO_CHECK_HASH_FORfor now:export FOO ifeq ($(BAR_V),) BAR_V=1 else FOO += $(BAR_S) endif
I think the test case is too complicated - in fact the conditional construct
has nothing to do with it. The culprit is appending to it, which means we never explicitly set it to recursively expanded. Exported variables that are not defined explicitly for some reason default to be immediately expanded rather than recursively.
export FOO
FOO += $(BAR)
$(warning FOO='$(FOO)' BAR='$(BAR)')
BAR = BAR
$(warning FOO='$(FOO)' BAR='$(BAR)')
default:
Will give
/tmp/Makefile:3: FOO=' ' BAR=''/tmp/Makefile:5: FOO=' ' BAR='BAR'
while explicitly setting FOO to be recursively expanded:
export FOO =
will give
/tmp/Makefile:3: FOO=' ' BAR=''/tmp/Makefile:5: FOO=' BAR' BAR='BAR'
Quoted 29 lines
BAR_S = bar-$(BAR_V).tar all: @echo "BAR_S=\"$(BAR_S)\"" @$(SHELL) -c 'echo "FOO=\"$${FOO}\""'Run it with:
$ make BAR_S="bar-1.tar" FOO="" $ make BAR_V=2 BAR_S="bar-2.tar" FOO=" "Now, change the firstline to read:
export FOO =
And we now get:
$ make BAR_S="bar-1.tar" FOO="" $ make BAR_V=2 BAR_S="bar-2.tar" FOO=" bar-2.tar"
Quoted 5 lines
This new behaviour will be needed later for Xenomai, which handles the version string in an unusual way.
(Note how there's a leading space in both cases? In Buildroot, we do not care that extra space, it is simply ignored).
The leading space is there because += always inserts a space, even if the
variable was empty before.
Quoted 13 lines
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Arnout Vandecappelle <[email protected]>Cc Thomas Petazzoni <[email protected]>--- package/pkg-download.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)package/pkg-download.mk +0
-0
package/pkg-download.mk domainseparator = $(if $(1),$(1),/) · line 60
Quoted 6 lines
package/pkg-download.mk +2
-1@@ -56,7 +56,9 @@ domainseparator = $(if $(1),$(1),/) github = https://github.com/$(1)/$(2)/archive/$(3) # Expressly do not check hashes for those files -export BR_NO_CHECK_HASH_FOR +# It needs to be assigned so as to be a recursively-expanded variable, and +# so that it can be assigned inside conditionals.
# Exported variables default to immediately expanded, but we need it to be # recursively-epxanded, so explicitly define it.
With all that,
Regards,
Arnout
Quoted 5 lines
package/pkg-download.mk +1
-0+export BR_NO_CHECK_HASH_FOR = ################################################################################ # The DOWNLOAD_* helpers are in charge of getting a working copy
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 2/7 pkg-infra: assign BR_NO_CHECK_HASH_FOR so it is recursively-expanded
arnout, All,
On 2015-05-01 15:07 +0200, Arnout Vandecappelle spake thusly:
Quoted 10 lines · Yann E. MORIN
Quoted 2 lines
Currently, assigning to
BR_NO_CHECK_HASH_FORin conditionals, but referencing vairaible assigned to later, fails. Here's a failingvariable
Quoted 5 lines
test-case, which is the reduced test-case of how we handle
BR_NO_CHECK_HASH_FORfor now:export FOO
Quoted 8 lines
Quoted 5 lines
ifeq ($(BAR_V),) BAR_V=1 else FOO += $(BAR_S) endifI think the test case is too complicated - in fact the conditional construct
has nothing to do with it.
Yup, right, I know. However, I wanted a reduced test-case that still ressembled our current code base.
Quoted 4 lines
The culprit is appending to it, which means we never
explicitly set it to recursively expanded. Exported variables that are not defined explicitly for some reason default to be immediately expanded rather than recursively.
Exactly. However, there's nothing like so explained in the make manual.
Quoted 12 lines
export FOO
FOO += $(BAR)
$(warning FOO='$(FOO)' BAR='$(BAR)')
BAR = BAR
$(warning FOO='$(FOO)' BAR='$(BAR)')
default:Will give
/tmp/Makefile:3: FOO=' ' BAR=''/tmp/Makefile:5: FOO=' ' BAR='BAR'
Quoted 8 lines
while explicitly setting FOO to be recursively expanded:
export FOO =
will give
/tmp/Makefile:3: FOO=' ' BAR=''/tmp/Makefile:5: FOO=' BAR' BAR='BAR'
Do you prefere I use your even-more-simplified test-case, or may I keep the reduced test-case I provided that ressemble our current code-path?
Quoted 29 lines
Quoted 29 lines
BAR_S = bar-$(BAR_V).tar all: @echo "BAR_S=\"$(BAR_S)\"" @$(SHELL) -c 'echo "FOO=\"$${FOO}\""'Run it with:
$ make BAR_S="bar-1.tar" FOO="" $ make BAR_V=2 BAR_S="bar-2.tar" FOO=" "Now, change the firstline to read:
export FOO =
And we now get:
$ make BAR_S="bar-1.tar" FOO="" $ make BAR_V=2 BAR_S="bar-2.tar" FOO=" bar-2.tar"
Quoted 8 lines
Quoted 5 lines
This new behaviour will be needed later for Xenomai, which handles the version string in an unusual way.
(Note how there's a leading space in both cases? In Buildroot, we do not care that extra space, it is simply ignored).
The leading space is there because += always inserts a space, even if the
variable was empty before.
Yes, I know. I'll ditch that comment.
Quoted 14 lines
Quoted 14 lines
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Arnout Vandecappelle <[email protected]>Cc Thomas Petazzoni <[email protected]>--- package/pkg-download.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)package/pkg-download.mk +0
-0@@ -56,7 +56,9 @@ domainseparator = $(if $(1),$(1),/) github = https://github.com/$(1)/$(2)/archive/$(3)
Quoted 6 lines
package/pkg-download.mk domainseparator = $(if $(1),$(1),/) · line 60
Quoted 4 lines
package/pkg-download.mk +2
-1# Expressly do not check hashes for those files -export BR_NO_CHECK_HASH_FOR +# It needs to be assigned so as to be a recursively-expanded variable, and +# so that it can be assigned inside conditionals.# Exported variables default to immediately expanded,
I would avoid stating that. That's the behaviour we observed, but nothing is said about that in the make manual. If a future version of make changes that behaviour, the comment would be wrong.
However, I'll ditch the comment about conditionals.
Quoted 7 lines
# but we need it to be # recursively-epxanded, so explicitly define it.With all that,
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 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 2/7 pkg-infra: assign BR_NO_CHECK_HASH_FOR so it is recursively-expanded
Quoted 25 lines · Yann E. MORIN
arnout, All,
On 2015-05-01 15:07 +0200, Arnout Vandecappelle spake thusly:
Quoted 10 lines · Yann E. MORIN
Quoted 2 lines
Currently, assigning to
BR_NO_CHECK_HASH_FORin conditionals, but referencing vairaible assigned to later, fails. Here's a failingvariable
Quoted 5 lines
test-case, which is the reduced test-case of how we handle
BR_NO_CHECK_HASH_FORfor now:export FOO
Quoted 8 lines
Quoted 5 lines
ifeq ($(BAR_V),) BAR_V=1 else FOO += $(BAR_S) endifI think the test case is too complicated - in fact the conditional construct
has nothing to do with it.Yup, right, I know. However, I wanted a reduced test-case that still ressembled our current code base.
Quoted 6 lines
Quoted 4 lines
The culprit is appending to it, which means we never
explicitly set it to recursively expanded. Exported variables that are not defined explicitly for some reason default to be immediately expanded rather than recursively.Exactly. However, there's nothing like so explained in the make manual.
So patch the make manual :-)
Quoted 17 lines
Quoted 17 lines
export FOO
FOO += $(BAR)
$(warning FOO='$(FOO)' BAR='$(BAR)')
BAR = BAR
$(warning FOO='$(FOO)' BAR='$(BAR)')
default:Will give
/tmp/Makefile:3: FOO=' ' BAR=''/tmp/Makefile:5: FOO=' ' BAR='BAR'while explicitly setting FOO to be recursively expanded:
export FOO =
Quoted 7 lines
Quoted 4 lines
will give
/tmp/Makefile:3: FOO=' ' BAR=''/tmp/Makefile:5: FOO=' BAR' BAR='BAR'Do you prefere I use your even-more-simplified test-case, or may I keep the reduced test-case I provided that ressemble our current code-path?
Well, the relevant part of our current code path (taking your example) is:
export FOO
FOO += $(BAR_S)BAR_S = bar.tar
Whether or not BAR_V and FOO are defined in two separate conditional branches
and whether or not BAR_S contains a reference to BAR_V is really irrelevant.
If you want to make it resemble our code path more, then just use the real
variable names:
export BR_NO_CHECK_HASH_FOR BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE) XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
[snip]
Quoted 10 lines
Quoted 6 lines
package/pkg-download.mk domainseparator = $(if $(1),$(1),/) · line 60
Quoted 4 lines
# Expressly do not check hashes for those files
package/pkg-download.mk +2
-1-export BR_NO_CHECK_HASH_FOR +# It needs to be assigned so as to be a recursively-expanded variable, and +# so that it can be assigned inside conditionals.# Exported variables default to immediately expanded,
I would avoid stating that. That's the behaviour we observed, but nothing is said about that in the make manual. If a future version of make changes that behaviour, the comment would be wrong.
Then say "in some versions of make".
Regards,
Arnout
Quoted 14 lines
However, I'll ditch the comment about conditionals.
Quoted 7 lines
# but we need it to be # recursively-epxanded, so explicitly define it.With all that,
Regards,
Yann E. MORIN.
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 2/7 pkg-infra: assign BR_NO_CHECK_HASH_FOR so it is recursively-expanded
Arnout, All,
On 2015-05-01 17:45 +0200, Arnout Vandecappelle spake thusly:
Quoted 3 lines · Yann E. MORIN
Quoted 2 lines
On 2015-05-01 15:07 +0200, Arnout Vandecappelle spake thusly:
Quoted 1 line · Yann E. MORIN
[--SNIP--]
Quoted 3 lines
Quoted 1 line
Exactly. However, there's nothing like so explained in the make manual.
So patch the make manual :-)
Eh! ;-)
[--SNIP--]
Quoted 12 lines
Quoted 2 lines
Do you prefere I use your even-more-simplified test-case, or may I keep the reduced test-case I provided that ressemble our current code-path?
Well, the relevant part of our current code path (taking your example) is:
export FOO
FOO += $(BAR_S)BAR_S= bar.tarWhether or not
BAR_Vand FOO are defined in two separate conditional branches
and whether or notBAR_Scontains a reference toBAR_Vis really irrelevant.
Quoted 6 lines
If you want to make it resemble our code path more, then just use the real
variable names:export
BR_NO_CHECK_HASH_FORBR_NO_CHECK_HASH_FOR+= $(XENOMAI_SOURCE)XENOMAI_SOURCE= xenomai-$(XENOMAI_VERSION).tar.bz2
Right, will switch to using those three lines.
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
package/pkg-download.mk domainseparator = $(if $(1),$(1),/) · line 60
Quoted 4 lines
# Expressly do not check hashes for those files
package/pkg-download.mk +2
-1-export BR_NO_CHECK_HASH_FOR +# It needs to be assigned so as to be a recursively-expanded variable, and +# so that it can be assigned inside conditionals.# Exported variables default to immediately expanded,
Quoted 5 lines
Quoted 3 lines
I would avoid stating that. That's the behaviour we observed, but nothing is said about that in the make manual. If a future version of make changes that behaviour, the comment would be wrong.
Then say "in some versions of make".
OK.
Thanks! :-)
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 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 3/7 boot/uboot: do not check hash for custom versions
In reply to Yann E. MORINFor custom tarballs, it's quite obvious we can not check hashes.
For custom versions, that's not so obvious. One might think we could have hashes for all the official releases, but that's not possible: if the user uses a released version of Buildroot (say 2015.05) much later in the future, and wants to use the then-released 2038.02 U-Boot. It now seems pretty obvious that Buildroot 2015.02 can't know the hash for U-Boot 2038.02.
So, disable checking the hash for custom tarballs and custom versions.
--- boot/uboot/uboot.mk | 4 ++++ 1 file changed, 4 insertions(+)
boot/uboot/uboot.mk +4 -0
@@ -17,6 +17,7 @@ ifeq ($(UBOOT_VERSION),custom) UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION)) UBOOT_SITE = $(patsubst %/,%,$(dir $(UBOOT_TARBALL))) UBOOT_SOURCE = $(notdir $(UBOOT_TARBALL)) +BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE) else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y) UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)) UBOOT_SITE_METHOD = git
@@ -27,6 +28,9 @@ else # Handle stable official U-Boot versions UBOOT_SITE = ftp://ftp.denx.de/pub/u-boot UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2 +ifeq ($(BR2_TARGET_UBOOT_CUSTOM_VERSION),y) +BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE) +endif endif ifeq ($(BR2_TARGET_UBOOT_FORMAT_ELF),y)
Signature · 1 line
1.9.1
PATCH 3/7 boot/uboot: do not check hash for custom versions
Quoted 1 line · Yann E. MORIN
For custom tarballs, it's quite obvious we can not check hashes.
Hi Yann,
Thank you for this patch. It does repair for me the build of pandaboard_defconfig.
Best regards,
V.
PATCH 3/7 boot/uboot: do not check hash for custom versions
In reply to Yann E. MORINQuoted 31 lines · Yann E. MORIN
For custom tarballs, it's quite obvious we can not check hashes.
For custom versions, that's not so obvious. One might think we could have hashes for all the official releases, but that's not possible: if the user uses a released version of Buildroot (say 2015.05) much later in the future, and wants to use the then-released 2038.02 U-Boot. It now seems pretty obvious that Buildroot 2015.02 can't know the hash for U-Boot 2038.02.
So, disable checking the hash for custom tarballs and custom versions.
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Vincent Stehle <[email protected]>--- boot/uboot/uboot.mk | 4 ++++ 1 file changed, 4 insertions(+)boot/uboot/uboot.mk +1
-0@@ -17,6 +17,7 @@ ifeq ($(UBOOT_VERSION),custom) UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION)) UBOOT_SITE = $(patsubst %/,%,$(dir $(UBOOT_TARBALL))) UBOOT_SOURCE = $(notdir $(UBOOT_TARBALL)) +BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE) else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y) UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)) UBOOT_SITE_METHOD = git
boot/uboot/uboot.mk else · line 34
Quoted 7 lines
boot/uboot/uboot.mk +3
-0@@ -27,6 +28,9 @@ else # Handle stable official U-Boot versions UBOOT_SITE = ftp://ftp.denx.de/pub/u-boot UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2 +ifeq ($(BR2_TARGET_UBOOT_CUSTOM_VERSION),y) +BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE) +endif endif
Since we really only have a hash for the latest version, I would prefer a
simple check after the entire condition:
ifeq ($(BR2_TARGET_UBOOT_LATEST_VERSION),)BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE)
endif
This redundantly handles the VCS cases, but OTOH it doesn't hurt to have these
tarballs in there either. Actually, before patch 2/7, the VCS cases wouldn't even be added because UBOOT_SOURCE is not set yet at that point :-)
Regards,
Arnout
Quoted 3 lines
boot/uboot/uboot.mk +0
-0ifeq ($(BR2_TARGET_UBOOT_FORMAT_ELF),y)
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 3/7 boot/uboot: do not check hash for custom versions
Arnout, All,
On 2015-05-01 15:14 +0200, Arnout Vandecappelle spake thusly:
Quoted 43 lines · Yann E. MORIN
Quoted 31 lines
For custom tarballs, it's quite obvious we can not check hashes.
For custom versions, that's not so obvious. One might think we could have hashes for all the official releases, but that's not possible: if the user uses a released version of Buildroot (say 2015.05) much later in the future, and wants to use the then-released 2038.02 U-Boot. It now seems pretty obvious that Buildroot 2015.02 can't know the hash for U-Boot 2038.02.
So, disable checking the hash for custom tarballs and custom versions.
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Vincent Stehle <[email protected]>--- boot/uboot/uboot.mk | 4 ++++ 1 file changed, 4 insertions(+)boot/uboot/uboot.mk +1
-0@@ -17,6 +17,7 @@ ifeq ($(UBOOT_VERSION),custom) UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION)) UBOOT_SITE = $(patsubst %/,%,$(dir $(UBOOT_TARBALL))) UBOOT_SOURCE = $(notdir $(UBOOT_TARBALL)) +BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE) else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y) UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)) UBOOT_SITE_METHOD = gitboot/uboot/uboot.mk else · line 34
Quoted 7 lines
boot/uboot/uboot.mk +3
-0@@ -27,6 +28,9 @@ else # Handle stable official U-Boot versions UBOOT_SITE = ftp://ftp.denx.de/pub/u-boot UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2 +ifeq ($(BR2_TARGET_UBOOT_CUSTOM_VERSION),y) +BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE) +endif endifSince we really only have a hash for the latest version, I would prefer a
simple check after the entire condition:
Quoted 6 lines
ifeq ($(BR2_TARGET_UBOOT_LATEST_VERSION),)
BR_NO_CHECK_HASH_FOR+= $(UBOOT_SOURCE)
endifThis redundantly handles the VCS cases, but OTOH it doesn't hurt to have these
tarballs in there either.
Acutally, I prefer we explicitly exclude only what we really want to be excluded.
VCS sutff is forcibly excluded, becasue the git/hg/cvs/svn/bzr macros do explicitly disable checking hashes by themselves.
Also, I would ultimately like that it is an error if there is a hash for something that is excluded. Granted, it;'s currently not possible, but long-term I;d like to revisit this.
So, in the end, I'd really like to only exckude what really needs to be excluded.
Quoted 2 lines
Actually, before patch 2/7, the VCS cases wouldn't
even be added becauseUBOOT_SOURCEis not set yet at that point :-)
Well, in my patch, it is set a few lines above. And patch 2 is already applied! ;-)
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 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 3/7 boot/uboot: do not check hash for custom versions
Quoted 59 lines · Yann E. MORIN
Arnout, All,
On 2015-05-01 15:14 +0200, Arnout Vandecappelle spake thusly:
Quoted 43 lines · Yann E. MORIN
Quoted 31 lines
For custom tarballs, it's quite obvious we can not check hashes.
For custom versions, that's not so obvious. One might think we could have hashes for all the official releases, but that's not possible: if the user uses a released version of Buildroot (say 2015.05) much later in the future, and wants to use the then-released 2038.02 U-Boot. It now seems pretty obvious that Buildroot 2015.02 can't know the hash for U-Boot 2038.02.
So, disable checking the hash for custom tarballs and custom versions.
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Vincent Stehle <[email protected]>--- boot/uboot/uboot.mk | 4 ++++ 1 file changed, 4 insertions(+)boot/uboot/uboot.mk +1
-0@@ -17,6 +17,7 @@ ifeq ($(UBOOT_VERSION),custom) UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION)) UBOOT_SITE = $(patsubst %/,%,$(dir $(UBOOT_TARBALL))) UBOOT_SOURCE = $(notdir $(UBOOT_TARBALL)) +BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE) else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y) UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)) UBOOT_SITE_METHOD = gitboot/uboot/uboot.mk else · line 34
Quoted 7 lines
boot/uboot/uboot.mk +3
-0@@ -27,6 +28,9 @@ else # Handle stable official U-Boot versions UBOOT_SITE = ftp://ftp.denx.de/pub/u-boot UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2 +ifeq ($(BR2_TARGET_UBOOT_CUSTOM_VERSION),y) +BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE) +endif endifSince we really only have a hash for the latest version, I would prefer a
simple check after the entire condition:Quoted 6 lines
ifeq ($(BR2_TARGET_UBOOT_LATEST_VERSION),)
BR_NO_CHECK_HASH_FOR+= $(UBOOT_SOURCE)
endifThis redundantly handles the VCS cases, but OTOH it doesn't hurt to have these
tarballs in there either.Acutally, I prefer we explicitly exclude only what we really want to be excluded.
VCS sutff is forcibly excluded, becasue the git/hg/cvs/svn/bzr macros do explicitly disable checking hashes by themselves.
Quoted 6 lines
Also, I would ultimately like that it is an error if there is a hash for something that is excluded. Granted, it;'s currently not possible, but long-term I;d like to revisit this.
So, in the end, I'd really like to only exckude what really needs to be excluded.
OK. So:
Quoted 6 lines
Quoted 3 lines
Actually, before patch 2/7, the VCS cases wouldn't
even be added becauseUBOOT_SOURCEis not set yet at that point :-)Well, in my patch, it is set a few lines above. And patch 2 is already applied! ;-)
Is it? Or do you mean patch 1?
Regards,
Arnout
Quoted 4 lines
Regards,
Yann E. MORIN.
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 3/7 boot/uboot: do not check hash for custom versions
Arnout, All,
On 2015-05-01 17:48 +0200, Arnout Vandecappelle spake thusly:
Quoted 1 line · Yann E. MORIN
[--SNIP--]
Quoted 2 lines
Quoted 2 lines
Acutally, I prefer we explicitly exclude only what we really want to be excluded.
[--SNIP--]
Quoted 1 line
Thanks! :-)
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Actually, before patch 2/7, the VCS cases wouldn't
even be added becauseUBOOT_SOURCEis not set yet at that point :-)Well, in my patch, it is set a few lines above. And patch 2 is already applied! ;-)
Is it? Or do you mean patch 1?
Well, I meant "patch 2 is applied in the series, before this one patch", so your proposal was OK.
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 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 4/7 boot/barebox: do not check hash for custom versions
In reply to Yann E. MORINAs we recently did for U-Boot, disable chekcing hashes for custom versions of barebox.
Note that we currently have no hash file for barebox, but avoiding the check will already be in place when we do add it.
--- boot/barebox/barebox.mk | 4 ++++ 1 file changed, 4 insertions(+)
boot/barebox/barebox.mk +4 -0
@@ -11,6 +11,7 @@ ifeq ($(BAREBOX_VERSION),custom) BAREBOX_TARBALL = $(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_TARBALL_LOCATION)) BAREBOX_SITE = $(patsubst %/,%,$(dir $(BAREBOX_TARBALL))) BAREBOX_SOURCE = $(notdir $(BAREBOX_TARBALL)) +BR_NO_CHECK_HASH_FOR += $(BAREBOX_SOURCE) else ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_GIT),y) BAREBOX_SITE = $(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_GIT_REPO_URL)) BAREBOX_SITE_METHOD = git
@@ -18,6 +19,9 @@ else # Handle stable official Barebox versions BAREBOX_SOURCE = barebox-$(BAREBOX_VERSION).tar.bz2 BAREBOX_SITE = http://www.barebox.org/download +ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_VERSION),y) +BR_NO_CHECK_HASH_FOR += $(BAREBOX_SOURCE) +endif endif BAREBOX_DEPENDENCIES = host-lzop
Signature · 1 line
1.9.1
PATCH 4/7 boot/barebox: do not check hash for custom versions
Quoted 1 line · Yann E. MORIN
As we recently did for U-Boot, disable chekcing hashes for custom
checking
Quoted 24 lines
versions of barebox.
Note that we currently have no hash file for barebox, but avoiding the check will already be in place when we do add it.
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas Petazzoni <[email protected]>--- boot/barebox/barebox.mk | 4 ++++ 1 file changed, 4 insertions(+)boot/barebox/barebox.mk +1
-0@@ -11,6 +11,7 @@ ifeq ($(BAREBOX_VERSION),custom) BAREBOX_TARBALL = $(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_TARBALL_LOCATION)) BAREBOX_SITE = $(patsubst %/,%,$(dir $(BAREBOX_TARBALL))) BAREBOX_SOURCE = $(notdir $(BAREBOX_TARBALL)) +BR_NO_CHECK_HASH_FOR += $(BAREBOX_SOURCE) else ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_GIT),y) BAREBOX_SITE = $(call qstrip,$(BR2_TARGET_BAREBOX_CUSTOM_GIT_REPO_URL)) BAREBOX_SITE_METHOD = git
boot/barebox/barebox.mk else · line 25
Quoted 7 lines
boot/barebox/barebox.mk +3
-0@@ -18,6 +19,9 @@ else # Handle stable official Barebox versions BAREBOX_SOURCE = barebox-$(BAREBOX_VERSION).tar.bz2 BAREBOX_SITE = http://www.barebox.org/download +ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_VERSION),y) +BR_NO_CHECK_HASH_FOR += $(BAREBOX_SOURCE) +endif endif
Same comment as for U-Boot.
Regards,
Arnout
Quoted 3 lines
boot/barebox/barebox.mk +0
-0BAREBOX_DEPENDENCIES = host-lzop
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 4/7 boot/barebox: do not check hash for custom versions
Arnout, All,
On 2015-05-01 15:15 +0200, Arnout Vandecappelle spake thusly:
Quoted 1 line · Yann E. MORIN
[--SNIP--]
Quoted 10 lines
boot/barebox/barebox.mk else · line 25
Quoted 8 lines
boot/barebox/barebox.mk +3
-0@@ -18,6 +19,9 @@ else # Handle stable official Barebox versions BAREBOX_SOURCE = barebox-$(BAREBOX_VERSION).tar.bz2 BAREBOX_SITE = http://www.barebox.org/download +ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_VERSION),y) +BR_NO_CHECK_HASH_FOR += $(BAREBOX_SOURCE) +endif endifSame comment as for U-Boot.
Same answer. ;-)
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 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 4/7 boot/barebox: do not check hash for custom versions
Quoted 16 lines · Yann E. MORIN
Arnout, All,
On 2015-05-01 15:15 +0200, Arnout Vandecappelle spake thusly:
Quoted 1 line · Yann E. MORIN
[--SNIP--]
Quoted 10 lines
boot/barebox/barebox.mk else · line 25
Quoted 8 lines
boot/barebox/barebox.mk +3
-0@@ -18,6 +19,9 @@ else # Handle stable official Barebox versions BAREBOX_SOURCE = barebox-$(BAREBOX_VERSION).tar.bz2 BAREBOX_SITE = http://www.barebox.org/download +ifeq ($(BR2_TARGET_BAREBOX_CUSTOM_VERSION),y) +BR_NO_CHECK_HASH_FOR += $(BAREBOX_SOURCE) +endif endifSame comment as for U-Boot.
Quoted 1 line
Same answer. ;-)
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 5/7 boot/mxs-bootlets: do not check hash of custom tarball
In reply to Yann E. MORIN--- boot/mxs-bootlets/mxs-bootlets.mk | 1 + 1 file changed, 1 insertion(+)
boot/mxs-bootlets/mxs-bootlets.mk +1 -0
@@ -8,6 +8,7 @@ ifeq ($(BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL),y) MXS_BOOTLETS_TARBALL = $(call qstrip,$(BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL_URL)) MXS_BOOTLETS_SITE = $(patsubst %/,%,$(dir $(MXS_BOOTLETS_TARBALL))) MXS_BOOTLETS_SOURCE = $(notdir $(MXS_BOOTLETS_TARBALL)) +BR_NO_CHECK_HASH_FOR += $(MXS_BOOTLETS_SOURCE) else ifeq ($(BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT),y) MXS_BOOTLETS_SITE = $(BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT_URL) MXS_BOOTLETS_SITE_METHOD = git
Signature · 1 line
1.9.1
PATCH 5/7 boot/mxs-bootlets: do not check hash of custom tarball
Quoted 1 line · Yann E. MORIN
Signed-off-by "Yann E. MORIN" <[email protected]>
by adding an empty .hash file and checking that it fails for the default
version but not for a custom version.
Regards,
Arnout
Quoted 17 lines
--- boot/mxs-bootlets/mxs-bootlets.mk | 1 + 1 file changed, 1 insertion(+)boot/mxs-bootlets/mxs-bootlets.mk +1
-0@@ -8,6 +8,7 @@ ifeq ($(BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL),y) MXS_BOOTLETS_TARBALL = $(call qstrip,$(BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL_URL)) MXS_BOOTLETS_SITE = $(patsubst %/,%,$(dir $(MXS_BOOTLETS_TARBALL))) MXS_BOOTLETS_SOURCE = $(notdir $(MXS_BOOTLETS_TARBALL)) +BR_NO_CHECK_HASH_FOR += $(MXS_BOOTLETS_SOURCE) else ifeq ($(BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT),y) MXS_BOOTLETS_SITE = $(BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT_URL) MXS_BOOTLETS_SITE_METHOD = git
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 6/7 linux: do not check hashes for custom versions and tarballs
In reply to Yann E. MORIN--- linux/linux.mk | 5 +++++ 1 file changed, 5 insertions(+)
linux/linux.mk +5 -0
@@ -13,8 +13,10 @@ ifeq ($(BR2_LINUX_KERNEL_CUSTOM_TARBALL),y) LINUX_TARBALL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION)) LINUX_SITE = $(patsubst %/,%,$(dir $(LINUX_TARBALL))) LINUX_SOURCE = $(notdir $(LINUX_TARBALL)) +BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_LOCAL),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH)) +# For 'local', there is no hash check, so no need to set BR_NO_CHECK_HASH_FOR LINUX_SITE_METHOD = local else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL))
@@ -24,6 +26,9 @@ LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) LINUX_SITE_METHOD = hg else LINUX_SOURCE = linux-$(LINUX_VERSION).tar.xz +ifeq ($(BR2_LINUX_KERNEL_CUSTOM_VERSION),y) +BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) +endif # In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order # to use the $(word) function. We support versions such as 4.0, 3.1, # 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.
Signature · 1 line
1.9.1
PATCH 6/7 linux: do not check hashes for custom versions and tarballs
Hah, this is a tough one...
With the combination BR2_LINUX_SAME_AS_HEADERS and BR2_KERNEL_HEADERS_VERSION
you can still get a custom version...
So I'm thinking if it wouldn't be simpler to just always disable the hash:BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE)
Note that the hash, if it exists, will still be checked; it just won't be an
error if the hash doesn't exist (so the variable is not named very accurately in fact). Therefore I think it's safe to disable it completely for linux. Or, if you prefer you can make it depend on !BR2_LINUX_KERNEL_LATEST_VERSION && !(BR2_LINUX_SAME_AS_HEADERS && !BR2_KERNEL_HEADERS_VERSION) (good luck expressing that in make syntax :-).
Quoted 11 lines · Yann E. MORIN
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas Petazzoni <[email protected]>--- linux/linux.mk | 5 +++++ 1 file changed, 5 insertions(+)linux/linux.mk +0
-0
linux/linux.mk ifeq ($(BR2_LINUX_KERNEL_CUSTOM_TARBALL),y) · line 19
Quoted 7 lines
linux/linux.mk +2
-0@@ -13,8 +13,10 @@ ifeq ($(BR2_LINUX_KERNEL_CUSTOM_TARBALL),y) LINUX_TARBALL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION)) LINUX_SITE = $(patsubst %/,%,$(dir $(LINUX_TARBALL))) LINUX_SOURCE = $(notdir $(LINUX_TARBALL)) +BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_LOCAL),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH)) +# For 'local', there is no hash check, so no need to set BR_NO_CHECK_HASH_FOR
Why do you add that comment here and not in the VCS cases? I don't think it is
needed, move it to the commit message.
Regards,
Arnout
Quoted 14 lines
linux/linux.mk +3
-0LINUX_SITE_METHOD = local else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL))@@ -24,6 +26,9 @@ LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) LINUX_SITE_METHOD = hg else LINUX_SOURCE = linux-$(LINUX_VERSION).tar.xz +ifeq ($(BR2_LINUX_KERNEL_CUSTOM_VERSION),y) +BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) +endif # In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order # to use the $(word) function. We support versions such as 4.0, 3.1, # 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 6/7 linux: do not check hashes for custom versions and tarballs
Arnout, All,
On 2015-05-01 15:34 +0200, Arnout Vandecappelle spake thusly:
Quoted 1 line
Hah, this is a tough one...
Doh, right...
Quoted 2 lines
With the combination
BR2_LINUX_SAME_AS_HEADERSandBR2_KERNEL_HEADERS_VERSION
you can still get a custom version...
Hmm.. I missed that case... :-/
Quoted 6 lines
So I'm thinking if it wouldn't be simpler to just always disable the hash:
BR_NO_CHECK_HASH_FOR+= $(LINUX_SOURCE)Note that the hash, if it exists, will still be checked; it just won't be an
error if the hash doesn't exist (so the variable is not named very accurately in fact). Therefore I think it's safe to disable it completely for linux.
Well, I stand on my position that I'd like we only exclude only what we strictly require to be excluded.
Quoted 4 lines
Or, if
you prefer you can make it depend on !BR2_LINUX_KERNEL_LATEST_VERSION && !(BR2_LINUX_SAME_AS_HEADERS && !BR2_KERNEL_HEADERS_VERSION) (good luck expressing that in make syntax :-).
Well, we still have the option of expressing that in Kconfig if that can help...
Quoted 7 lines · Yann E. MORIN
Quoted 6 lines
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas Petazzoni <[email protected]>--- linux/linux.mk | 5 +++++ 1 file changed, 5 insertions(+)
Quoted 15 lines
linux/linux.mk ifeq ($(BR2_LINUX_KERNEL_CUSTOM_TARBALL),y) · line 19
Quoted 12 lines
linux/linux.mk +2
-0@@ -13,8 +13,10 @@ ifeq ($(BR2_LINUX_KERNEL_CUSTOM_TARBALL),y) LINUX_TARBALL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION)) LINUX_SITE = $(patsubst %/,%,$(dir $(LINUX_TARBALL))) LINUX_SOURCE = $(notdir $(LINUX_TARBALL)) +BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_LOCAL),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH)) +# For 'local', there is no hash check, so no need to set BR_NO_CHECK_HASH_FORWhy do you add that comment here and not in the VCS cases? I don't think it is
needed, move it to the commit message.
OK.
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 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 6/7 linux: do not check hashes for custom versions and tarballs
Quoted 22 lines · Yann E. MORIN
Arnout, All,
On 2015-05-01 15:34 +0200, Arnout Vandecappelle spake thusly:
Quoted 1 line
Hah, this is a tough one...
Doh, right...
Quoted 2 lines
With the combination
BR2_LINUX_SAME_AS_HEADERSandBR2_KERNEL_HEADERS_VERSION
you can still get a custom version...Hmm.. I missed that case... :-/
Quoted 6 lines
So I'm thinking if it wouldn't be simpler to just always disable the hash:
BR_NO_CHECK_HASH_FOR+= $(LINUX_SOURCE)Note that the hash, if it exists, will still be checked; it just won't be an
error if the hash doesn't exist (so the variable is not named very accurately in fact). Therefore I think it's safe to disable it completely for linux.Well, I stand on my position that I'd like we only exclude only what we strictly require to be excluded.
Quoted 7 lines
Quoted 4 lines
Or, if
you prefer you can make it depend on !BR2_LINUX_KERNEL_LATEST_VERSION && !(BR2_LINUX_SAME_AS_HEADERS && !BR2_KERNEL_HEADERS_VERSION) (good luck expressing that in make syntax :-).Well, we still have the option of expressing that in
Kconfigif that can help...
It could look a bit strange though.
Regards,
Arnout
Quoted 29 lines
Quoted 8 lines · Yann E. MORIN
Quoted 6 lines
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas Petazzoni <[email protected]>--- linux/linux.mk | 5 +++++ 1 file changed, 5 insertions(+)Quoted 15 lines
linux/linux.mk ifeq ($(BR2_LINUX_KERNEL_CUSTOM_TARBALL),y) · line 19
Quoted 12 lines
linux/linux.mk +2
-0@@ -13,8 +13,10 @@ ifeq ($(BR2_LINUX_KERNEL_CUSTOM_TARBALL),y) LINUX_TARBALL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION)) LINUX_SITE = $(patsubst %/,%,$(dir $(LINUX_TARBALL))) LINUX_SOURCE = $(notdir $(LINUX_TARBALL)) +BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_LOCAL),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH)) +# For 'local', there is no hash check, so no need to set BR_NO_CHECK_HASH_FORWhy do you add that comment here and not in the VCS cases? I don't think it is
needed, move it to the commit message.OK.
Regards,
Yann E. MORIN.
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 6/7 linux: do not check hashes for custom versions and tarballs
In reply to Arnout VandecappelleArnout, All,
On 2015-05-01 15:34 +0200, Arnout Vandecappelle spake thusly:
Quoted 8 lines
Hah, this is a tough one...
With the combination
BR2_LINUX_SAME_AS_HEADERSandBR2_KERNEL_HEADERS_VERSION
you can still get a custom version...So I'm thinking if it wouldn't be simpler to just always disable the hash:
BR_NO_CHECK_HASH_FOR+= $(LINUX_SOURCE)
Quoted 6 lines
Note that the hash, if it exists, will still be checked; it just won't be an
error if the hash doesn't exist (so the variable is not named very accurately in fact). Therefore I think it's safe to disable it completely for linux. Or, if you prefer you can make it depend on !BR2_LINUX_KERNEL_LATEST_VERSION && !(BR2_LINUX_SAME_AS_HEADERS && !BR2_KERNEL_HEADERS_VERSION) (good luck expressing that in make syntax :-).
Well, it seems it was pretty easy to do in the end (when onlt excluding what needs be, and not everyting), though a bit redundant:
ifeq ($(BR2_LINUX_KERNEL_CUSTOM_VERSION),y)
BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE)
endif
ifeq ($(BR2_LINUX_KERNEL_SAME_AS_HEADERS)$(BR2_KERNEL_HEADERS_VERSION),yy)
BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE)
endifOK, that's not very nice either, but the code is simple enough, and splits unrelated parts apart.
Quoted 7 lines · Yann E. MORIN
Quoted 6 lines
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas Petazzoni <[email protected]>--- linux/linux.mk | 5 +++++ 1 file changed, 5 insertions(+)
Quoted 15 lines
linux/linux.mk ifeq ($(BR2_LINUX_KERNEL_CUSTOM_TARBALL),y) · line 19
Quoted 12 lines
linux/linux.mk +2
-0@@ -13,8 +13,10 @@ ifeq ($(BR2_LINUX_KERNEL_CUSTOM_TARBALL),y) LINUX_TARBALL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION)) LINUX_SITE = $(patsubst %/,%,$(dir $(LINUX_TARBALL))) LINUX_SOURCE = $(notdir $(LINUX_TARBALL)) +BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_LOCAL),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH)) +# For 'local', there is no hash check, so no need to set BR_NO_CHECK_HASH_FORWhy do you add that comment here and not in the VCS cases? I don't think it is
needed, move it to the commit message.
Besides, it is really wrong: there can't be hash checks, because this is not am archive, but a directory that is rsync-ed. Comment dropped. Thanks! :-)
Regards,
Yann E. MORIN.
Quoted 26 lines
Regards,
ArnoutQuoted 14 lines
linux/linux.mk +3
-0LINUX_SITE_METHOD = local else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL))@@ -24,6 +26,9 @@ LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) LINUX_SITE_METHOD = hg else LINUX_SOURCE = linux-$(LINUX_VERSION).tar.xz +ifeq ($(BR2_LINUX_KERNEL_CUSTOM_VERSION),y) +BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) +endif # In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order # to use the $(word) function. We support versions such as 4.0, 3.1, # 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 7/7 package/xenomai: ignore custom versions
In reply to Yann E. MORIN--- package/xenomai/xenomai.mk | 3 +++ 1 file changed, 3 insertions(+)
package/xenomai/xenomai.mk +3 -0
@@ -7,6 +7,9 @@ XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION)) ifeq ($(XENOMAI_VERSION),) XENOMAI_VERSION = 2.6.4 +else +# We can do that because it's a recursively-expanded variable +BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE) endif XENOMAI_SITE = http://download.gna.org/xenomai/stable
Signature · 1 line
1.9.1
PATCH 7/7 package/xenomai: ignore custom versions
Quoted 12 lines · Yann E. MORIN
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Peter Korsgaard <[email protected]>--- package/xenomai/xenomai.mk | 3 +++ 1 file changed, 3 insertions(+)package/xenomai/xenomai.mk +0
-0
package/xenomai/xenomai.mk line 11
Quoted 5 lines
package/xenomai/xenomai.mk +2
-0@@ -7,6 +7,9 @@ XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION)) ifeq ($(XENOMAI_VERSION),) XENOMAI_VERSION = 2.6.4 +else +# We can do that because it's a recursively-expanded variable
I don't think this comment is needed. Move it to the commit message.
Either way: Acked-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]>
Regards,
Arnout
Quoted 5 lines
package/xenomai/xenomai.mk +1
-0+BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE) endif XENOMAI_SITE = http://download.gna.org/xenomai/stable
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
[Buildroot] [PATCH 8/7] package/xenomai: add hash file
In reply to Yann E. MORINNow that custom versions are properly excluded from the list, we can add a hash for the version we package.
--- package/xenomai/xenomai.hash | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package/xenomai/xenomai.hash
package/xenomai/xenomai.hash new file +2 -0
@@ -0,0 +1,2 @@ +# Locally computed; +sha256 b6ff723cb0f3b1c2c4e15bccfd114b248dea1b4164a0ac0e612815379ce7caf8 xenomai-2.6.4.tar.bz2
Signature · 1 line
1.9.1
[Buildroot] [PATCH 8/7] package/xenomai: add hash file
Hi Yann,
Quoted 2 lines · Yann E. MORIN
Now that custom versions are properly excluded from the list, we can add a hash for the version we package.
The patch numbering in Subject seems weird (8/7). I'm just curious, what git format-patch parameters combination can make it believe that 8 <= 7? Can it do the same to my bank account?
baruch
Signature · 3 lines
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- [email protected] - tel: +972.2.679.5364, http://www.tkos.co.il -[Buildroot] [PATCH 8/7] package/xenomai: add hash file
Quoted 7 lines · Baruch Siach
Hi Yann,
Quoted 1 line · Yann E. MORIN
Now that custom versions are properly excluded from the list, we can
add
Quoted 1 line
a hash for the version we package.
Quoted 12 lines
The patch numbering in Subject seems weird (8/7). I'm just curious, what git
format-patch parameters combination can make it believe that 8 <= 7? Can it do
the same to my bank account?baruch
Signature · 3 lines
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
Vincent, All,
Just the fact that I forgot to commit it before sending the series, and that I sent it manualy afterwards.
Regards,
Yann E. MORIN.
Signature · 4 lines
Sent from my Android device with K-9 Mail. Please excuse my brevity. -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20150429/f01517ce/attachment.html>
[Buildroot] [PATCH 8/7] package/xenomai: add hash file
In reply to Yann E. MORINQuoted 5 lines · Yann E. MORIN
Now that custom versions are properly excluded from the list, we can add a hash for the version we package.
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas Petazzoni <[email protected]>
Also verified the .sig file (against Gilles' unfortunately expired key).
Regards,
Arnout
Quoted 14 lines
--- package/xenomai/xenomai.hash | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package/xenomai/xenomai.hashpackage/xenomai/xenomai.hash new file +2
-0@@ -0,0 +1,2 @@ +# Locally computed; +sha256 b6ff723cb0f3b1c2c4e15bccfd114b248dea1b4164a0ac0e612815379ce7caf8 xenomai-2.6.4.tar.bz2
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F