* [U-Boot] [PATCH] Makefile: remove generated boards.cfg within make mrproper @ 2014-08-07 10:52 Roger Meier 2014-08-07 12:40 ` Masahiro Yamada 0 siblings, 1 reply; 14+ messages in thread From: Roger Meier @ 2014-08-07 10:52 UTC (permalink / raw) To: u-boot Signed-off-by: Roger Meier <roger@bufferoverflow.ch> CC: Masahiro Yamada <yamada.m@jp.panasonic.com> CC: Wolfgang Denk <wd@denx.de> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 666d291..831e091 100644 --- a/Makefile +++ b/Makefile @@ -1221,7 +1221,7 @@ CLOBBER_FILES += u-boot* MLO* SPL System.map # Directories & files removed with 'make mrproper' MRPROPER_DIRS += include/config include/generated spl tpl \ .tmp_objdiff -MRPROPER_FILES += .config .config.old include/autoconf.mk* include/config.h \ +MRPROPER_FILES += .config .config.old boards.cfg include/autoconf.mk* include/config.h \ ctags etags TAGS cscope* GPATH GTAGS GRTAGS GSYMS # clean - Delete most, but leave enough to build external modules -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH] Makefile: remove generated boards.cfg within make mrproper 2014-08-07 10:52 [U-Boot] [PATCH] Makefile: remove generated boards.cfg within make mrproper Roger Meier @ 2014-08-07 12:40 ` Masahiro Yamada 2014-08-07 14:53 ` Roger Meier 0 siblings, 1 reply; 14+ messages in thread From: Masahiro Yamada @ 2014-08-07 12:40 UTC (permalink / raw) To: u-boot Hi Roger, On Thu, 7 Aug 2014 12:52:30 +0200 Roger Meier <roger@bufferoverflow.ch> wrote: > Signed-off-by: Roger Meier <roger@bufferoverflow.ch> > CC: Masahiro Yamada <yamada.m@jp.panasonic.com> > CC: Wolfgang Denk <wd@denx.de> > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 666d291..831e091 100644 > --- a/Makefile > +++ b/Makefile > @@ -1221,7 +1221,7 @@ CLOBBER_FILES += u-boot* MLO* SPL System.map > # Directories & files removed with 'make mrproper' > MRPROPER_DIRS += include/config include/generated spl tpl \ > .tmp_objdiff > -MRPROPER_FILES += .config .config.old include/autoconf.mk* include/config.h \ > +MRPROPER_FILES += .config .config.old boards.cfg include/autoconf.mk* include/config.h \ > ctags etags TAGS cscope* GPATH GTAGS GRTAGS GSYMS > > # clean - Delete most, but leave enough to build external modules > -- > 1.7.10.4 NAK. MAKEALL needs boards.cfg Before building each board, MAKEALL runs "make distclean" and boards.cfg gets lost. With your patch, MAKEALL does not work at all. This is my log of "./MAKEALL" Could not find boards.cfg Generating boards.cfg ... (jobs: 8) 1177/1177 [=======================================================>] Building cmi_mpc5xx board... text data bss dec hex filename 106025 70616 2532 179173 2bbe5 ./u-boot awk: fatal: cannot open file `boards.cfg' for reading (No such file or directory) Building PATI board... make[2]: *** [include/autoconf.mk] Error 1 make[2]: *** [include/autoconf.mk.dep] Error 1 make[1]: *** [silentoldconfig] Error 1 size: './u-boot': No such file /bin/sh: 1: ppc_8xx-gcc: not found /bin/sh: 1: ppc_8xx-gcc: not found make[2]: *** [include/autoconf.mk] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: *** [include/autoconf.mk.dep] Error 1 'make -f /home/yamada/workspace/u-boot-org/scripts/Makefile.autoconf obj=include include/autoconf.mk include/autoconf.mk.dep' Failed make[1]: *** [silentoldconfig] Error 1 make: *** No rule to make target `include/config/auto.conf', needed by `include/config/uboot.release'. Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH] Makefile: remove generated boards.cfg within make mrproper 2014-08-07 12:40 ` Masahiro Yamada @ 2014-08-07 14:53 ` Roger Meier 2014-08-08 12:48 ` Tom Rini 2014-08-09 0:19 ` [U-Boot] [PATCH] Makefile: remove generated boards.cfg within make mrproper Masahiro YAMADA 0 siblings, 2 replies; 14+ messages in thread From: Roger Meier @ 2014-08-07 14:53 UTC (permalink / raw) To: u-boot Hi Masahiro Quoting Masahiro Yamada <yamada.m@jp.panasonic.com>: > Hi Roger, > > > > On Thu, 7 Aug 2014 12:52:30 +0200 > Roger Meier <roger@bufferoverflow.ch> wrote: > >> Signed-off-by: Roger Meier <roger@bufferoverflow.ch> >> CC: Masahiro Yamada <yamada.m@jp.panasonic.com> >> CC: Wolfgang Denk <wd@denx.de> >> --- >> Makefile | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/Makefile b/Makefile >> index 666d291..831e091 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -1221,7 +1221,7 @@ CLOBBER_FILES += u-boot* MLO* SPL System.map >> # Directories & files removed with 'make mrproper' >> MRPROPER_DIRS += include/config include/generated spl tpl \ >> .tmp_objdiff >> -MRPROPER_FILES += .config .config.old include/autoconf.mk* >> include/config.h \ >> +MRPROPER_FILES += .config .config.old boards.cfg >> include/autoconf.mk* include/config.h \ >> ctags etags TAGS cscope* GPATH GTAGS GRTAGS GSYMS >> >> # clean - Delete most, but leave enough to build external modules >> -- >> 1.7.10.4 > > > > NAK. > > MAKEALL needs boards.cfg > > Before building each board, MAKEALL runs "make distclean" and > boards.cfg gets lost. oops, did not recognize that. Thanks! > > With your patch, MAKEALL does not work at all. How should we ensure that boards.cfg is up-to-date? What about removing boards.cfg within "make distclean" and use "make mrproper" within MAKEALL? best! -roger > > > > This is my log of "./MAKEALL" > > Could not find boards.cfg > Generating boards.cfg ... (jobs: 8) > 1177/1177 [=======================================================>] > Building cmi_mpc5xx board... > text data bss dec hex filename > 106025 70616 2532 179173 2bbe5 ./u-boot > awk: fatal: cannot open file `boards.cfg' for reading (No such file > or directory) > Building PATI board... > make[2]: *** [include/autoconf.mk] Error 1 > make[2]: *** [include/autoconf.mk.dep] Error 1 > make[1]: *** [silentoldconfig] Error 1 > size: './u-boot': No such file > /bin/sh: 1: ppc_8xx-gcc: not found > /bin/sh: 1: ppc_8xx-gcc: not found > make[2]: *** [include/autoconf.mk] Error 1 > make[2]: *** Waiting for unfinished jobs.... > make[2]: *** [include/autoconf.mk.dep] Error 1 > 'make -f /home/yamada/workspace/u-boot-org/scripts/Makefile.autoconf > obj=include include/autoconf.mk include/autoconf.mk.dep' Failed > make[1]: *** [silentoldconfig] Error 1 > make: *** No rule to make target `include/config/auto.conf', needed > by `include/config/uboot.release'. > > > > > Best Regards > Masahiro Yamada ^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH] Makefile: remove generated boards.cfg within make mrproper 2014-08-07 14:53 ` Roger Meier @ 2014-08-08 12:48 ` Tom Rini 2014-08-10 12:37 ` [U-Boot] [PATCH v2] Makefile: remove generated boards.cfg within make distclean Roger Meier 2014-08-09 0:19 ` [U-Boot] [PATCH] Makefile: remove generated boards.cfg within make mrproper Masahiro YAMADA 1 sibling, 1 reply; 14+ messages in thread From: Tom Rini @ 2014-08-08 12:48 UTC (permalink / raw) To: u-boot On Thu, Aug 07, 2014 at 02:53:47PM +0000, Roger Meier wrote: > Hi Masahiro > Quoting Masahiro Yamada <yamada.m@jp.panasonic.com>: > > >Hi Roger, > > > > > > > >On Thu, 7 Aug 2014 12:52:30 +0200 > >Roger Meier <roger@bufferoverflow.ch> wrote: > > > >>Signed-off-by: Roger Meier <roger@bufferoverflow.ch> > >>CC: Masahiro Yamada <yamada.m@jp.panasonic.com> > >>CC: Wolfgang Denk <wd@denx.de> > >>--- > >> Makefile | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >>diff --git a/Makefile b/Makefile > >>index 666d291..831e091 100644 > >>--- a/Makefile > >>+++ b/Makefile > >>@@ -1221,7 +1221,7 @@ CLOBBER_FILES += u-boot* MLO* SPL System.map > >> # Directories & files removed with 'make mrproper' > >> MRPROPER_DIRS += include/config include/generated spl tpl \ > >> .tmp_objdiff > >>-MRPROPER_FILES += .config .config.old include/autoconf.mk* > >>include/config.h \ > >>+MRPROPER_FILES += .config .config.old boards.cfg > >>include/autoconf.mk* include/config.h \ > >> ctags etags TAGS cscope* GPATH GTAGS GRTAGS GSYMS > >> > >> # clean - Delete most, but leave enough to build external modules > >>-- > >>1.7.10.4 > > > > > > > >NAK. > > > >MAKEALL needs boards.cfg > > > >Before building each board, MAKEALL runs "make distclean" and > >boards.cfg gets lost. > oops, did not recognize that. Thanks! > > > > >With your patch, MAKEALL does not work at all. > How should we ensure that boards.cfg is up-to-date? > What about removing boards.cfg within "make distclean" and use > "make mrproper" within MAKEALL? Sounds good to me. -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140808/6f276e3f/attachment.pgp> ^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v2] Makefile: remove generated boards.cfg within make distclean 2014-08-08 12:48 ` Tom Rini @ 2014-08-10 12:37 ` Roger Meier 2014-08-11 22:52 ` Masahiro YAMADA ` (2 more replies) 0 siblings, 3 replies; 14+ messages in thread From: Roger Meier @ 2014-08-10 12:37 UTC (permalink / raw) To: u-boot Signed-off-by: Roger Meier <roger@bufferoverflow.ch> CC: Masahiro Yamada <yamada.m@jp.panasonic.com> CC: Tom Rini <trini@ti.com> CC: Wolfgang Denk <wd@denx.de> --- Changes for v2: - remove boards.cfg within make distclean instead of mrproper - use mrproper instead of distclean within MAKEALL --- MAKEALL | 2 +- Makefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/MAKEALL b/MAKEALL index 929fe88..392ea8d 100755 --- a/MAKEALL +++ b/MAKEALL @@ -658,7 +658,7 @@ build_target() { MAKE="${MAKE} O=${output_dir}" fi - ${MAKE} distclean >/dev/null + ${MAKE} mrproper >/dev/null echo "Building ${target} board..." ${MAKE} -s ${target}_defconfig >/dev/null diff --git a/Makefile b/Makefile index 666d291..067a301 100644 --- a/Makefile +++ b/Makefile @@ -1285,7 +1285,8 @@ distclean: mrproper -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ -o -name '.*.rej' -o -name '*%' -o -name 'core' \ -o -name '*.pyc' \) \ - -type f -print | xargs rm -f + -type f -print | xargs rm -f \ + rm -f boards.cfg backup: F=`basename $(srctree)` ; cd .. ; \ -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v2] Makefile: remove generated boards.cfg within make distclean 2014-08-10 12:37 ` [U-Boot] [PATCH v2] Makefile: remove generated boards.cfg within make distclean Roger Meier @ 2014-08-11 22:52 ` Masahiro YAMADA 2014-08-12 14:37 ` Simon Glass 2014-08-18 4:23 ` Masahiro Yamada 2014-08-19 23:13 ` [U-Boot] [PATCH v3] " Roger Meier 2 siblings, 1 reply; 14+ messages in thread From: Masahiro YAMADA @ 2014-08-11 22:52 UTC (permalink / raw) To: u-boot Hi Roger, (ccing Simon) 2014-08-10 21:37 GMT+09:00 Roger Meier <roger@bufferoverflow.ch>: > Signed-off-by: Roger Meier <roger@bufferoverflow.ch> > CC: Masahiro Yamada <yamada.m@jp.panasonic.com> > CC: Tom Rini <trini@ti.com> > CC: Wolfgang Denk <wd@denx.de> > > --- > Changes for v2: > - remove boards.cfg within make distclean instead of mrproper > - use mrproper instead of distclean within MAKEALL > --- > MAKEALL | 2 +- > Makefile | 3 ++- > 2 files changed, 3 insertions(+), 2 deletions(-) I think it is OK as for MAKEALL. But I am not sure it is safe for buildman, which also uses boards.cfg. I just did grep under tools/buildman directory and found some lines referring 'distclean'. ./builder.py:179: distclean - can be called to clean source ./builder.py:275: result = self.Make(commit, brd, 'distclean', work_dir, ./builder.py:276: 'distclean', *args, env=env) ./builder.py:700: stage: Stage that we are at (distclean, config, build) Unfortunately, I am not an expert of buildman. I suspect this patch has an impact on it, but I am not sure. I think Simon can help you. -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v2] Makefile: remove generated boards.cfg within make distclean 2014-08-11 22:52 ` Masahiro YAMADA @ 2014-08-12 14:37 ` Simon Glass 0 siblings, 0 replies; 14+ messages in thread From: Simon Glass @ 2014-08-12 14:37 UTC (permalink / raw) To: u-boot Hi, On 11 August 2014 16:52, Masahiro YAMADA <yamada.m@jp.panasonic.com> wrote: > Hi Roger, > > (ccing Simon) > > > 2014-08-10 21:37 GMT+09:00 Roger Meier <roger@bufferoverflow.ch>: >> Signed-off-by: Roger Meier <roger@bufferoverflow.ch> >> CC: Masahiro Yamada <yamada.m@jp.panasonic.com> >> CC: Tom Rini <trini@ti.com> >> CC: Wolfgang Denk <wd@denx.de> >> >> --- >> Changes for v2: >> - remove boards.cfg within make distclean instead of mrproper >> - use mrproper instead of distclean within MAKEALL >> --- >> MAKEALL | 2 +- >> Makefile | 3 ++- >> 2 files changed, 3 insertions(+), 2 deletions(-) > > > I think it is OK as for MAKEALL. > But I am not sure it is safe for buildman, which also uses boards.cfg. > > > I just did grep under tools/buildman directory and > found some lines referring 'distclean'. > > ./builder.py:179: distclean - can be called to > clean source > ./builder.py:275: result = self.Make(commit, brd, > 'distclean', work_dir, > ./builder.py:276: 'distclean', *args, env=env) > ./builder.py:700: stage: Stage that we are at (distclean, > config, build) > > > Unfortunately, I am not an expert of buildman. > I suspect this patch has an impact on it, but I am not sure. > I think Simon can help you. > Yes I think buildman should be updated to change all 'disclean' to 'mrproper'. Regards, Simon ^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v2] Makefile: remove generated boards.cfg within make distclean 2014-08-10 12:37 ` [U-Boot] [PATCH v2] Makefile: remove generated boards.cfg within make distclean Roger Meier 2014-08-11 22:52 ` Masahiro YAMADA @ 2014-08-18 4:23 ` Masahiro Yamada 2014-08-19 23:13 ` [U-Boot] [PATCH v3] " Roger Meier 2 siblings, 0 replies; 14+ messages in thread From: Masahiro Yamada @ 2014-08-18 4:23 UTC (permalink / raw) To: u-boot Hi Roger, On Sun, 10 Aug 2014 14:37:40 +0200 Roger Meier <roger@bufferoverflow.ch> wrote: > Signed-off-by: Roger Meier <roger@bufferoverflow.ch> > CC: Masahiro Yamada <yamada.m@jp.panasonic.com> > CC: Tom Rini <trini@ti.com> > CC: Wolfgang Denk <wd@denx.de> > > --- > Changes for v2: > - remove boards.cfg within make distclean instead of mrproper > - use mrproper instead of distclean within MAKEALL > --- > MAKEALL | 2 +- > Makefile | 3 ++- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/MAKEALL b/MAKEALL > index 929fe88..392ea8d 100755 > --- a/MAKEALL > +++ b/MAKEALL > @@ -658,7 +658,7 @@ build_target() { > MAKE="${MAKE} O=${output_dir}" > fi > > - ${MAKE} distclean >/dev/null > + ${MAKE} mrproper >/dev/null > > echo "Building ${target} board..." > ${MAKE} -s ${target}_defconfig >/dev/null > diff --git a/Makefile b/Makefile > index 666d291..067a301 100644 > --- a/Makefile > +++ b/Makefile > @@ -1285,7 +1285,8 @@ distclean: mrproper > -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ > -o -name '.*.rej' -o -name '*%' -o -name 'core' \ > -o -name '*.pyc' \) \ > - -type f -print | xargs rm -f > + -type f -print | xargs rm -f \ > + rm -f boards.cfg > > backup: > F=`basename $(srctree)` ; cd .. ; \ The backslash after "xargs rm -f" is unnecessary, I think. Should be like follows? -type f -print | xargs rm -f @rm -f boards.cfg Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v3] Makefile: remove generated boards.cfg within make distclean 2014-08-10 12:37 ` [U-Boot] [PATCH v2] Makefile: remove generated boards.cfg within make distclean Roger Meier 2014-08-11 22:52 ` Masahiro YAMADA 2014-08-18 4:23 ` Masahiro Yamada @ 2014-08-19 23:13 ` Roger Meier 2014-08-20 1:06 ` Masahiro Yamada 2014-08-20 20:10 ` [U-Boot] [PATCH v4] " Roger Meier 2 siblings, 2 replies; 14+ messages in thread From: Roger Meier @ 2014-08-19 23:13 UTC (permalink / raw) To: u-boot Signed-off-by: Roger Meier <roger@bufferoverflow.ch> CC: Masahiro Yamada <yamada.m@jp.panasonic.com> CC: Tom Rini <trini@ti.com> CC: Wolfgang Denk <wd@denx.de> --- Changes for v2: - remove boards.cfg within make distclean instead of mrproper - use mrproper instead of distclean within MAKEALL Changes for v3: - use @rm instead of rm as suggested by Masahiro Yamada --- MAKEALL | 2 +- Makefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/MAKEALL b/MAKEALL index 929fe88..392ea8d 100755 --- a/MAKEALL +++ b/MAKEALL @@ -658,7 +658,7 @@ build_target() { MAKE="${MAKE} O=${output_dir}" fi - ${MAKE} distclean >/dev/null + ${MAKE} mrproper >/dev/null echo "Building ${target} board..." ${MAKE} -s ${target}_defconfig >/dev/null diff --git a/Makefile b/Makefile index 666d291..6679408 100644 --- a/Makefile +++ b/Makefile @@ -1285,7 +1285,8 @@ distclean: mrproper -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ -o -name '.*.rej' -o -name '*%' -o -name 'core' \ -o -name '*.pyc' \) \ - -type f -print | xargs rm -f + -type f -print | xargs rm -f \ + @rm -f boards.cfg backup: F=`basename $(srctree)` ; cd .. ; \ -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v3] Makefile: remove generated boards.cfg within make distclean 2014-08-19 23:13 ` [U-Boot] [PATCH v3] " Roger Meier @ 2014-08-20 1:06 ` Masahiro Yamada 2014-08-20 20:10 ` [U-Boot] [PATCH v4] " Roger Meier 1 sibling, 0 replies; 14+ messages in thread From: Masahiro Yamada @ 2014-08-20 1:06 UTC (permalink / raw) To: u-boot Hi Roger, On Wed, 20 Aug 2014 01:13:50 +0200 Roger Meier <roger@bufferoverflow.ch> wrote: > Signed-off-by: Roger Meier <roger@bufferoverflow.ch> > CC: Masahiro Yamada <yamada.m@jp.panasonic.com> > CC: Tom Rini <trini@ti.com> > CC: Wolfgang Denk <wd@denx.de> Most people use 'Cc:' instead of 'CC:'. $ git log v2013.01..v2014.07 | grep 'Cc:' | wc 2007 8047 87385 $ git log v2013.01..v2014.07 | grep 'CC:' | wc 147 598 6443 > diff --git a/Makefile b/Makefile > index 666d291..6679408 100644 > --- a/Makefile > +++ b/Makefile > @@ -1285,7 +1285,8 @@ distclean: mrproper > -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ > -o -name '.*.rej' -o -name '*%' -o -name 'core' \ > -o -name '*.pyc' \) \ > - -type f -print | xargs rm -f > + -type f -print | xargs rm -f \ > + @rm -f boards.cfg > > backup: > F=`basename $(srctree)` ; cd .. ; \ No. You missed one of my comments against v2. Please remove the backslash after "xargs rm -f". Here, you are doing @find ... | xargs rm -f @rm -f boards.cfg that is, you are trying to delete '@rm' as well as 'boards.cfg' if they exist. Besides, you also need to fix buildman as Simon suggested. Please also cc Simon when you post the next version. Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v4] Makefile: remove generated boards.cfg within make distclean 2014-08-19 23:13 ` [U-Boot] [PATCH v3] " Roger Meier 2014-08-20 1:06 ` Masahiro Yamada @ 2014-08-20 20:10 ` Roger Meier 2014-08-22 6:30 ` Masahiro Yamada 2014-08-23 12:43 ` [U-Boot] [U-Boot, " Tom Rini 1 sibling, 2 replies; 14+ messages in thread From: Roger Meier @ 2014-08-20 20:10 UTC (permalink / raw) To: u-boot Signed-off-by: Roger Meier <roger@bufferoverflow.ch> Cc: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Tom Rini <trini@ti.com> Cc: Wolfgang Denk <wd@denx.de> Cc: Simon Glass <sjg@chromium.org> --- Changes for v2: - remove boards.cfg within make distclean instead of mrproper - use mrproper instead of distclean within MAKEALL Changes for v3: - use @rm instead of rm as suggested by Masahiro Yamada Changes for v4: - remove the backslash after "xargs rm -f" - use mrproper instead of distclean within buildman --- MAKEALL | 2 +- Makefile | 1 + tools/buildman/builder.py | 2 +- tools/buildman/builderthread.py | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/MAKEALL b/MAKEALL index 929fe88..392ea8d 100755 --- a/MAKEALL +++ b/MAKEALL @@ -658,7 +658,7 @@ build_target() { MAKE="${MAKE} O=${output_dir}" fi - ${MAKE} distclean >/dev/null + ${MAKE} mrproper >/dev/null echo "Building ${target} board..." ${MAKE} -s ${target}_defconfig >/dev/null diff --git a/Makefile b/Makefile index b5d5e01..c3d7afd 100644 --- a/Makefile +++ b/Makefile @@ -1287,6 +1287,7 @@ distclean: mrproper -o -name '.*.rej' -o -name '*%' -o -name 'core' \ -o -name '*.pyc' \) \ -type f -print | xargs rm -f + @rm -f boards.cfg backup: F=`basename $(srctree)` ; cd .. ; \ diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py index d5b8454..a555bd8 100644 --- a/tools/buildman/builder.py +++ b/tools/buildman/builder.py @@ -308,7 +308,7 @@ class Builder: Args: commit: Commit object that is being built brd: Board object that is being built - stage: Stage that we are at (distclean, config, build) + stage: Stage that we are at (mrproper, config, build) cwd: Directory where make should be run args: Arguments to pass to make kwargs: Arguments to pass to command.RunPipe() diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index 32297e2..8214662 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -91,7 +91,7 @@ class BuilderThread(threading.Thread): commit: Commit object that is being built brd: Board object that is being built stage: Stage of the build. Valid stages are: - distclean - can be called to clean source + mrproper - can be called to clean source config - called to configure for a board build - the main make invocation - it does the build args: A list of arguments to pass to 'make' @@ -200,8 +200,8 @@ class BuilderThread(threading.Thread): # If we need to reconfigure, do that now if do_config: - result = self.Make(commit, brd, 'distclean', cwd, - 'distclean', *args, env=env) + result = self.Make(commit, brd, 'mrproper', cwd, + 'mrproper', *args, env=env) result = self.Make(commit, brd, 'config', cwd, *(args + config_args), env=env) config_out = result.combined -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v4] Makefile: remove generated boards.cfg within make distclean 2014-08-20 20:10 ` [U-Boot] [PATCH v4] " Roger Meier @ 2014-08-22 6:30 ` Masahiro Yamada 2014-08-23 12:43 ` [U-Boot] [U-Boot, " Tom Rini 1 sibling, 0 replies; 14+ messages in thread From: Masahiro Yamada @ 2014-08-22 6:30 UTC (permalink / raw) To: u-boot On Wed, 20 Aug 2014 22:10:29 +0200 Roger Meier <roger@bufferoverflow.ch> wrote: > Signed-off-by: Roger Meier <roger@bufferoverflow.ch> > Cc: Masahiro Yamada <yamada.m@jp.panasonic.com> > Cc: Tom Rini <trini@ti.com> > Cc: Wolfgang Denk <wd@denx.de> > Cc: Simon Glass <sjg@chromium.org> > Reviewed-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Tested-by: Masahiro Yamada <yamada.m@jp.panasonic.com> ^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [U-Boot, v4] Makefile: remove generated boards.cfg within make distclean 2014-08-20 20:10 ` [U-Boot] [PATCH v4] " Roger Meier 2014-08-22 6:30 ` Masahiro Yamada @ 2014-08-23 12:43 ` Tom Rini 1 sibling, 0 replies; 14+ messages in thread From: Tom Rini @ 2014-08-23 12:43 UTC (permalink / raw) To: u-boot On Wed, Aug 20, 2014 at 10:10:29PM +0200, Roger Meier wrote: > Signed-off-by: Roger Meier <roger@bufferoverflow.ch> > Cc: Masahiro Yamada <yamada.m@jp.panasonic.com> > Cc: Tom Rini <trini@ti.com> > Cc: Wolfgang Denk <wd@denx.de> > Cc: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140823/cadca205/attachment.pgp> ^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH] Makefile: remove generated boards.cfg within make mrproper 2014-08-07 14:53 ` Roger Meier 2014-08-08 12:48 ` Tom Rini @ 2014-08-09 0:19 ` Masahiro YAMADA 1 sibling, 0 replies; 14+ messages in thread From: Masahiro YAMADA @ 2014-08-09 0:19 UTC (permalink / raw) To: u-boot Hi Roger, > How should we ensure that boards.cfg is up-to-date? > What about removing boards.cfg within "make distclean" and use > "make mrproper" within MAKEALL? Sounds good to me, too. Thanks! Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2014-08-23 12:43 UTC | newest] Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2014-08-07 10:52 [U-Boot] [PATCH] Makefile: remove generated boards.cfg within make mrproper Roger Meier 2014-08-07 12:40 ` Masahiro Yamada 2014-08-07 14:53 ` Roger Meier 2014-08-08 12:48 ` Tom Rini 2014-08-10 12:37 ` [U-Boot] [PATCH v2] Makefile: remove generated boards.cfg within make distclean Roger Meier 2014-08-11 22:52 ` Masahiro YAMADA 2014-08-12 14:37 ` Simon Glass 2014-08-18 4:23 ` Masahiro Yamada 2014-08-19 23:13 ` [U-Boot] [PATCH v3] " Roger Meier 2014-08-20 1:06 ` Masahiro Yamada 2014-08-20 20:10 ` [U-Boot] [PATCH v4] " Roger Meier 2014-08-22 6:30 ` Masahiro Yamada 2014-08-23 12:43 ` [U-Boot] [U-Boot, " Tom Rini 2014-08-09 0:19 ` [U-Boot] [PATCH] Makefile: remove generated boards.cfg within make mrproper Masahiro YAMADA
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.