All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] boot/lpc32xxcdl: switch upstream location
@ 2020-12-29 10:56 Yann E. MORIN
  2021-01-04 16:58 ` Peter Korsgaard
  0 siblings, 1 reply; 3+ messages in thread
From: Yann E. MORIN @ 2020-12-29 10:56 UTC (permalink / raw)
  To: buildroot

The upstream git tree has disapeared, but a ZIP file is still hosted
somewhere at NXP,. The content of that zip file has been verified to
be 100% identical to the tarball we hosted on s.b.o.

As this is a zip file, we can't use the generic extract commands, and
must come up with our own. As such, it no longer makes sense to fix the
CRLF as a post-extract hook; this is moved to the extract command.

Add a hash file while at it.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 boot/lpc32xxcdl/lpc32xxcdl.hash |  2 ++
 boot/lpc32xxcdl/lpc32xxcdl.mk   | 13 +++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 boot/lpc32xxcdl/lpc32xxcdl.hash

diff --git a/boot/lpc32xxcdl/lpc32xxcdl.hash b/boot/lpc32xxcdl/lpc32xxcdl.hash
new file mode 100644
index 0000000000..8c6b73d63f
--- /dev/null
+++ b/boot/lpc32xxcdl/lpc32xxcdl.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256  ded3fa936a96d3fb8188ca6214f57b5208bd49e5416bd69f38bfc810b34197bc  lpc32xx_cdl-v2.11.zip
diff --git a/boot/lpc32xxcdl/lpc32xxcdl.mk b/boot/lpc32xxcdl/lpc32xxcdl.mk
index 30afed050b..9f5cd27f50 100644
--- a/boot/lpc32xxcdl/lpc32xxcdl.mk
+++ b/boot/lpc32xxcdl/lpc32xxcdl.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LPC32XXCDL_VERSION = lpc32xx_cdl_v2.11
-LPC32XXCDL_SITE = http://git.lpcware.com/lpc3xxx_cdl.git
-LPC32XXCDL_SITE_METHOD = git
+LPC32XXCDL_VERSION = 2.11
+LPC32XXCDL_SOURCE = lpc32xx_cdl-v$(LPC32XXCDL_VERSION).zip
+LPC32XXCDL_SITE = https://community.nxp.com/pwmxy87654/attachments/pwmxy87654/lpcware-archive/61/2
 
 LPC32XXCDL_INSTALL_TARGET = NO
 LPC32XXCDL_INSTALL_IMAGES = YES
@@ -45,13 +45,14 @@ LPC32XXCDL_BOARD_STARTUP_DIR = \
 # Source files are with dos newlines, which our patch infrastructure doesn't
 # handle. Work around it by converting the affected files to unix newlines
 # before patching
-define LPC32XXCDL_DOS2UNIX_FOR_PATCH
+define LPC32XXCDL_EXTRACT_CMDS
+	unzip $(LPC32XXCDL_DL_DIR)/$(LPC32XXCDL_SOURCE) -d $(@D)
+	mv $(@D)/lpc3xxx_cdl/* $(@D)
+	rmdir $(@D)/lpc3xxx_cdl/
 	sed -n 's|^[+-]\{3\} [^/]\+\([^ \t]*\)\(.*\)|$(@D)\1|p' \
 		boot/lpc32xxcdl/*.patch| sort -u | xargs $(SED) 's/\x0D$$//'
 endef
 
-LPC32XXCDL_POST_EXTRACT_HOOKS += LPC32XXCDL_DOS2UNIX_FOR_PATCH
-
 define LPC32XXCDL_BUILD_CMDS
 	$(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)
 	$(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_KICKSTART_BURNER)
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] boot/lpc32xxcdl: switch upstream location
  2020-12-29 10:56 [Buildroot] [PATCH] boot/lpc32xxcdl: switch upstream location Yann E. MORIN
@ 2021-01-04 16:58 ` Peter Korsgaard
  2021-01-04 21:00   ` Yann E. MORIN
  0 siblings, 1 reply; 3+ messages in thread
From: Peter Korsgaard @ 2021-01-04 16:58 UTC (permalink / raw)
  To: buildroot

>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

 > The upstream git tree has disapeared, but a ZIP file is still hosted
 > somewhere at NXP,. The content of that zip file has been verified to
 > be 100% identical to the tarball we hosted on s.b.o.

 > As this is a zip file, we can't use the generic extract commands, and
 > must come up with our own. As such, it no longer makes sense to fix the
 > CRLF as a post-extract hook; this is moved to the extract command.

 > Add a hash file while at it.

 > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>

Maybe we should just get rid of it? It is not referenced by any of our
defconfigs.

In the mean time,

Committed to 2020.02.x and 2020.11.x, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] boot/lpc32xxcdl: switch upstream location
  2021-01-04 16:58 ` Peter Korsgaard
@ 2021-01-04 21:00   ` Yann E. MORIN
  0 siblings, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2021-01-04 21:00 UTC (permalink / raw)
  To: buildroot

Peter, All,

On 2021-01-04 17:58 +0100, Peter Korsgaard spake thusly:
> >>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
>  > The upstream git tree has disapeared, but a ZIP file is still hosted
>  > somewhere at NXP,. The content of that zip file has been verified to
>  > be 100% identical to the tarball we hosted on s.b.o.
[--SNIP--]
> Maybe we should just get rid of it? It is not referenced by any of our
> defconfigs.

Might as well drop it, if the lpc32xx stuff is indeed no longer useful.

Regards,
Yann E. MORIN.

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

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-04 21:00 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-29 10:56 [Buildroot] [PATCH] boot/lpc32xxcdl: switch upstream location Yann E. MORIN
2021-01-04 16:58 ` Peter Korsgaard
2021-01-04 21:00   ` Yann E. MORIN

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.