From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
To: Jan Beulich <JBeulich@suse.com>
Cc: wei.liu2@citrix.com, andrew.cooper3@citrix.com,
ian.jackson@eu.citrix.com, xen-devel@lists.xen.org,
julien.grall@arm.com, zhaoshenglong@huawei.com,
roger.pau@citrix.com
Subject: Re: [PATCH v7] acpi: Prevent GPL-only code from seeping into non-GPL binaries
Date: Wed, 28 Sep 2016 08:53:41 -0400 [thread overview]
Message-ID: <6e02a6c6-ac83-d0c1-a520-9ceca00a313e@oracle.com> (raw)
In-Reply-To: <57EBB9DA02000078001133EC@prv-mh.provo.novell.com>
On 09/28/2016 06:38 AM, Jan Beulich wrote:
>>>> On 27.09.16 at 16:46, <boris.ostrovsky@oracle.com> wrote:
>> --- a/tools/firmware/hvmloader/acpi/Makefile
>> +++ b/tools/firmware/hvmloader/acpi/Makefile
>> @@ -17,7 +17,8 @@
>> XEN_ROOT = $(CURDIR)/../../../..
>> include $(XEN_ROOT)/tools/firmware/Rules.mk
>>
>> -C_SRC = build.c dsdt_anycpu.c dsdt_15cpu.c static_tables.c dsdt_anycpu_qemu_xen.c
>> +C_SRC-$(GPL) = build.c dsdt_anycpu.c dsdt_15cpu.c dsdt_anycpu_qemu_xen.c
>> +C_SRC = build.c static_tables.c $(C_SRC-y)
>> OBJS = $(patsubst %.c,%.o,$(C_SRC))
>>
>> CFLAGS += $(CFLAGS_xeninclude)
>> @@ -36,18 +37,25 @@ ssdt_s3.h ssdt_s4.h ssdt_pm.h ssdt_tpm.h: %.h: %.asl iasl
>> mk_dsdt: mk_dsdt.c
>> $(HOSTCC) $(HOSTCFLAGS) $(CFLAGS_xeninclude) -o $@ mk_dsdt.c
>>
>> -dsdt_anycpu_qemu_xen.asl: dsdt.asl dsdt_acpi_info.asl mk_dsdt
>> +ifeq ($(GPL),y)
>> +dsdt_anycpu_qemu_xen.asl: dsdt.asl dsdt_acpi_info.asl gpl/mk_dsdt_gpl.sh mk_dsdt
>> awk 'NR > 1 {print s} {s=$$0}' $< > $@.$(TMP_SUFFIX)
>> + # Strip license comment
>> + sed -i '1,/\*\//{/\/\*/,/\*\//d}' $@.$(TMP_SUFFIX)
>> + $(SHELL) gpl/mk_dsdt_gpl.sh >> $@.$(TMP_SUFFIX)
>> cat dsdt_acpi_info.asl >> $@.$(TMP_SUFFIX)
>> ./mk_dsdt --debug=$(debug) --dm-version qemu-xen >> $@.$(TMP_SUFFIX)
>> mv -f $@.$(TMP_SUFFIX) $@
>>
>> # NB. awk invocation is a portable alternative to 'head -n -1'
>> -dsdt_%cpu.asl: dsdt.asl dsdt_acpi_info.asl mk_dsdt
>> +dsdt_%cpu.asl: dsdt.asl dsdt_acpi_info.asl gpl/mk_dsdt_gpl.sh mk_dsdt
>> awk 'NR > 1 {print s} {s=$$0}' $< > $@.$(TMP_SUFFIX)
>> + sed -i '1,/\*\//{/\/\*/,/\*\//d}' $@.$(TMP_SUFFIX)
>> + $(SHELL) gpl/mk_dsdt_gpl.sh >> $@.$(TMP_SUFFIX)
>> cat dsdt_acpi_info.asl >> $@.$(TMP_SUFFIX)
>> ./mk_dsdt --debug=$(debug) --maxcpu $* >> $@.$(TMP_SUFFIX)
>> mv -f $@.$(TMP_SUFFIX) $@
>> +endif
> The conditional you add here seems unnecessary - I assume you've
> added it just to stress the GPL-only fact even more?
Yes, that's exactly the reason.
-boris
> If that's the
> case:
> Reviewed-by: Jan Beulich <jbeulich@suse.com>
>
> Jan
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-09-28 12:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-27 14:46 [PATCH v7] acpi: Prevent GPL-only code from seeping into non-GPL binaries Boris Ostrovsky
2016-09-27 15:39 ` Wei Liu
2016-09-28 10:38 ` Jan Beulich
2016-09-28 12:53 ` Boris Ostrovsky [this message]
2016-09-28 12:53 ` Wei Liu
2016-09-28 13:07 ` Boris Ostrovsky
2016-09-28 13:50 ` Wei Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6e02a6c6-ac83-d0c1-a520-9ceca00a313e@oracle.com \
--to=boris.ostrovsky@oracle.com \
--cc=JBeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=julien.grall@arm.com \
--cc=roger.pau@citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
--cc=zhaoshenglong@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).