From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:44697)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1U1IOJ-000094-RG
	for qemu-devel@nongnu.org; Fri, 01 Feb 2013 10:19:00 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1U1IOI-0006vW-SK
	for qemu-devel@nongnu.org; Fri, 01 Feb 2013 10:18:59 -0500
Received: from mx1.redhat.com ([209.132.183.28]:52315)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1U1IOI-0006vN-LF
	for qemu-devel@nongnu.org; Fri, 01 Feb 2013 10:18:58 -0500
Message-ID: <510BDCE0.6010206@redhat.com>
Date: Fri, 01 Feb 2013 16:18:56 +0100
From: Gerd Hoffmann <kraxel@redhat.com>
MIME-Version: 1.0
References: <1359720044-8140-1-git-send-email-kraxel@redhat.com>
	<1359720044-8140-3-git-send-email-kraxel@redhat.com>
	<510BC541.2020109@suse.de>
In-Reply-To: <510BC541.2020109@suse.de>
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH 2/4] fix scripts/make_device_config.sh
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: =?ISO-8859-15?Q?Andreas_F=E4rber?= <afaerber@suse.de>
Cc: qemu-devel@nongnu.org

On 02/01/13 14:38, Andreas F=E4rber wrote:
> Am 01.02.2013 13:00, schrieb Gerd Hoffmann:
>> Make it handle multiple include statements in a file.
>>
>> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
>> ---
>>  scripts/make_device_config.sh |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/scripts/make_device_config.sh b/scripts/make_device_confi=
g.sh
>> index 0778fe2..81fe942 100644
>> --- a/scripts/make_device_config.sh
>> +++ b/scripts/make_device_config.sh
>> @@ -18,7 +18,7 @@ process_includes () {
>> =20
>>  f=3D$src
>>  while [ -n "$f" ] ; do
>> -  f=3D`tr -d '\r' < $f | awk '/^include / {printf "'$src_dir'/%s", $2=
}'`
>> +  f=3D`cat $f | tr -d '\r' | awk '/^include / {printf "'$src_dir'/%s =
", $2}'`
>>    [ $? =3D 0 ] || exit 1
>>    all_includes=3D"$all_includes $f"
>>  done
>=20
> The actual fix is appending a space? Or how does cat make a difference?

Both changes are needed.

Without the space you get "pci.makusb.mak" instead of "pci.mak usb.mak"
in $f (and $all_includes).

The cat makes sure it still works with two files in $f.

cheers,
  Gerd