* [PATCH 3/4] small tweeks to build system for compatibility on MacOS X
@ 2013-09-03 2:22 Darren Garnier
2013-09-04 7:12 ` Sascha Hauer
0 siblings, 1 reply; 2+ messages in thread
From: Darren Garnier @ 2013-09-03 2:22 UTC (permalink / raw)
To: barebox
Signed-off-by: Darren Garnier <dgarnier@reinrag.net>
---
Makefile | 6 +++---
scripts/genenv | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 397c54a..ff17d8f 100644
--- a/Makefile
+++ b/Makefile
@@ -577,7 +577,7 @@ define rule_barebox__
$(cmd_sysmap) $@ System.map; \
if [ $$? -ne 0 ]; then \
rm -f $@; \
- /bin/false; \
+ false; \
fi;
endef
@@ -614,7 +614,7 @@ define verify_kallsyms
$(Q)cmp -s System.map .tmp_System.map || \
(echo Inconsistent kallsyms data; \
echo Try setting CONFIG_KALLSYMS_EXTRA_PASS; \
- rm .tmp_kallsyms* ; /bin/false )
+ rm .tmp_kallsyms* ; false )
endef
# Update barebox version before link
@@ -782,7 +782,7 @@ ifneq ($(KBUILD_SRC),)
$(Q)if [ -f $(srctree)/.config -o -d $(srctree)/include/config ]; then \
echo " $(srctree) is not clean, please run 'make mrproper'";\
echo " in the '$(srctree)' directory.";\
- /bin/false; \
+ false; \
fi;
$(Q)if [ ! -d include2 ]; then mkdir -p include2; fi;
$(Q)if [ -e $(srctree)/include/asm-$(SRCARCH)/barebox.h ]; then \
diff --git a/scripts/genenv b/scripts/genenv
index 374db6d..b3b6ec5 100755
--- a/scripts/genenv
+++ b/scripts/genenv
@@ -24,7 +24,8 @@ for i in $*; do
done
)
-find $tempdir -name '.svn' -o -name '*~' | xargs --no-run-if-empty rm -r
+#find $tempdir -name '.svn' -o -name '*~' | xargs --no-run-if-empty rm -r
+find $tempdir -name '.svn' -o -name '*~' -delete
$objtree/scripts/bareboxenv -s $tempdir $target
--
1.8.3.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 3/4] small tweeks to build system for compatibility on MacOS X
2013-09-03 2:22 [PATCH 3/4] small tweeks to build system for compatibility on MacOS X Darren Garnier
@ 2013-09-04 7:12 ` Sascha Hauer
0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2013-09-04 7:12 UTC (permalink / raw)
To: Darren Garnier; +Cc: barebox
Hi Darren,
On Mon, Sep 02, 2013 at 10:22:49PM -0400, Darren Garnier wrote:
> Signed-off-by: Darren Garnier <dgarnier@reinrag.net>
> ---
> Makefile | 6 +++---
> scripts/genenv | 3 ++-
> 2 files changed, 5 insertions(+), 4 deletions(-)
Applied, thanks.
I had to hand edit this patch. Your mailer seems to remove leading
spaces:
diff --git a/Makefile b/Makefile
index 397c54a..ff17d8f 100644
--- a/Makefile
+++ b/Makefile
@@ -577,7 +577,7 @@ define rule_barebox__
$(cmd_sysmap) $@ System.map; \
if [ $$? -ne 0 ]; then \
rm -f $@; \
- /bin/false; \
+ false; \
fi;
endef
^^^
There should be a space before 'endef'
I won't be able to apply bigger patches this way. Consider using
git-send-email, once configured to actually send something it will most
likely send correct patches.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-09-04 7:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-09-03 2:22 [PATCH 3/4] small tweeks to build system for compatibility on MacOS X Darren Garnier
2013-09-04 7:12 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox