[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [XEN PATCH maybe for-4.17] tools/include: Fix clean and rework COPYING for installed Xen public header


  • To: Anthony PERARD <anthony.perard@xxxxxxxxxx>
  • From: Luca Fancellu <Luca.Fancellu@xxxxxxx>
  • Date: Fri, 25 Nov 2022 09:51:21 +0000
  • Accept-language: en-GB, en-US
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0gWSvdJ+Y2FaDbPjXGlUOygDlEab3wuQ1RDDPbO0OgE=; b=SrTgjnvqys5ZLVgvylDezjeXP1GXKMEW//rtm4D6iErVCdXDVpLGyGyXmSNKKWKtCovwRfJ8FLX+XUORnQDEWR0EGjTidv8zRKRL9Tcx63I6ux3sLVQLtdyd4iFfO8sdqD201m31zfzp2QFDHCpWBwCw+n2zgzGTgvkzdvHmIYTL6lpprxZBskw/RWLg/Ey1WuIcbuz5JsNqfw/xQkI8cMFVkLWLWoH1htSCvkc85/7fIYAqzzMIQCzpfbkVEBqMsb+ry2Zlfvs1A1GsQDgokVd3tgTVaXDML/CdousgP/BTeeb2qdIY/SdfMt68OyPUdwdVTfiLXDK5v3B7zpM35w==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dJHstpDgJa1MIHgcqzfHmAdEBEM+nBadNWKCBeM0psNA9hNVh/Xj2gq5aH0e3dIHj6WuLsOQeGIaONnmAqrbpQH0iw85aUxcCoyAvTw0jehQhJgB1sNZKr/8lRkHPkN9esh7dBOk6CdrhKXVMWnNbNHJoBiE4ceD2rtO9JI7gpB0FPYTLcJzaDOo2vJnWN2MUfIy7IKZMMIUKRe2C0hx9fT8f5DmS1jvrPsIuiFQaD5UMChuQsCUtGi9/DUbqKe7A2mMEHs3QvxCXQhvtsTKgosBKd5Nxj3LI2oSjTo35FQxxpf/ZDoMONT0g8suPcxvpjKd+SbCoBBE7GW6m4MbRA==
  • Authentication-results-original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com;
  • Cc: Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxxx>, Henry Wang <Henry.Wang@xxxxxxx>, Wei Liu <wl@xxxxxxx>
  • Delivery-date: Fri, 25 Nov 2022 09:51:54 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
  • Nodisclaimer: true
  • Original-authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com;
  • Thread-index: AQHZACPtPzSDrvGd206XhRT1bHCUjq5PZqgA
  • Thread-topic: [XEN PATCH maybe for-4.17] tools/include: Fix clean and rework COPYING for installed Xen public header


> On 24 Nov 2022, at 16:42, Anthony PERARD <anthony.perard@xxxxxxxxxx> wrote:
> 
> Use actual include directory used to install the public header in
> COPYING file.
> 
> Also, move the input file out of "tools/include/xen/" because that
> directory is removed on `make clean`.
> 
> We can't used ./configure because $includedir contain another
> variable, so the change is done in Makefile.
> 
> Fixes: 4ea75e9a9058 ("Rework COPYING installed in /usr/include/xen/, due to 
> several licences")
> Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
> Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
> ---
> 
> Notes:
>    For 4.17 inclusion:
> 
>    Doing `make clean && make` in the root dir is going to fail as make
>    isn't going to find the COPYING file while trying to install the
>    includes.
> 
>    If that patch is too much, we could replace the `sed` by `cp` and just
>    move COPYING instead of changing it.
> 
> tools/include/Makefile                        | 1 +
> tools/include/{xen/COPYING => xen.COPYING.in} | 2 +-
> tools/include/.gitignore                      | 1 +
> tools/include/xen/.gitignore                  | 2 --
> 4 files changed, 3 insertions(+), 3 deletions(-)
> rename tools/include/{xen/COPYING => xen.COPYING.in} (93%)
> create mode 100644 tools/include/.gitignore
> delete mode 100644 tools/include/xen/.gitignore
> 
> diff --git a/tools/include/Makefile b/tools/include/Makefile
> index f838171e8c..d69aeb54bf 100644
> --- a/tools/include/Makefile
> +++ b/tools/include/Makefile
> @@ -24,6 +24,7 @@ xen-foreign:
> xen-dir:
>       mkdir -p xen/libelf acpi
>       find xen/ acpi/ -type l -exec rm '{}' +
> +     sed -e 's#@includedir@#$(includedir)/xen#g' xen.COPYING.in > xen/COPYING

If I understand correctly, the -e can be dropped as this is the only command we 
are issuing to sed.

The patch looks good, I’ve tested it with and without the -e and it works

Cheers,
Luca



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.