Eliminate some shell invocations

Submitter	Patrick Georgi
Date	2010-02-10 18:45:36
Message ID	<4B72FED0.2090101@georgi-clan.de>
Download	mbox \| patch
Permalink	/patch/902/
State	Accepted
Commit	r5110
Headers	show Return-path: <coreboot-bounces+patchwork=coreboot.org@coreboot.org> Envelope-to: patchwork@coreboot.org sender: patrick) by t-stueck.streichelzoo.local (Postfix) with ESMTPSA id 90B8420035F32 for <coreboot@coreboot.org>; Wed, 10 Feb 2010 19:45:38 +0100 (CET) Message-ID: <4B72FED0.2090101@georgi-clan.de> Date: Wed, 10 Feb 2010 19:45:36 +0100 From: Patrick Georgi <patrick@georgi-clan.de> User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; de; rv:1.9.1.7) Gecko/20100111 Lightning/1.0b1 Thunderbird/3.0.1 MIME-Version: 1.0 To: coreboot@coreboot.org Content-Type: multipart/mixed; boundary="------------000204070409000206020701" Subject: [coreboot] [PATCH]Eliminate some shell invocations Precedence: list Sender: coreboot-bounces+patchwork=coreboot.org@coreboot.org Errors-To: coreboot-bounces+patchwork=coreboot.org@coreboot.org

Comments

Patrick Georgi - 2010-02-10 18:45:36

Hi,

Remove uses of the shell to remove double quotes, or to figure out the
current directory (stored in $(PWD) as well)


Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>

Stefan Reinauer - 2010-02-10 18:51:23

On 2/10/10 7:45 PM, Patrick Georgi wrote:
> Hi,
>
> Remove uses of the shell to remove double quotes, or to figure out the
> current directory (stored in $(PWD) as well)
>
>
> Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
>   

Acked-by: Stefan Reinauer <stepan@coresystems.de>

Patch

Index: Makefile
===================================================================
--- Makefile	(revision 5108)
+++ Makefile	(working copy)
@@ -22,7 +22,7 @@ 
 $(if $(wildcard .xcompile),,$(eval $(shell bash util/xcompile/xcompile > .xcompile)))
 include .xcompile
 
-export top := $(shell pwd)
+export top := $(PWD)
 export src := $(top)/src
 export srck := $(top)/util/kconfig
 export obj ?= $(top)/build
@@ -73,7 +73,7 @@ 
 ARCHDIR-$(CONFIG_ARCH_X86)    := i386
 ARCHDIR-$(CONFIG_ARCH_POWERPC) := ppc
 
-MAINBOARDDIR=$(shell echo $(CONFIG_MAINBOARD_DIR))
+MAINBOARDDIR=$(subst ",,$(CONFIG_MAINBOARD_DIR))
 export MAINBOARDDIR
 
 PLATFORM-y += src/arch/$(ARCHDIR-y) src/cpu src/mainboard/$(MAINBOARDDIR)
@@ -84,7 +84,7 @@ 
 BUILD-$(CONFIG_ARCH_X86) += src/pc80
 
 ifneq ($(CONFIG_LOCALVERSION),"")
-COREBOOT_EXTRA_VERSION := -$(shell echo $(CONFIG_LOCALVERSION))
+COREBOOT_EXTRA_VERSION := -$(subst ",,$(CONFIG_LOCALVERSION))
 endif
 
 # The primary target needs to be here before we include the
@@ -140,7 +140,7 @@ 
 
 define objs_dsl_template
 $(obj)/$(1)%.o: src/$(1)%.asl
-	@printf "    IASL       $$(subst $$(shell pwd)/,,$$(@))\n"
+	@printf "    IASL       $$(subst $(top)/,,$$(@))\n"
 	$(CPP) -D__ACPI__ -P $(CPPFLAGS) -include $(obj)/config.h -I$(src) -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$(basename $$@).asl
 	iasl -p $$(basename $$@) -tc $$(basename $$@).asl
 	mv $$(basename $$@).hex $$(basename $$@).c

Patchwork Eliminate some shell invocations

Comments

Patch