* [Buildroot] [PATCH 1/7] boot/gummiboot: switch to http for git clone
2015-04-28 22:39 [Buildroot] [PATCH 0/7] hashes: add more custom versions to the exclusion list (branch yem/no-hash-custom) Yann E. MORIN
@ 2015-04-28 22:39 ` Yann E. MORIN
2015-05-01 8:32 ` Thomas Petazzoni
2015-04-28 22:39 ` [Buildroot] [PATCH 2/7] pkg-infra: assign BR_NO_CHECK_HASH_FOR so it is recursively-expanded Yann E. MORIN
` (6 subsequent siblings)
7 siblings, 1 reply; 31+ messages in thread
From: Yann E. MORIN @ 2015-04-28 22:39 UTC (permalink / raw)
To: buildroot
The git:// protocol may not go through conservative corporate firewalls.
Use http, that goes out through about anything.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
boot/gummiboot/gummiboot.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/boot/gummiboot/gummiboot.mk b/boot/gummiboot/gummiboot.mk
index 72f9c53..02ad28b 100644
--- a/boot/gummiboot/gummiboot.mk
+++ b/boot/gummiboot/gummiboot.mk
@@ -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
--
1.9.1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 0/7] hashes: add more custom versions to the exclusion list (branch yem/no-hash-custom)
@ 2015-04-28 22:39 Yann E. MORIN
2015-04-28 22:39 ` [Buildroot] [PATCH 1/7] boot/gummiboot: switch to http for git clone Yann E. MORIN
` (7 more replies)
0 siblings, 8 replies; 31+ messages in thread
From: Yann E. MORIN @ 2015-04-28 22:39 UTC (permalink / raw)
To: buildroot
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(-)
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 2/7] pkg-infra: assign BR_NO_CHECK_HASH_FOR so it is recursively-expanded
2015-04-28 22:39 [Buildroot] [PATCH 0/7] hashes: add more custom versions to the exclusion list (branch yem/no-hash-custom) Yann E. MORIN
2015-04-28 22:39 ` [Buildroot] [PATCH 1/7] boot/gummiboot: switch to http for git clone Yann E. MORIN
@ 2015-04-28 22:39 ` Yann E. MORIN
2015-05-01 13:07 ` Arnout Vandecappelle
2015-04-28 22:40 ` [Buildroot] [PATCH 3/7] boot/uboot: do not check hash for custom versions Yann E. MORIN
` (5 subsequent siblings)
7 siblings, 1 reply; 31+ messages in thread
From: Yann E. MORIN @ 2015-04-28 22:39 UTC (permalink / raw)
To: buildroot
Currently, 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).
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/pkg-download.mk | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index a38062e..f0651db 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -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
--
1.9.1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 3/7] boot/uboot: do not check hash for custom versions
2015-04-28 22:39 [Buildroot] [PATCH 0/7] hashes: add more custom versions to the exclusion list (branch yem/no-hash-custom) Yann E. MORIN
2015-04-28 22:39 ` [Buildroot] [PATCH 1/7] boot/gummiboot: switch to http for git clone Yann E. MORIN
2015-04-28 22:39 ` [Buildroot] [PATCH 2/7] pkg-infra: assign BR_NO_CHECK_HASH_FOR so it is recursively-expanded Yann E. MORIN
@ 2015-04-28 22:40 ` Yann E. MORIN
2015-04-29 5:49 ` Vincent Stehlé
2015-05-01 13:14 ` Arnout Vandecappelle
2015-04-28 22:40 ` [Buildroot] [PATCH 4/7] boot/barebox: " Yann E. MORIN
` (4 subsequent siblings)
7 siblings, 2 replies; 31+ messages in thread
From: Yann E. MORIN @ 2015-04-28 22:40 UTC (permalink / raw)
To: buildroot
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" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Vincent Stehle <vincent.stehle@laposte.net>
---
boot/uboot/uboot.mk | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 01aaf2c..410d8d8 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -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)
--
1.9.1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 4/7] boot/barebox: do not check hash for custom versions
2015-04-28 22:39 [Buildroot] [PATCH 0/7] hashes: add more custom versions to the exclusion list (branch yem/no-hash-custom) Yann E. MORIN
` (2 preceding siblings ...)
2015-04-28 22:40 ` [Buildroot] [PATCH 3/7] boot/uboot: do not check hash for custom versions Yann E. MORIN
@ 2015-04-28 22:40 ` Yann E. MORIN
2015-05-01 13:15 ` Arnout Vandecappelle
2015-04-28 22:40 ` [Buildroot] [PATCH 5/7] boot/mxs-bootlets: do not check hash of custom tarball Yann E. MORIN
` (3 subsequent siblings)
7 siblings, 1 reply; 31+ messages in thread
From: Yann E. MORIN @ 2015-04-28 22:40 UTC (permalink / raw)
To: buildroot
As 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.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
boot/barebox/barebox.mk | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 54f52bb..764791d 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -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
--
1.9.1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 5/7] boot/mxs-bootlets: do not check hash of custom tarball
2015-04-28 22:39 [Buildroot] [PATCH 0/7] hashes: add more custom versions to the exclusion list (branch yem/no-hash-custom) Yann E. MORIN
` (3 preceding siblings ...)
2015-04-28 22:40 ` [Buildroot] [PATCH 4/7] boot/barebox: " Yann E. MORIN
@ 2015-04-28 22:40 ` Yann E. MORIN
2015-05-01 13:25 ` Arnout Vandecappelle
2015-04-28 22:40 ` [Buildroot] [PATCH 6/7] linux: do not check hashes for custom versions and tarballs Yann E. MORIN
` (2 subsequent siblings)
7 siblings, 1 reply; 31+ messages in thread
From: Yann E. MORIN @ 2015-04-28 22:40 UTC (permalink / raw)
To: buildroot
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
boot/mxs-bootlets/mxs-bootlets.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/boot/mxs-bootlets/mxs-bootlets.mk b/boot/mxs-bootlets/mxs-bootlets.mk
index 9b6bd7a..17af6dc 100644
--- a/boot/mxs-bootlets/mxs-bootlets.mk
+++ b/boot/mxs-bootlets/mxs-bootlets.mk
@@ -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
--
1.9.1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 6/7] linux: do not check hashes for custom versions and tarballs
2015-04-28 22:39 [Buildroot] [PATCH 0/7] hashes: add more custom versions to the exclusion list (branch yem/no-hash-custom) Yann E. MORIN
` (4 preceding siblings ...)
2015-04-28 22:40 ` [Buildroot] [PATCH 5/7] boot/mxs-bootlets: do not check hash of custom tarball Yann E. MORIN
@ 2015-04-28 22:40 ` Yann E. MORIN
2015-05-01 13:34 ` Arnout Vandecappelle
2015-04-28 22:40 ` [Buildroot] [PATCH 7/7] package/xenomai: ignore custom versions Yann E. MORIN
2015-04-28 22:46 ` [Buildroot] [PATCH 8/7] package/xenomai: add hash file Yann E. MORIN
7 siblings, 1 reply; 31+ messages in thread
From: Yann E. MORIN @ 2015-04-28 22:40 UTC (permalink / raw)
To: buildroot
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
linux/linux.mk | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/linux/linux.mk b/linux/linux.mk
index 0c348da..959c564 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -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.
--
1.9.1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 7/7] package/xenomai: ignore custom versions
2015-04-28 22:39 [Buildroot] [PATCH 0/7] hashes: add more custom versions to the exclusion list (branch yem/no-hash-custom) Yann E. MORIN
` (5 preceding siblings ...)
2015-04-28 22:40 ` [Buildroot] [PATCH 6/7] linux: do not check hashes for custom versions and tarballs Yann E. MORIN
@ 2015-04-28 22:40 ` Yann E. MORIN
2015-05-01 13:37 ` Arnout Vandecappelle
2015-04-28 22:46 ` [Buildroot] [PATCH 8/7] package/xenomai: add hash file Yann E. MORIN
7 siblings, 1 reply; 31+ messages in thread
From: Yann E. MORIN @ 2015-04-28 22:40 UTC (permalink / raw)
To: buildroot
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Peter Korsgaard <jacmet@uclibc.org>
---
package/xenomai/xenomai.mk | 3 +++
1 file changed, 3 insertions(+)
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index ccbae35..17299ac 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -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
--
1.9.1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 8/7] package/xenomai: add hash file
2015-04-28 22:39 [Buildroot] [PATCH 0/7] hashes: add more custom versions to the exclusion list (branch yem/no-hash-custom) Yann E. MORIN
` (6 preceding siblings ...)
2015-04-28 22:40 ` [Buildroot] [PATCH 7/7] package/xenomai: ignore custom versions Yann E. MORIN
@ 2015-04-28 22:46 ` Yann E. MORIN
2015-04-29 4:16 ` Baruch Siach
2015-05-01 13:54 ` Arnout Vandecappelle
7 siblings, 2 replies; 31+ messages in thread
From: Yann E. MORIN @ 2015-04-28 22:46 UTC (permalink / raw)
To: buildroot
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" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/xenomai/xenomai.hash | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 package/xenomai/xenomai.hash
diff --git a/package/xenomai/xenomai.hash b/package/xenomai/xenomai.hash
new file mode 100644
index 0000000..4d74472
--- /dev/null
+++ b/package/xenomai/xenomai.hash
@@ -0,0 +1,2 @@
+# Locally computed;
+sha256 b6ff723cb0f3b1c2c4e15bccfd114b248dea1b4164a0ac0e612815379ce7caf8 xenomai-2.6.4.tar.bz2
--
1.9.1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 8/7] package/xenomai: add hash file
2015-04-28 22:46 ` [Buildroot] [PATCH 8/7] package/xenomai: add hash file Yann E. MORIN
@ 2015-04-29 4:16 ` Baruch Siach
2015-04-29 6:33 ` Yann E. MORIN
2015-05-01 13:54 ` Arnout Vandecappelle
1 sibling, 1 reply; 31+ messages in thread
From: Baruch Siach @ 2015-04-29 4:16 UTC (permalink / raw)
To: buildroot
Hi Yann,
On Wed, Apr 29, 2015 at 12:46:40AM +0200, Yann E. MORIN wrote:
> 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
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch@tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 3/7] boot/uboot: do not check hash for custom versions
2015-04-28 22:40 ` [Buildroot] [PATCH 3/7] boot/uboot: do not check hash for custom versions Yann E. MORIN
@ 2015-04-29 5:49 ` Vincent Stehlé
2015-05-01 13:14 ` Arnout Vandecappelle
1 sibling, 0 replies; 31+ messages in thread
From: Vincent Stehlé @ 2015-04-29 5:49 UTC (permalink / raw)
To: buildroot
On 04/29/2015 12:40 AM, Yann E. MORIN wrote:
> 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.
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 8/7] package/xenomai: add hash file
2015-04-29 4:16 ` Baruch Siach
@ 2015-04-29 6:33 ` Yann E. MORIN
0 siblings, 0 replies; 31+ messages in thread
From: Yann E. MORIN @ 2015-04-29 6:33 UTC (permalink / raw)
To: buildroot
On April 29, 2015 6:16:08 AM GMT+02:00, Baruch Siach <baruch@tkos.co.il> wrote:
>Hi Yann,
>
>On Wed, Apr 29, 2015 at 12:46:40AM +0200, Yann E. MORIN wrote:
>> 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
>
>--
>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.
--
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>
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 1/7] boot/gummiboot: switch to http for git clone
2015-04-28 22:39 ` [Buildroot] [PATCH 1/7] boot/gummiboot: switch to http for git clone Yann E. MORIN
@ 2015-05-01 8:32 ` Thomas Petazzoni
0 siblings, 0 replies; 31+ messages in thread
From: Thomas Petazzoni @ 2015-05-01 8:32 UTC (permalink / raw)
To: buildroot
Dear Yann E. MORIN,
On Wed, 29 Apr 2015 00:39:58 +0200, Yann E. MORIN wrote:
> The git:// protocol may not go through conservative corporate firewalls.
> Use http, that goes out through about anything.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> boot/gummiboot/gummiboot.mk | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 2/7] pkg-infra: assign BR_NO_CHECK_HASH_FOR so it is recursively-expanded
2015-04-28 22:39 ` [Buildroot] [PATCH 2/7] pkg-infra: assign BR_NO_CHECK_HASH_FOR so it is recursively-expanded Yann E. MORIN
@ 2015-05-01 13:07 ` Arnout Vandecappelle
2015-05-01 15:26 ` Yann E. MORIN
0 siblings, 1 reply; 31+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 13:07 UTC (permalink / raw)
To: buildroot
On 29/04/15 00:39, Yann E. MORIN wrote:
> Currently, assigning to BR_NO_CHECK_HASH_FOR in conditionals, but
> referencing vairaible assigned to later, fails. Here's a failing
variable
> 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
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'
>
> 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).
The leading space is there because += always inserts a space, even if the
variable was empty before.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Arnout Vandecappelle <arnout@mind.be>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> package/pkg-download.mk | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/package/pkg-download.mk b/package/pkg-download.mk
> index a38062e..f0651db 100644
> --- a/package/pkg-download.mk
> +++ b/package/pkg-download.mk
> @@ -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,
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Regards,
Arnout
> +export BR_NO_CHECK_HASH_FOR =
>
> ################################################################################
> # The DOWNLOAD_* helpers are in charge of getting a working copy
>
--
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
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 3/7] boot/uboot: do not check hash for custom versions
2015-04-28 22:40 ` [Buildroot] [PATCH 3/7] boot/uboot: do not check hash for custom versions Yann E. MORIN
2015-04-29 5:49 ` Vincent Stehlé
@ 2015-05-01 13:14 ` Arnout Vandecappelle
2015-05-01 15:31 ` Yann E. MORIN
1 sibling, 1 reply; 31+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 13:14 UTC (permalink / raw)
To: buildroot
On 29/04/15 00:40, Yann E. MORIN wrote:
> 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" <yann.morin.1998@free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: Vincent Stehle <vincent.stehle@laposte.net>
> ---
> boot/uboot/uboot.mk | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
> index 01aaf2c..410d8d8 100644
> --- a/boot/uboot/uboot.mk
> +++ b/boot/uboot/uboot.mk
> @@ -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
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
>
> ifeq ($(BR2_TARGET_UBOOT_FORMAT_ELF),y)
>
--
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
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 4/7] boot/barebox: do not check hash for custom versions
2015-04-28 22:40 ` [Buildroot] [PATCH 4/7] boot/barebox: " Yann E. MORIN
@ 2015-05-01 13:15 ` Arnout Vandecappelle
2015-05-01 15:32 ` Yann E. MORIN
0 siblings, 1 reply; 31+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 13:15 UTC (permalink / raw)
To: buildroot
On 29/04/15 00:40, Yann E. MORIN wrote:
> As we recently did for U-Boot, disable chekcing hashes for custom
checking
> 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" <yann.morin.1998@free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> boot/barebox/barebox.mk | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
> index 54f52bb..764791d 100644
> --- a/boot/barebox/barebox.mk
> +++ b/boot/barebox/barebox.mk
> @@ -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
Same comment as for U-Boot.
Regards,
Arnout
>
> BAREBOX_DEPENDENCIES = host-lzop
>
--
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
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 5/7] boot/mxs-bootlets: do not check hash of custom tarball
2015-04-28 22:40 ` [Buildroot] [PATCH 5/7] boot/mxs-bootlets: do not check hash of custom tarball Yann E. MORIN
@ 2015-05-01 13:25 ` Arnout Vandecappelle
0 siblings, 0 replies; 31+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 13:25 UTC (permalink / raw)
To: buildroot
On 29/04/15 00:40, Yann E. MORIN wrote:
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
by adding an empty .hash file and checking that it fails for the default
version but not for a custom version.
Regards,
Arnout
> ---
> boot/mxs-bootlets/mxs-bootlets.mk | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/boot/mxs-bootlets/mxs-bootlets.mk b/boot/mxs-bootlets/mxs-bootlets.mk
> index 9b6bd7a..17af6dc 100644
> --- a/boot/mxs-bootlets/mxs-bootlets.mk
> +++ b/boot/mxs-bootlets/mxs-bootlets.mk
> @@ -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
>
--
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
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 6/7] linux: do not check hashes for custom versions and tarballs
2015-04-28 22:40 ` [Buildroot] [PATCH 6/7] linux: do not check hashes for custom versions and tarballs Yann E. MORIN
@ 2015-05-01 13:34 ` Arnout Vandecappelle
2015-05-01 15:38 ` Yann E. MORIN
2015-05-01 21:35 ` Yann E. MORIN
0 siblings, 2 replies; 31+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 13:34 UTC (permalink / raw)
To: buildroot
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 :-).
On 29/04/15 00:40, Yann E. MORIN wrote:
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> linux/linux.mk | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/linux/linux.mk b/linux/linux.mk
> index 0c348da..959c564 100644
> --- a/linux/linux.mk
> +++ b/linux/linux.mk
> @@ -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
> 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.
>
--
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
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 7/7] package/xenomai: ignore custom versions
2015-04-28 22:40 ` [Buildroot] [PATCH 7/7] package/xenomai: ignore custom versions Yann E. MORIN
@ 2015-05-01 13:37 ` Arnout Vandecappelle
0 siblings, 0 replies; 31+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 13:37 UTC (permalink / raw)
To: buildroot
On 29/04/15 00:40, Yann E. MORIN wrote:
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: Peter Korsgaard <jacmet@uclibc.org>
> ---
> package/xenomai/xenomai.mk | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
> index ccbae35..17299ac 100644
> --- a/package/xenomai/xenomai.mk
> +++ b/package/xenomai/xenomai.mk
> @@ -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) <arnout@mind.be>
Regards,
Arnout
> +BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE)
> endif
>
> XENOMAI_SITE = http://download.gna.org/xenomai/stable
>
--
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
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 8/7] package/xenomai: add hash file
2015-04-28 22:46 ` [Buildroot] [PATCH 8/7] package/xenomai: add hash file Yann E. MORIN
2015-04-29 4:16 ` Baruch Siach
@ 2015-05-01 13:54 ` Arnout Vandecappelle
1 sibling, 0 replies; 31+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 13:54 UTC (permalink / raw)
To: buildroot
On 29/04/15 00:46, Yann E. MORIN wrote:
> 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" <yann.morin.1998@free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Also verified the .sig file (against Gilles' unfortunately expired key).
Regards,
Arnout
> ---
> package/xenomai/xenomai.hash | 2 ++
> 1 file changed, 2 insertions(+)
> create mode 100644 package/xenomai/xenomai.hash
>
> diff --git a/package/xenomai/xenomai.hash b/package/xenomai/xenomai.hash
> new file mode 100644
> index 0000000..4d74472
> --- /dev/null
> +++ b/package/xenomai/xenomai.hash
> @@ -0,0 +1,2 @@
> +# Locally computed;
> +sha256 b6ff723cb0f3b1c2c4e15bccfd114b248dea1b4164a0ac0e612815379ce7caf8 xenomai-2.6.4.tar.bz2
>
--
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
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 2/7] pkg-infra: assign BR_NO_CHECK_HASH_FOR so it is recursively-expanded
2015-05-01 13:07 ` Arnout Vandecappelle
@ 2015-05-01 15:26 ` Yann E. MORIN
2015-05-01 15:45 ` Arnout Vandecappelle
0 siblings, 1 reply; 31+ messages in thread
From: Yann E. MORIN @ 2015-05-01 15:26 UTC (permalink / raw)
To: buildroot
arnout, All,
On 2015-05-01 15:07 +0200, Arnout Vandecappelle spake thusly:
> On 29/04/15 00:39, Yann E. MORIN wrote:
> > Currently, assigning to BR_NO_CHECK_HASH_FOR in conditionals, but
> > referencing vairaible assigned to later, fails. Here's a failing
> variable
>
> > 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
>
> I 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.
> 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.
> 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'
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?
> >
> > 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).
>
> 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.
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > Cc: Arnout Vandecappelle <arnout@mind.be>
> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> > ---
> > package/pkg-download.mk | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/package/pkg-download.mk b/package/pkg-download.mk
> > index a38062e..f0651db 100644
> > --- a/package/pkg-download.mk
> > +++ b/package/pkg-download.mk
> > @@ -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,
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.
> # but we need it to be
> # recursively-epxanded, so explicitly define it.
>
>
> With all that,
>
> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 3/7] boot/uboot: do not check hash for custom versions
2015-05-01 13:14 ` Arnout Vandecappelle
@ 2015-05-01 15:31 ` Yann E. MORIN
2015-05-01 15:48 ` Arnout Vandecappelle
0 siblings, 1 reply; 31+ messages in thread
From: Yann E. MORIN @ 2015-05-01 15:31 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-05-01 15:14 +0200, Arnout Vandecappelle spake thusly:
> On 29/04/15 00:40, Yann E. MORIN wrote:
> > 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" <yann.morin.1998@free.fr>
> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> > Cc: Vincent Stehle <vincent.stehle@laposte.net>
> > ---
> > boot/uboot/uboot.mk | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
> > index 01aaf2c..410d8d8 100644
> > --- a/boot/uboot/uboot.mk
> > +++ b/boot/uboot/uboot.mk
> > @@ -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
>
> 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.
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.
> Actually, before patch 2/7, the VCS cases wouldn't
> even be added because UBOOT_SOURCE is 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.
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 4/7] boot/barebox: do not check hash for custom versions
2015-05-01 13:15 ` Arnout Vandecappelle
@ 2015-05-01 15:32 ` Yann E. MORIN
2015-05-01 15:52 ` Arnout Vandecappelle
0 siblings, 1 reply; 31+ messages in thread
From: Yann E. MORIN @ 2015-05-01 15:32 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-05-01 15:15 +0200, Arnout Vandecappelle spake thusly:
> On 29/04/15 00:40, Yann E. MORIN wrote:
[--SNIP--]
> > @@ -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.
Same answer. ;-)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 6/7] linux: do not check hashes for custom versions and tarballs
2015-05-01 13:34 ` Arnout Vandecappelle
@ 2015-05-01 15:38 ` Yann E. MORIN
2015-05-01 15:50 ` Arnout Vandecappelle
2015-05-01 21:35 ` Yann E. MORIN
1 sibling, 1 reply; 31+ messages in thread
From: Yann E. MORIN @ 2015-05-01 15:38 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-05-01 15:34 +0200, Arnout Vandecappelle spake thusly:
> Hah, this is a tough one...
Doh, right...
> With the combination BR2_LINUX_SAME_AS_HEADERS and BR2_KERNEL_HEADERS_VERSION
> you can still get a custom version...
Hmm.. I missed that case... :-/
> 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.
> 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...
> On 29/04/15 00:40, Yann E. MORIN wrote:
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> > ---
> > linux/linux.mk | 5 +++++
> > 1 file changed, 5 insertions(+)
> >
> > diff --git a/linux/linux.mk b/linux/linux.mk
> > index 0c348da..959c564 100644
> > --- a/linux/linux.mk
> > +++ b/linux/linux.mk
> > @@ -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.
OK.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 2/7] pkg-infra: assign BR_NO_CHECK_HASH_FOR so it is recursively-expanded
2015-05-01 15:26 ` Yann E. MORIN
@ 2015-05-01 15:45 ` Arnout Vandecappelle
2015-05-01 16:22 ` Yann E. MORIN
0 siblings, 1 reply; 31+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 15:45 UTC (permalink / raw)
To: buildroot
On 01/05/15 17:26, Yann E. MORIN wrote:
> arnout, All,
>
> On 2015-05-01 15:07 +0200, Arnout Vandecappelle spake thusly:
>> On 29/04/15 00:39, Yann E. MORIN wrote:
>>> Currently, assigning to BR_NO_CHECK_HASH_FOR in conditionals, but
>>> referencing vairaible assigned to later, fails. Here's a failing
>> variable
>>
>>> 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
>>
>> I 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.
>
>> 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 :-)
>
>> 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'
>
> 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]
>>> # 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.
Then say "in some versions of make".
Regards,
Arnout
>
> However, I'll ditch the comment about conditionals.
>
>> # but we need it to be
>> # recursively-epxanded, so explicitly define it.
>>
>>
>> With all that,
>>
>> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>
> Regards,
> Yann E. MORIN.
>
--
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
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 3/7] boot/uboot: do not check hash for custom versions
2015-05-01 15:31 ` Yann E. MORIN
@ 2015-05-01 15:48 ` Arnout Vandecappelle
2015-05-01 16:21 ` Yann E. MORIN
0 siblings, 1 reply; 31+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 15:48 UTC (permalink / raw)
To: buildroot
On 01/05/15 17:31, Yann E. MORIN wrote:
> Arnout, All,
>
> On 2015-05-01 15:14 +0200, Arnout Vandecappelle spake thusly:
>> On 29/04/15 00:40, Yann E. MORIN wrote:
>>> 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" <yann.morin.1998@free.fr>
>>> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>>> Cc: Vincent Stehle <vincent.stehle@laposte.net>
>>> ---
>>> boot/uboot/uboot.mk | 4 ++++
>>> 1 file changed, 4 insertions(+)
>>>
>>> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
>>> index 01aaf2c..410d8d8 100644
>>> --- a/boot/uboot/uboot.mk
>>> +++ b/boot/uboot/uboot.mk
>>> @@ -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
>>
>> 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.
>
> 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.
OK. So:
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>
>> Actually, before patch 2/7, the VCS cases wouldn't
>> even be added because UBOOT_SOURCE is 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
>
> Regards,
> Yann E. MORIN.
>
--
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
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 6/7] linux: do not check hashes for custom versions and tarballs
2015-05-01 15:38 ` Yann E. MORIN
@ 2015-05-01 15:50 ` Arnout Vandecappelle
0 siblings, 0 replies; 31+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 15:50 UTC (permalink / raw)
To: buildroot
On 01/05/15 17:38, Yann E. MORIN wrote:
> Arnout, All,
>
> On 2015-05-01 15:34 +0200, Arnout Vandecappelle spake thusly:
>> Hah, this is a tough one...
>
> Doh, right...
>
>> With the combination BR2_LINUX_SAME_AS_HEADERS and BR2_KERNEL_HEADERS_VERSION
>> you can still get a custom version...
>
> Hmm.. I missed that case... :-/
>
>> 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.
>
>> 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...
It could look a bit strange though.
Regards,
Arnout
>
>> On 29/04/15 00:40, Yann E. MORIN wrote:
>>> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>>> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>>> ---
>>> linux/linux.mk | 5 +++++
>>> 1 file changed, 5 insertions(+)
>>>
>>> diff --git a/linux/linux.mk b/linux/linux.mk
>>> index 0c348da..959c564 100644
>>> --- a/linux/linux.mk
>>> +++ b/linux/linux.mk
>>> @@ -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.
>
> OK.
>
> Regards,
> Yann E. MORIN.
>
--
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
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 4/7] boot/barebox: do not check hash for custom versions
2015-05-01 15:32 ` Yann E. MORIN
@ 2015-05-01 15:52 ` Arnout Vandecappelle
0 siblings, 0 replies; 31+ messages in thread
From: Arnout Vandecappelle @ 2015-05-01 15:52 UTC (permalink / raw)
To: buildroot
On 01/05/15 17:32, Yann E. MORIN wrote:
> Arnout, All,
>
> On 2015-05-01 15:15 +0200, Arnout Vandecappelle spake thusly:
>> On 29/04/15 00:40, Yann E. MORIN wrote:
> [--SNIP--]
>>> @@ -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.
>
> Same answer. ;-)
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Regards,
Arnout
--
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
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 3/7] boot/uboot: do not check hash for custom versions
2015-05-01 15:48 ` Arnout Vandecappelle
@ 2015-05-01 16:21 ` Yann E. MORIN
0 siblings, 0 replies; 31+ messages in thread
From: Yann E. MORIN @ 2015-05-01 16:21 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-05-01 17:48 +0200, Arnout Vandecappelle spake thusly:
> On 01/05/15 17:31, Yann E. MORIN wrote:
[--SNIP--]
> > Acutally, I prefer we explicitly exclude only what we really want to be
> > excluded.
[--SNIP--]
> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Thanks! :-)
> >> Actually, before patch 2/7, the VCS cases wouldn't
> >> even be added because UBOOT_SOURCE is 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.
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 2/7] pkg-infra: assign BR_NO_CHECK_HASH_FOR so it is recursively-expanded
2015-05-01 15:45 ` Arnout Vandecappelle
@ 2015-05-01 16:22 ` Yann E. MORIN
0 siblings, 0 replies; 31+ messages in thread
From: Yann E. MORIN @ 2015-05-01 16:22 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-05-01 17:45 +0200, Arnout Vandecappelle spake thusly:
> On 01/05/15 17:26, Yann E. MORIN wrote:
> > On 2015-05-01 15:07 +0200, Arnout Vandecappelle spake thusly:
> >> On 29/04/15 00:39, Yann E. MORIN wrote:
[--SNIP--]
> > Exactly. However, there's nothing like so explained in the make manual.
>
> So patch the make manual :-)
Eh! ;-)
[--SNIP--]
> > 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
Right, will switch to using those three lines.
> >>> # 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.
>
> Then say "in some versions of make".
OK.
Thanks! :-)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Buildroot] [PATCH 6/7] linux: do not check hashes for custom versions and tarballs
2015-05-01 13:34 ` Arnout Vandecappelle
2015-05-01 15:38 ` Yann E. MORIN
@ 2015-05-01 21:35 ` Yann E. MORIN
1 sibling, 0 replies; 31+ messages in thread
From: Yann E. MORIN @ 2015-05-01 21:35 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-05-01 15:34 +0200, Arnout Vandecappelle spake thusly:
> 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 :-).
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)
endif
OK, that's not very nice either, but the code is simple enough, and
splits unrelated parts apart.
> On 29/04/15 00:40, Yann E. MORIN wrote:
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> > ---
> > linux/linux.mk | 5 +++++
> > 1 file changed, 5 insertions(+)
> >
> > diff --git a/linux/linux.mk b/linux/linux.mk
> > index 0c348da..959c564 100644
> > --- a/linux/linux.mk
> > +++ b/linux/linux.mk
> > @@ -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.
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.
> Regards,
> Arnout
>
> > 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.
> >
>
>
> --
> 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
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 31+ messages in thread
end of thread, other threads:[~2015-05-01 21:35 UTC | newest]
Thread overview: 31+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-28 22:39 [Buildroot] [PATCH 0/7] hashes: add more custom versions to the exclusion list (branch yem/no-hash-custom) Yann E. MORIN
2015-04-28 22:39 ` [Buildroot] [PATCH 1/7] boot/gummiboot: switch to http for git clone Yann E. MORIN
2015-05-01 8:32 ` Thomas Petazzoni
2015-04-28 22:39 ` [Buildroot] [PATCH 2/7] pkg-infra: assign BR_NO_CHECK_HASH_FOR so it is recursively-expanded Yann E. MORIN
2015-05-01 13:07 ` Arnout Vandecappelle
2015-05-01 15:26 ` Yann E. MORIN
2015-05-01 15:45 ` Arnout Vandecappelle
2015-05-01 16:22 ` Yann E. MORIN
2015-04-28 22:40 ` [Buildroot] [PATCH 3/7] boot/uboot: do not check hash for custom versions Yann E. MORIN
2015-04-29 5:49 ` Vincent Stehlé
2015-05-01 13:14 ` Arnout Vandecappelle
2015-05-01 15:31 ` Yann E. MORIN
2015-05-01 15:48 ` Arnout Vandecappelle
2015-05-01 16:21 ` Yann E. MORIN
2015-04-28 22:40 ` [Buildroot] [PATCH 4/7] boot/barebox: " Yann E. MORIN
2015-05-01 13:15 ` Arnout Vandecappelle
2015-05-01 15:32 ` Yann E. MORIN
2015-05-01 15:52 ` Arnout Vandecappelle
2015-04-28 22:40 ` [Buildroot] [PATCH 5/7] boot/mxs-bootlets: do not check hash of custom tarball Yann E. MORIN
2015-05-01 13:25 ` Arnout Vandecappelle
2015-04-28 22:40 ` [Buildroot] [PATCH 6/7] linux: do not check hashes for custom versions and tarballs Yann E. MORIN
2015-05-01 13:34 ` Arnout Vandecappelle
2015-05-01 15:38 ` Yann E. MORIN
2015-05-01 15:50 ` Arnout Vandecappelle
2015-05-01 21:35 ` Yann E. MORIN
2015-04-28 22:40 ` [Buildroot] [PATCH 7/7] package/xenomai: ignore custom versions Yann E. MORIN
2015-05-01 13:37 ` Arnout Vandecappelle
2015-04-28 22:46 ` [Buildroot] [PATCH 8/7] package/xenomai: add hash file Yann E. MORIN
2015-04-29 4:16 ` Baruch Siach
2015-04-29 6:33 ` Yann E. MORIN
2015-05-01 13:54 ` Arnout Vandecappelle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox