From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] release: don't include temp files
Date: Fri, 8 May 2020 21:59:03 +0200 [thread overview]
Message-ID: <20200508195903.GO12536@scaer> (raw)
In-Reply-To: <CANxTyt633VUb9bREaU8mq6wPwxXtMA2CkZwtkNufzH75fCK5gA@mail.gmail.com>
Danomi, All,
On 2020-05-08 09:59 -0400, Danomi Manchego spake thusly:
> On Fri, May 8, 2020 at 4:32 AM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> > When we prepare the release, we generate the manual in various formats,
> > so that it can be consulted locally without needing the miriads of tools
> > needed to generate it.
> >
> > However, this creates the temporary .br2-external.* files in the output
> > directory, and those end up in the release tarball.
> >
> > This is not a problem in practice, but is not clean.
> >
> > Run 'distclean' in the output directory, to get rid of everything but
> > the generated documentation.
> >
> > Reported-by: Danomi Manchego <danomimanchego123@gmail.com>
> > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> > Cc: Peter Korsgaard <peter@korsgaard.com>
> > ---
> > Makefile | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/Makefile b/Makefile
> > index 3aa4ba4532..2da34b5305 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -1190,7 +1190,7 @@ release: OUT = buildroot-$(BR2_VERSION)
> > release:
> > git archive --format=tar --prefix=$(OUT)/ HEAD > $(OUT).tar
> > $(MAKE) O=$(OUT) manual-html manual-text manual-pdf
> > - $(MAKE) O=$(OUT) clean
> > + $(MAKE) O=$(OUT) distclean
>
> I downloaded the latest rc1,
2020.02-rc1 does not have the fix.
> just to do "make distclean", see the
> files disappear, and add my Tested-by - but I found that the files
> were not deleted. The distclean target does this:
>
> rm -rf $(TOPDIR)/dl $(BR2_CONFIG) $(CONFIG_DIR)/.config.old
> $(CONFIG_DIR)/..config.tmp \
> $(CONFIG_DIR)/.auto.deps $(BASE_DIR)/.br2-external.*
>
> And BASE_DIR is set to $(CANONICAL_O) - but the .br2-external.* are
> *not* in the output directory, they are the buildroot directory
> itself. Maybe it should delete $(CONFIG_DIR)/.br2-external.* instead
> (or also)?
If you want to test, you should not use a released tarball; instead, you
should try to generate one:
$ make relase
$ tar tzf buildroot-2020.05-rc1.tar.gz |grep -E '\.br2-external'
[empty]
So the temporary files will no longer be part of the next releases.
As for 2020.05-rc1, distclean does not remove them, because they are not
created where they appear in the release. In the release, they appear at
the top of buildroot's directory, becasue when we make the release, we
use a hack to include the generated documentatio in the archive; see the
rule used to generate the release:
https://git.buildroot.org/buildroot/tree/Makefile#n1186
and subsequent lines...
Regards,
Yann E. MORIN.
> Danomi -
>
>
>
> > tar rf $(OUT).tar $(OUT)
> > gzip -9 -c < $(OUT).tar > $(OUT).tar.gz
> > bzip2 -9 -c < $(OUT).tar > $(OUT).tar.bz2
> > --
> > 2.20.1
> >
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2020-05-08 19:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-08 8:32 [Buildroot] [PATCH] release: don't include temp files Yann E. MORIN
2020-05-08 9:34 ` Peter Korsgaard
2020-05-08 13:59 ` Danomi Manchego
2020-05-08 19:59 ` Yann E. MORIN [this message]
2020-05-08 20:04 ` Danomi Manchego
2020-05-10 19:35 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200508195903.GO12536@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox