From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1W4al0-0002Of-Ao for mharc-grub-devel@gnu.org; Sat, 18 Jan 2014 13:36:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W4akt-0002HR-Cx for grub-devel@gnu.org; Sat, 18 Jan 2014 13:36:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W4ako-0000w3-7N for grub-devel@gnu.org; Sat, 18 Jan 2014 13:36:27 -0500 Received: from mail-lb0-x236.google.com ([2a00:1450:4010:c04::236]:41158) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W4akn-0000vq-Rw for grub-devel@gnu.org; Sat, 18 Jan 2014 13:36:22 -0500 Received: by mail-lb0-f182.google.com with SMTP id w7so3461286lbi.27 for ; Sat, 18 Jan 2014 10:36:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:subject:message-id:in-reply-to:references:mime-version :content-type; bh=Z1OhZ3lL1teqGkVkhO1ugjFpIfz/62tiRacUmlVEoJY=; b=Mopd7ArxrYeh/4VxJsW0EiV8NWNn2f7UQa66eFSFV6NKMMg8UxVopMurPsN5u8ibdm HS5LLjwFj8AjDK8hAmaDNWoZ5nS7lAnzbPdEElyKnJvNIxhOqRZ3+Q08z0kfcEXKXU67 YSp+6IkMTzIj/RSQ06XH/JTGgZKiMqfvsNHYCGeondL8iwSoCgx79R6+lURFYoozofI0 s64iHOjsp90UVkmKfXVtNtjhHfcluBcE/qdtCPfk0rqzo9ZFs+BOnGl73ewcTpWbbmlW ix10YEk9lraLhGzeYoXF/TLljt5qoL3LZqNssRxtTcrlrjnR3XYW/aKvZRBJ+2g1y8T9 g5TA== X-Received: by 10.152.2.197 with SMTP id 5mr5253587law.17.1390070180771; Sat, 18 Jan 2014 10:36:20 -0800 (PST) Received: from opensuse.site (ppp91-76-163-241.pppoe.mtu-net.ru. [91.76.163.241]) by mx.google.com with ESMTPSA id c15sm9639294lbq.11.2014.01.18.10.36.19 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Sat, 18 Jan 2014 10:36:20 -0800 (PST) Date: Sat, 18 Jan 2014 22:36:19 +0400 From: Andrey Borzenkov To: grub-devel@gnu.org Subject: Re: [PATCH] use MODULE_FILES for genemuinit* instead of MOD_FILES Message-ID: <20140118223619.32177b84@opensuse.site> In-Reply-To: <52DAC323.60709@gmail.com> References: <1390062422-18563-1-git-send-email-arvidjaar@gmail.com> <52DAB20A.106@gmail.com> <20140118211202.20f09930@opensuse.site> <52DAC323.60709@gmail.com> X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.22; x86_64-suse-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/Acwy6A2=3kN8GKFpBjrx8x+"; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::236 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jan 2014 18:36:33 -0000 --Sig_/Acwy6A2=3kN8GKFpBjrx8x+ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable =D0=92 Sat, 18 Jan 2014 19:08:35 +0100 Vladimir '=CF=86-coder/phcoder' Serbinenko =D0=BF=D0=B8= =D1=88=D0=B5=D1=82: > On 18.01.2014 18:12, Andrey Borzenkov wrote: > > =D0=92 Sat, 18 Jan 2014 17:55:38 +0100 > > Vladimir '=CF=86-coder/phcoder' Serbinenko =D0=BF= =D0=B8=D1=88=D0=B5=D1=82: > >=20 > >> On 18.01.2014 17:27, Andrey Borzenkov wrote: > >>> While on it, pass detected > >>> nm arguments instead of hardcoding them. > >> please make this part a separate patch. > >=20 > > is it OK to commit without this part? > >=20 > could you send the remaining part alone? It's difficult to see throught > intermingled patch. From: Andrey Borzenkov Subject: [PATCH] use MODULE_FILES for genemuinit* instead of MOD_FILES MinGW native nm does not support ELF binaries. --- grub-core/Makefile.am | 6 +++--- grub-core/genemuinit.sh | 4 ++-- grub-core/genemuinitheader.sh | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am index 826b3dd..61aa166 100644 --- a/grub-core/Makefile.am +++ b/grub-core/Makefile.am @@ -294,12 +294,12 @@ grub_emu-grub_emu_init.$(OBJEXT):grub_emu_init.h kern/emu/grub_emu_dyn-main.$(OBJEXT):grub_emu_init.h grub_emu_dyn-grub_emu_init.$(OBJEXT):grub_emu_init.h =20 -grub_emu_init.h: genemuinitheader.sh $(MOD_FILES) - rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinitheader.sh $(TARGET_N= M) > $@ +grub_emu_init.h: genemuinitheader.sh $(MODULE_FILES) + rm -f $@; echo $(MODULE_FILES) | sh $(srcdir)/genemuinitheader.sh $(TARGE= T_NM) > $@ CLEANFILES +=3D grub_emu_init.h =20 grub_emu_init.c: grub_emu_init.h genemuinit.sh $(MOD_FILES) - rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinit.sh $(TARGET_NM) > $@ + rm -f $@; echo $(MODULE_FILES) | sh $(srcdir)/genemuinit.sh $(TARGET_NM) = > $@ CLEANFILES +=3D grub_emu_init.c endif =20 diff --git a/grub-core/genemuinit.sh b/grub-core/genemuinit.sh index 45c15ec..8c6bb1c 100644 --- a/grub-core/genemuinit.sh +++ b/grub-core/genemuinit.sh @@ -47,7 +47,7 @@ EOF read mods for line in $mods; do if ${nm} --defined-only -P -p ${line} | grep grub_mod_init > /dev/null; = then - echo "grub_${line}_init ();" | sed 's,\.mod,,g;' + echo "grub_${line%%.*}_init ();" fi done =20 @@ -63,7 +63,7 @@ EOF =20 for line in $mods; do if ${nm} --defined-only -P -p ${line} | grep grub_mod_fini > /dev/null; = then - echo "grub_${line}_fini ();" | sed 's,\.mod,,g;' + echo "grub_${line%%.*}_fini ();" fi done =20 diff --git a/grub-core/genemuinitheader.sh b/grub-core/genemuinitheader.sh index 6b83f59..a99a15d 100644 --- a/grub-core/genemuinitheader.sh +++ b/grub-core/genemuinitheader.sh @@ -44,9 +44,9 @@ EOF read mods for line in $mods; do if ${nm} --defined-only -P -p ${line} | grep grub_mod_init > /dev/null; = then - echo "void grub_${line}_init (void);" | sed 's,\.mod,,g;' + echo "void grub_${line%%.*}_init (void);" fi if ${nm} --defined-only -P -p ${line} | grep grub_mod_fini > /dev/null; = then - echo "void grub_${line}_fini (void);" | sed 's,\.mod,,g;' + echo "void grub_${line%%.*}_fini (void);" fi done --=20 tg: (6c519b5..) u/mingw/use_MODULE_FILES_for_genemu (depends on: master) --Sig_/Acwy6A2=3kN8GKFpBjrx8x+ Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iEYEARECAAYFAlLayaMACgkQR6LMutpd94y73QCgrTBLTr4LkDtz6lU4vRTY/gC/ Ti4An1zgMrI1UH8HJtJqzEam7dCtK6oN =Kvja -----END PGP SIGNATURE----- --Sig_/Acwy6A2=3kN8GKFpBjrx8x+--