From patchwork Mon Dec 6 17:01:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12658913 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2E074C433F5 for ; Mon, 6 Dec 2021 17:03:08 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239417.414956 (Exim 4.92) (envelope-from ) id 1muHOF-0005vt-0G; Mon, 06 Dec 2021 17:02:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239417.414956; Mon, 06 Dec 2021 17:02:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOE-0005vh-Q2; Mon, 06 Dec 2021 17:02:58 +0000 Received: by outflank-mailman (input) for mailman id 239417; Mon, 06 Dec 2021 17:02:57 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOD-0005ti-PF for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:02:57 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5aafbb36-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:02:56 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5aafbb36-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810175; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TKhye1HdvBigP9+nr6Vr3o8+wKLgJNZaOQSBuxAwT3A=; b=D9pSmLqtU6tjHnaq4wiHRboT7YKSEUgXwBxwKlV6AJ0leXicu4zpK17s oUNOiAYaI8Pk0UJEEukdILCH/TcFNldERvuHVTlugF2/hYAvhrUvvVArL IS1fvldlg43w5FH+bSxmJZiTECMTBXdwZY0H4ZasEv5gOu2+19IW5PzvB E=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: IoCEYYuY/DFWYmh5ZyCzieeAJWqnNZtsTDbox4g5TBa6c6aASZlK9sGjCzw/778vYTuenwhs/1 BabPmbzf8+v3CPGnaSHZqaYLPJQ7TlcfQS36CWLgBaJ1fPfEa+IZDHlAQVLzRXvN1ZZlYFfC6E AmvWDkK4vJ3edBmZczrFyOymvFF9G8QsAdaAgp4uwdcVhqfj1USGS5TT29Kyhx6SLliwjb1eeg WKq+y97A/5MtXWZcr7lfuspnw4SllwDM594lJpZz5iI/zdUkPVefQAc9NnBksUxlGmpf/UHveD KH1phze3r0WTLoP4of1TZDrE X-SBRS: 5.1 X-MesageID: 58884262 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:HBweeasv9KWcO5iyglgQT8dxpufnVM1ZMUV32f8akzHdYApBsoF/q tZmKT/XM/yMMWH9eoojO4m09RkA7JaHy9BkTAtu+CozHn8b+JbJXdiXEBz9bniYRiHhoOOLz Cm8hv3odp1coqr0/0/1WlTZQP0VOZigHtIQMsadUsxKbVIiGHhJZS5LwbZj29cy2YbhWWthh PupyyHhEA79s9JLGjp8B5Kr8HuDa9yr5Vv0FnRnDRx6lAe2e0s9VfrzFonoR5fMeaFGH/bSe gr25OrRElU1XfsaIojNfr7TKiXmS1NJVOSEoiI+t6OK2nCuqsGuu0qS2TV1hUp/0l20c95NJ NpllseRQgIYH7L1gN8SWT14CCFxD6Ia0eqSSZS/mZT7I0zudnLtx7NlDV0sPJ1e8eFyaY1M3 aVGcnZXNEnF3r/ohuLgIgVvrp1LwM3DNYUDunZm3HfBAOwvW5zrSKTW/95Imjw3g6iiGN6DN 5pJNWAxNnwsZTUXNn4HLZE6mdvyhybWS2EAhA/El7Qetj27IAtZj+G2bYu9lsaxbcdImkeVo ErW8mK/BQsVXPSE0iaM+H+ogu7JnAv4VZgUGbn+8eRl6HWMwkQDBRtQUkG0ydG7gEOjX9NUK 2QP5zEj66M18SSDXtT7GhG1vnOAlhodQMZLVf037hmXzajZ6BrfAXILJhZIbsAms8knAyQnz FaTk/vmADVutPueTnf13raLrxuiNC4NN2gAaCQYCwwf7LHeTJob10yVCIw5Sejs04OzSWqYL y22QDYWpO4yhss69rqC5WvIiRaMvZjGfAFpz1CCNo661T9RaImgbo2uzFHU6/dcMYqUJmW8U Gg4d9u2t75XU8zU/MCZaKBURezyua7ZWNHJqQc3R8FJyti7x5K0kWm8ChlaLVwhDMsLcCSBj KT76VIIv8870JdHgMZKj2ON5yYCkPGI+TfNDKm8gj9yjn5ZLlXvEMZGPxH44owVuBJw+ZzTw L/CGSpWMV4UCL580B29TPoH3Lkgy0gWnD2IFc+hnkn9i+TBNBZ5rIvp1nPUNIjVC4ve/23oH yt3bZPWm32zrsWgCsUozWLjBQ9TdiVqbXwHg8dWavSCMmJb9JIJUJfsLUcaU9U9xcx9z76Ql lnkAxMw4Aev1BXvdFTRAlg+OeyHYHqKhS9iVcDaFQ3zgCZLjEfGxPp3SqbbipF7rrE+lqAtE KFeEyhCa9wWIgn6F/0mRcGVhORfmN6D3Gpi5gKpP2oyeYBOXQvM9oO2dwfj7nBWXCG2qdE/s /ur0QaCGcgPQAFrDcD3bvOzzgzu4ShBybwqB0aYcMNOfEjM8ZRxL3CjhPEAPMxRew7IwSGX1 ljKDE5A9/XNuYI87PLAmbuA89WyC+J7E0cDRzvb4L+6ODP05G2mxYMcAu+EcSqEDDH/+bm4Z PUTxPb5aaVVkFFPuot6MrBq0aNhuIe/++4EllxpRSyZYU6qB7VsJmi98fNO7qAdlKVEvQaWW 16U/oUIM7u+J864QkUaIxAob7rf2KhMyCXS9/k8PG7z+DRzoOicSUxXMhSB1H5dIb9yPN93y OstopdLuQm2ix5sOdealCFEsW+LKyVYAakgs5gbBq7tixYqlQ4eMcCNVHeu7cHdcchIP2krP iSQ1fjLiLlrz0bfd2Y+SCrW1u1HiJVS4B1HwTfu/bhSdgYpUhPv4CBszA== IronPort-HdrOrdr: A9a23:/6+aKqCLRx9gtI3lHemq55DYdb4zR+YMi2TC1yhKJiC9Ffbo8P xG/c5rrCMc5wxxZJhNo7290ey7MBHhHP1OkO0s1NWZPDUO0VHAROoJ0WKh+UyEJ8SXzJ866U 4KScZD4bPLYWSS9fyKgzWFLw== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="58884262" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Julien Grall , "Stefano Stabellini" , Wei Liu Subject: [XEN PATCH 01/57] .gitignore: Non existing toolcore/include files. Date: Mon, 6 Dec 2021 17:01:44 +0000 Message-ID: <20211206170241.13165-2-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 4664034cdc (tools/libs: move official headers to common directory) forgot one .gitignore update. Signed-off-by: Anthony PERARD --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9513506dd9..cad5aacd8d 100644 --- a/.gitignore +++ b/.gitignore @@ -384,7 +384,6 @@ tools/include/xen-foreign/arm64.h .git tools/misc/xen-hptool tools/misc/xen-mfndump -tools/libs/toolcore/include/_*.h tools/firmware/etherboot/eb-roms.h tools/firmware/etherboot/gpxe-git-snapshot.tar.gz tools/misc/xenhypfs From patchwork Mon Dec 6 17:01:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12658987 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 61723C433EF for ; Mon, 6 Dec 2021 17:07:10 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239443.415094 (Exim 4.92) (envelope-from ) id 1muHS4-0004r6-9T; Mon, 06 Dec 2021 17:06:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239443.415094; Mon, 06 Dec 2021 17:06:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHS4-0004qz-5g; Mon, 06 Dec 2021 17:06:56 +0000 Received: by outflank-mailman (input) for mailman id 239443; Mon, 06 Dec 2021 17:06:55 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOg-0005ta-M1 for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:26 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6bcafb74-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:03:25 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6bcafb74-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810205; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7aOw8syolA2pTNhK+TaqXfl93M4Y1PlS90vYN+kTCEs=; b=ZXBM6mt2KR8XlgTCinH9E4/rzpLzIt+hWK1iktxaj+pxOp+/8jn9chIg +gona542ud50hqtV4TZe6DmqpSKCLzTlio5hDQ/W1ZfpMkn44jCx1xtAD U0jABKCKXJt8tt+uh88JILsVL/MRx66yv8hdtCPALOhJczHPc1R1MGB1n A=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: rQVJznZ5uG9sm+n5Vr8uI41OMqkvi/LSOFE2AFkmUsO58NtDw0w7Ab6eRfrJl+81DSs9hU0C1C Y6TxwQ0bK1y1MhkZRtDH/DaWEvC2jn8SLpo1H6ao5P62cqamfqS9JhM2VwHJvAnmZ35CQ9YCdx nVFTq91G8HSvLGCWjwQAwxsM/u+Okbu2HjJQ2f4fSIpjjCL8q3yxYUZlxm3B4sfLbD8WAHRrGg EBdHDVbSeY85GwKtXY7fLp6mH8Mx5KbOeNsauSRXJa5AZmrHkKmpuuFZaLR8780wsAgR85ITdX jDm6V/7RUTMAOfJozAYJ3EHP X-SBRS: 5.1 X-MesageID: 59766334 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:Aapz5qnY0gOW1xt3iF16ZGHo5gxnIURdPkR7XQ2eYbSJt1+Wr1Gzt xJJXzyAM/aOM2OmftxxYYWz/E9Uv5DWnINlSgFrqCwzRCMWpZLJC+rCIxarNUt+DCFioGGLT Sk6QoOdRCzhZiaE/n9BClVlxJVF/fngqoDUUYYoAQgsA187IMsdoUg7wbdg2NY22YLR7z6l4 rseneWOYDdJ5BYsWo4kw/rrRMRH5amaVJsw5zTSVNgT1LPsvyB94KE3fMldG0DQUIhMdtNWc s6YpF2PEsE1yD92Yj+tuu6TnkTn2dc+NyDW4pZdc/DKbhSvOkXee0v0XRYRQR4/ttmHozx+4 PVpl6KobgcbAvHVwe0bUBAfSjleY7ITrdcrIVDn2SCS50jPcn+qyPRyFkAme4Yf/46bA0kXq 6ZecmpUKEne2aTmm9pXScE17ignBMDtIIMYvGAm1TzDBOwqaZvCX7/L9ZlT2zJYasVmQKeBO ZRCMmYHgBLofREQAVsdL5MFl9i4hzr4cwdbsVbEqv9ii4TU5FMoi+W8WDbPQfSLWsd9jkuev njB/WnyHlcdLtP34SWB2mKhgKnIhyyTcJIfEvi0++BnhHWXx3cPE1sGWF2ju/67h0WiHdVFJ CQ88ywyra805QqzQ8P0RRGQr3uNvxpaUN1Ve9DW8ynUlPCSuVzAQDFZEHgRM7TKqfPaWxQK8 n23h/TpNwAzqeScT3GUse6MjW2tbH19wXA5WQcISg4M4t/GqY41jw7SQtsLLJNZnuEZChmrn WnU8XFWa6E7yJdSiv7lpQyvbyeE/8CRFmYIChPrsnVJB++TTKqsfMSW5FfS9p6sx67JHwDa7 BDodyVzhd3i7K1hdgTQGY3h/5nzvp5p1QEwZ3Y1RfHNEBz3pBaekXh4um0WGauQGp9slcXVS EHSoxhNw5RYIWGna6R6C6roVZ96kvKxSI6/CK+EBjarXnSXXFXdlM2JTRTPt10BbWB2yf1vU XtlWZjE4Ykm5VRPk2PtGrZ1PU4DzSEi32LDLa0XPDz8uYdykEW9EO9fWHPXN7hRxPrd/G39r oYOX+PXmk43eLCvPUHqHXs7cAliwY4TXsut9aS6t4erf2JbJY3WI6OLnO56JdU6x/89eyWh1 ijVZ3K0AWHX3RXvQThmoFgyAF82dZog/389IwI2OlOkhyoqbYq1tf9NfJorZ7g3sudkyKcsH fUCfsyBBNVJSyjGpGtBPcWs8tQ6eUT5nx+KMgqkfCM7I8xqSTvW94K2ZQDo7iQPUHa67JNsv 7262wrHapMfXAA+Xt3OYfeiwgrp73gQke5/RWXSJdxXdBm++YRmMXWp3PQ2P9sNOVPIwT7Dj 1SaBhIRpO/spY4p8YaW2fDY/tnxS+YnRxhUBWjW67qyJBL2xGv7zN8SSvuMcBDcSHjwpPeoa 9JKwqyuK/YAhltL7dZxSu450aIk6tLzjLZG1QA4Tm7TZlGmB748cHmL2c5D6v9EyrND4FbkX 0uO/p9ROKmTOdOjG1kUfVJ3YuOG3PASuz/T8fVqfxmquH4ppOKKARdIIh2BqC1BN78kYooqz NAotNMS9wHi2AEhNcyLj3wM+mmBRpDav37Lan3O7FfXtzcW IronPort-HdrOrdr: A9a23:1zU9FaC39zQ1h83lHemU55DYdb4zR+YMi2TC1yhKJyC9Ffbo8f xG/c5rrSMc5wxwZJhNo7y90ey7MBbhHP1OkO4s1NWZLWrbUQKTRekIh+bfKn/baknDH4ZmpN 5dmsNFaeEYY2IUsS+D2njbL+od X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59766334" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu Subject: [XEN PATCH 02/57] tools/configure.ac: Remove left over system_aio Date: Mon, 6 Dec 2021 17:01:45 +0000 Message-ID: <20211206170241.13165-3-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 system_aio isn't set since 3d4678108a (tools: remove in tree libaio). Signed-off-by: Anthony PERARD --- tools/configure.ac | 1 - tools/configure | 2 -- 2 files changed, 3 deletions(-) diff --git a/tools/configure.ac b/tools/configure.ac index 3ac62626a5..5a4fb9022d 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -402,7 +402,6 @@ AC_CHECK_LIB([lzo2], [lzo1x_decompress], [zlib="$zlib -DHAVE_LZO1X -llzo2"]) PKG_CHECK_MODULES([libzstd], [libzstd], [zlib="$zlib -DHAVE_ZSTD $libzstd_CFLAGS $libzstd_LIBS"], [true]) AC_SUBST(zlib) -AC_SUBST(system_aio) AX_CHECK_EXTFS AX_CHECK_PTHREAD AX_CHECK_PTYFUNCS diff --git a/tools/configure b/tools/configure index 21e3a83795..8e4a59c2cb 100755 --- a/tools/configure +++ b/tools/configure @@ -641,7 +641,6 @@ PTHREAD_LIBS PTHREAD_LDFLAGS PTHREAD_CFLAGS EXTFS_LIBS -system_aio zlib libzstd_LIBS libzstd_CFLAGS @@ -8772,7 +8771,6 @@ $as_echo "yes" >&6; } fi - ac_fn_c_check_header_mongrel "$LINENO" "ext2fs/ext2fs.h" "ac_cv_header_ext2fs_ext2fs_h" "$ac_includes_default" if test "x$ac_cv_header_ext2fs_ext2fs_h" = xyes; then : From patchwork Mon Dec 6 17:01:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12658915 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4BA25C433EF for ; Mon, 6 Dec 2021 17:03:10 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239418.414973 (Exim 4.92) (envelope-from ) id 1muHOI-0006SS-AM; Mon, 06 Dec 2021 17:03:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239418.414973; Mon, 06 Dec 2021 17:03:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOI-0006SE-6d; Mon, 06 Dec 2021 17:03:02 +0000 Received: by outflank-mailman (input) for mailman id 239418; Mon, 06 Dec 2021 17:03:01 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOH-0005ti-2k for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:01 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5dadd8a9-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:03:00 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5dadd8a9-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810179; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3N07QGAtESY5bqMCOllijGa4cGWUF9eCtceys/Ns6K8=; b=G3uvCrDpG55W6OnGgWheKFcApMFKReNySs6pcy3IHXDdqF6zVnKuIir6 ZIY6saXzkDYiDY9VAALTB1Cvo0UNVknkfnjmlpGpnfmyhF1VvyIDMKPMp gRaAposA5P6Fl4wPsxT0AYd2x3QygQ0bj/90eEerea9mQnAODuB5KQdZo o=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: sywNBfXnP6sCqwGVg2yegclBoqeRZnnFfSn58+Cl4ZZG7I16R0TtNXSMWYLApskeUxPrGeebHe mhcZUMyPzOzs8ejPT3BDhEZxO5moiK05kzJOlWtxUC8O3A7ipB23thcCb6A5cRO1UskjNPi2xE hguUILyYzYPLdG8xIQpmPWO+7djnNu4CyBRscbxSHYvSyW/wP7OPsS20qKVzAoCG/fm+Lntc/p hVcDjGgHBoAo6zyPTEW12Gd+TwI2wJXqZVMs8ES1lG4WL2HHrQVpZsrFnUq3AvC0TR5nNEgJ3l auopn4rdLPQmW6rlQzgSjrVu X-SBRS: 5.1 X-MesageID: 58884268 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:hyi46Kj/IFKkH2L/EOlsBdcwX161hhcKZh0ujC45NGQN5FlHY01je htvDGiHOvuLM2v3fNAnPYy+9kgBvcDVnN9rQAVvqC48EHgb9cadCdqndUqhZCn6wu8v7a5EA 2fyTvGacajYm1eF/k/F3oAMKRCQ7InQLlbGILes1htZGEk0F0/NtTo5w7Rg29Qw34Dja++wk YiaT/P3aQfNNwFcagr424rbwP+4lK2v0N+wlgVWicFj5DcypVFMZH4sDfjZw0/DaptVBoaHq 9Prl9lVyI97EyAFUbtJmp6jGqEDryW70QKm0hK6UID66vROS7BbPg/W+5PwZG8O4whlkeydx /1DtYKaSC0LLJfqs7wNeTJKGnt3LKtvreqvzXiX6aR/zmXDenrohf5vEFs3LcsT/eMf7WNmr KJCbmpXN1ba2rzwkOnTpupE36zPKOHiOp8fvXdxiynUF/88TbjIQrnQ5M8e1zA17ixLNauON 5pFM2Q/BPjGSxdvYHpPEI1up8CDlEnxTzkCon6Jg6VitgA/yyQuieOwYbI5YOeiRNpXtlaVo Hrc+Gb0CQ1cM8aQoRKa9lq8i+mJmjn0MKoCGbv9+vN0jVm7wm0IFAZQRVa9ueO+iEO1R5RYM UN80iMosag18l3tVtTnVge0iHGBtx8YHdFXFoUHBBqlk/SOpVzDXy5dE2AHOIdOWNIKqSIC2 F+XtdLDJy5VlpbNWVi25L7OpCK0EH1ARYMdXhMsQQwA6tjlhYg8iBPTU9pueJKIYs3J9SLYm G7T8nVn71kHpYtSjvjgowib6965jsGRFlZd2+nBYo6yAuqVjqaBbpfg11XU5O0owG2xHgjY5 yhsdyRzAYkz4XCxeM6lHbxl8FKBva/t3NjgbbhHRcNJG9OFoSHLQGyoyGsiTHqFy+5dEdMTX GfduBlK+LhYN2awYKl8buqZUppxnfe6RIm/DK6LPrKih6SdkifdpkmCgmbKgAjQfLUEy/lja f93j+7yZZrlNUiX5GXvHLpMuVPa7is/2XnSVfjGI+ePitKjiIquYe5dajOmN7lhhIvd+Vm92 4sPZqOilkQEOMWjM3a/zGLmBQ1TRZTNLcut8JI/my/qClcOJVzN/NeNm+58INI8wPwO/goKl 1nkMnJlJJPErSWvAW23hrpLMdsDhL5z8iA2OzICJ1Gt1yRxaIqj9v5HJZA2YaMm5KpoyvstF 6sJfMCJA/JuTDXb+mtCMcmh/dI6LBn71xiTOyeFYSQke8IyTQL+5dK5LBDk8zMDD3TruJJm8 aGgzA7SXbEKWx9mUJTNcPuqwl7o5Sodlet+UlHmON5WfEmwooFmJzao1q08It0WKAWFzTyfj l7EDRAdrOjLgok07NiW2vzU89b3S7NzRxMIEXPa4LC6MTjh0lCimYIQAvyVeT39VX/v/Pnwb +ti0PyhYuYMm0xHstQgHu8zn74+/dbmu5RT0h9gQCfQd12uB75tfiuG0M1IuvEfz7NVo1LrC EeG+90cMrSVIsL1VlUWIVN9POiE0PgVnBjU7Og0fxqmtHMmouLfXBUAJQSIhQxcMKBxYdEsz uoWscIL7xCy10gxOdGcgyEIr2mBIxTsiUn8Wk321GMztjcW9w== IronPort-HdrOrdr: A9a23:R4ZhS66j+dofRWlu2gPXwPDXdLJyesId70hD6qhwISY6TiX+rb HJoB17726NtN9/YhEdcLy7VJVoBEmskKKdgrNhWotKPjOW21dARbsKheCJrgEIWReOktK1vZ 0QCpSWY+eQMbEVt6nHCXGDYrQd/OU= X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="58884268" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu Subject: [XEN PATCH 03/57] tools/Rules.mk: Remove $(CFLAGS.opic) from %.opic: %.S Date: Mon, 6 Dec 2021 17:01:46 +0000 Message-ID: <20211206170241.13165-4-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 $(CFLAGS.opic) isn't set anywere, never was, just remove it. Signed-off-by: Anthony PERARD --- tools/Rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index b022da3336..4e9b4ee17f 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -155,7 +155,7 @@ INSTALL_PYTHON_PROG = \ %.o: %.S $(CC) $(CFLAGS) $(CFLAGS_$*.o) -c $< -o $@ $(APPEND_CFLAGS) %.opic: %.S - $(CC) $(CPPFLAGS) -DPIC $(CFLAGS) $(CFLAGS.opic) -fPIC -c -o $@ $< $(APPEND_CFLAGS) + $(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $< $(APPEND_CFLAGS) subdirs-all subdirs-clean subdirs-install subdirs-distclean subdirs-uninstall: .phony @set -e; for subdir in $(SUBDIRS) $(SUBDIRS-y); do \ From patchwork Mon Dec 6 17:01:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12658923 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9CD1AC4332F for ; Mon, 6 Dec 2021 17:03:17 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239419.414983 (Exim 4.92) (envelope-from ) id 1muHON-0006pY-KN; Mon, 06 Dec 2021 17:03:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239419.414983; Mon, 06 Dec 2021 17:03:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHON-0006pL-GO; Mon, 06 Dec 2021 17:03:07 +0000 Received: by outflank-mailman (input) for mailman id 239419; Mon, 06 Dec 2021 17:03:05 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOL-0005ta-NN for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:05 +0000 Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5f9b3036-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:03:04 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5f9b3036-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810184; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dGQdT72+D933SmY+1liMgkLhAn+NNQrE1q7y6JIxSec=; b=PjiKhHIG75Agld5T/rU17D0dM7fEinshu7IVykFyXykb4eb2hU2E0DWT 4PQBfYMKwtGchp/4eDi7zjT9YprI6n0eK3Kg889Kpaauvwf3+zN9TUMlA it4xMW/Q4X8iFLtUa8M4rnwZp+otmBeQFxUnVYypwx78n5yD1t5HS5TQH I=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: ETkRjVaNhYjj/HzEsJIubXXXXxCCCHgqibvlJb3/+Tfl7F1NIIb1HiSwEKIs2YJIekabFHjh/5 Giu8A7s/4ZfeU2/SxuJD2LYmVjMkiZ0RDc/dX/Y32xUDuDf5+OUiYsq0iMHOGSLwTs1U29vyBr xmwxd17wqxsd4TVvUzZ5uCSc58X2S/XZ04QnOCB9AEt0YBQzNej3RgEX0T3If2UrsybNyAlXlh HFhHniAzu95a9i6BzLzb+S5mSnsVnaAFb1DsBClAb/w66itz+hz/OTj8Kkhlcrit9OFaMHwRLD ViZJXnlHrz3x9/Tz3xrKuHlM X-SBRS: 5.1 X-MesageID: 59387736 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:q1bA+ailmAzhCbocan0uFl5rX161yhcKZh0ujC45NGQN5FlHY01je htvDD2Gaa7bZGP0Lt5yat+z9BlU6MKHytI2HQNt+S4zFC0b9cadCdqndUqhZCn6wu8v7a5EA 2fyTvGacajYm1eF/k/F3oAMKRCQ7InQLlbGILes1htZGEk0F0/NtTo5w7Rg29Qw34Dja++wk YiaT/P3aQfNNwFcagr424rbwP+4lK2v0N+wlgVWicFj5DcypVFMZH4sDfjZw0/DaptVBoaHq 9Prl9lVyI97EyAFUbtJmp6jGqEDryW70QKm0hK6UID66vROS7BbPg/W+5PwZG8O4whlkeydx /1Xs6eOTA14EpHilaceYQtIKhlMZLF/reqvzXiX6aR/zmXDenrohf5vEFs3LcsT/eMf7WNmr KJCbmpXN1ba2rzwkOnTpupE36zPKOHiOp8fvXdxiynUF/88TbjIQrnQ5M8e1zA17ixLNauPP JpGNmExBPjGSzBwM3QOKc0uprapmSLxeB9gjWmH4rVitgA/yyQuieOwYbI5YOeiXt5Jl0yVo mbH+WXRARwAMtGbjz2f/RqEhPLLnC79cJIfEvu/7PECqF+c3GsIEzUNSEC25/K+jyaWRNZ3O 0ESvC00osAa/Uq3Tt77TlugrWSNpBI0VN9ZEul84waIooLE7gDcCmUaQzppbN09qNRwVTEsz kWOnd7iGXpoqrL9YXCX+6qQrDiyETMINmJEbigBJSME/NvLsIw1lgjITNtoDOiylNKdJN3r6 2nU9m5k3exV1JNVkfXglbzav96yjoLPdTAw7FT7YkyorQBLdp6cX77x9WGOuJ6sM72lZlWGu XEFne2X4+YPEYyBmUSxfQkdIF26z63baWOB2DaDC7Fkrm3woCD7Iei89RknfB8xWvvobwMFd 6M6Vel5wJZIdEWnYqZsC25aI5R7lPOwfTgJux29UzavXnSTXFLelM2NTRTJt4wIrKTKuftlU Xt8WZzzZUv28Yw9kFKLqx41iNfHPBwWy2LJXozcxB+6y7eYb3P9Ye5bawvRNLFktvna/1W9H zNj2y2ikU83vArWOHa/zGLuBQpScShT6W7e9aS7idJv0iI5QTp8Wpc9MJsqepB/nrQ9qws71 irVZ6Os83Km3SevAVzTMhhLMeqzNb4i/SNTFXF9Zj6Ahil8CbtDGY9CLvPbi5F8r7c9pRO1J tFYE/i97gNnFm6apm9DNMal9+SPtn2D3GqzAsZsWxBnF7YIeuAD0oWMktLH+HZcAyypm9E5p rH8hArXTYBaH1ZpDdrMaeLpxFS05CBPlOV3VkrOA99SZESzr9Q6d32v1qc6c5MWNBHO5jqGz ALKUx0WkvbA/t0u+97TiKHa84rwS7liHlBXFnXw5KqtMXWI5XKqxIJNCb7afT3UWG7u1r+lY OFZk6P1PPEdxQ4YuItgCbd7i6k54oK39bNdyw1lGlTNbkiqVew8ciXXg5EXu/QUlLFDuAawV kaewfVgOO2EaJH/DVocBAs5deDfh/sarSbfsKYuK0Lg6S4poLfeCRdOPwOBgTB2JaduNN932 v8ovcMb5lDtihcuNdra3ClY+37Vcy4FWqQj8JobHJXqmkwgzVQbOc7QDSr/4ZeubdRQMxZ1f m/I1fSa37kMlFDfd3cTFGTW2bsPjJsDjxlG0VseKgnbgdHCnPI2gEVc/Dlfot65FfmbPzaf4 lRWCnA= IronPort-HdrOrdr: A9a23:nUlQmajm/a4XMtgmAW1mQX/+bHBQXtwji2hC6mlwRA09TySZ// rAoB19726StN9xYgBYpTnuAsi9qB/nmKKdpLNhX4tKPzOW3FdATrsD0WKK+VSJcEfDH6xmpM JdmsBFebvN5DNB4/oSjjPVLz9Z+qjlzJyV X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59387736" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Julien Grall , "Stefano Stabellini" , Wei Liu , Juergen Gross Subject: [XEN PATCH 04/57] libs: Remove _paths.h from libs ctrl and util. Date: Mon, 6 Dec 2021 17:01:47 +0000 Message-ID: <20211206170241.13165-5-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 libxenutil doesn't include _paths.h so no need to generate it. libxenctrl doesn't use macros from _paths.h so can be removed. Fix libxenguest to include _paths.h properly instead of relying on xc_private.h Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- .gitignore | 2 -- tools/libs/ctrl/Makefile | 5 ----- tools/libs/ctrl/xc_private.h | 2 -- tools/libs/guest/Makefile | 2 +- tools/libs/guest/xg_suspend.c | 1 + tools/libs/util/Makefile | 6 +----- 6 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index cad5aacd8d..111eb03b86 100644 --- a/.gitignore +++ b/.gitignore @@ -117,7 +117,6 @@ tools/libs/hypfs/headers.chk tools/libs/hypfs/xenhypfs.pc tools/libs/call/headers.chk tools/libs/call/xencall.pc -tools/libs/ctrl/_*.[ch] tools/libs/ctrl/libxenctrl.map tools/libs/ctrl/xencontrol.pc tools/libs/foreignmemory/headers.chk @@ -157,7 +156,6 @@ tools/libs/store/utils.h tools/libs/store/xenstore.pc tools/libs/store/xs_lib.c tools/libs/util/*.pc -tools/libs/util/_paths.h tools/libs/util/libxlu_cfg_y.output tools/libs/util/libxenutil.map tools/libs/vchan/headers.chk diff --git a/tools/libs/ctrl/Makefile b/tools/libs/ctrl/Makefile index 519246b0d6..5d866b8d04 100644 --- a/tools/libs/ctrl/Makefile +++ b/tools/libs/ctrl/Makefile @@ -54,11 +54,6 @@ NO_HEADERS_CHK := y include $(XEN_ROOT)/tools/libs/libs.mk -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - -$(LIB_OBJS) $(PIC_OBJS): _paths.h - -include $(DEPS_INCLUDE) clean: cleanlocal diff --git a/tools/libs/ctrl/xc_private.h b/tools/libs/ctrl/xc_private.h index 2e483590e6..824d3cfc21 100644 --- a/tools/libs/ctrl/xc_private.h +++ b/tools/libs/ctrl/xc_private.h @@ -29,8 +29,6 @@ #include #include -#include "_paths.h" - #define XC_WANT_COMPAT_MAP_FOREIGN_API #define XC_INTERNAL_COMPAT_MAP_FOREIGN_API #include "xenctrl.h" diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile index 2ce92d247e..b49e5059f2 100644 --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -111,7 +111,7 @@ libxenguest.so.$(MAJOR).$(MINOR): APPEND_LDFLAGS += $(COMPRESSION_LIBS) -lz genpath-target = $(call buildmakevars2header,_paths.h) $(eval $(genpath-target)) -xc_private.h: _paths.h +$(LIB_OBJS) $(PIC_OBJS): _paths.h -include $(DEPS_INCLUDE) diff --git a/tools/libs/guest/xg_suspend.c b/tools/libs/guest/xg_suspend.c index 0ce6364963..128353029c 100644 --- a/tools/libs/guest/xg_suspend.c +++ b/tools/libs/guest/xg_suspend.c @@ -19,6 +19,7 @@ #include #include "xc_private.h" +#include "_paths.h" #include "xenguest.h" #define SUSPEND_LOCK_FILE XEN_RUN_DIR "/suspend-evtchn-%d.lock" diff --git a/tools/libs/util/Makefile b/tools/libs/util/Makefile index f5f9e89fee..87425d862a 100644 --- a/tools/libs/util/Makefile +++ b/tools/libs/util/Makefile @@ -39,7 +39,7 @@ NO_HEADERS_CHK := y include $(XEN_ROOT)/tools/libs/libs.mk -$(LIB_OBJS) $(PIC_OBJS): $(AUTOINCS) _paths.h +$(LIB_OBJS) $(PIC_OBJS): $(AUTOINCS) %.c %.h:: %.y @rm -f $*.[ch] @@ -49,14 +49,10 @@ $(LIB_OBJS) $(PIC_OBJS): $(AUTOINCS) _paths.h @rm -f $*.[ch] $(FLEX) --header-file=$*.h --outfile=$*.c $< -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - -include $(DEPS_INCLUDE) clean: cleanlocal .PHONY: cleanlocal cleanlocal: - $(RM) -f _*.h $(RM) -f libxlutil.map From patchwork Mon Dec 6 17:01:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12658921 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 21BD7C433F5 for ; Mon, 6 Dec 2021 17:03:17 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239421.414999 (Exim 4.92) (envelope-from ) id 1muHOP-0007BR-C8; Mon, 06 Dec 2021 17:03:09 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239421.414999; Mon, 06 Dec 2021 17:03:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOP-00079u-5M; Mon, 06 Dec 2021 17:03:09 +0000 Received: by outflank-mailman (input) for mailman id 239421; Mon, 06 Dec 2021 17:03:08 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOO-0005ta-9c for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:08 +0000 Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 61157ab3-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:03:07 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 61157ab3-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810187; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DaXrysSp90BOa7sFLTeOykjPBw9Q7LCEVZdF9MEMsoE=; b=DzcK9qCnzNPwzJM9IMZIbmWbKDB/8CF4X8em30ULNMPw7nqyzq0ub1cl JhokXC6VwnbSDAcAYzds6aMNJvGbxo0UT5XLszNd+y7ehYS95YW8Ra3BF e1pWBACmlQbvoVJRJeKNoCku3dp4WYoFMp/7Cp+mqfTA6naEYIGaEsG+Y U=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: 3g1gjSOqn/8TRY7RoV705Ql66WfCzKRg3U1yPMjNX42Imr3IJpqCpwx6XsHQOsZi8WCOBbnQJz Gi3tRlJI/dbYEWP9RTLpOe4YAyam0r0AO3WSCtxiPneJ6eZx3nC0YYzcee/IwQ7ZeJHq/ZWWwz kHLDvHlMqtWERlReTWCqS/6/Igoywp7hGZ3x7eaUPxA1WxapJUGJSwF6kLABxlBKsWfF8wMD7u 21NtmMebKRNqxqnM3leHMi+r+3HSpqk1hkpGxqbM4+Gl0yAf2FT3p7G6lNDCvlLKEaDLgk57lD /lnDE4ZRXFM4tASLRHArTFKl X-SBRS: 5.1 X-MesageID: 59370474 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:eMYLxqIiAzREeCT3FE+RIZIlxSXFcZb7ZxGr2PjKsXjdYENS12EHx mEXXD2DP6qCMTDzKNtzYYy3oEtSu56Dn9VkHgRlqX01Q3x08seUXt7xwmUcns+xwm8vaGo9s q3yv/GZdJhcokcxIn5BC5C5xZVG/fjgqoHUVaiUZUideSc+EH140Eg7xbZj6mJVqYPR7z2l6 IuaT/L3YDdJ6xYsWo7Dw/vewP/HlK2aVAIw5jTSV9gS1LPtvyB94KYkDbOwNxPFrrx8RYZWc QphIIaRpQs19z91Yj+sfy2SnkciGtY+NiDW4pZatjTLbrGvaUXe345iXMfwZ3u7hB3Sz8Bvx ot3m6WcWCVxP6f3mO8ddwJXRnQW0a1uoNcrIFC6uM2XiUbHb2Ht07NlC0Re0Y8wo7gtRzsUr LpBdW5LPkvra+GemdpXTsFlgNgjK8/6epsSoHh6wRnSDOo8QICFSKLPjTNd9Gph3Z8WQamCD yYfQSZ2aQj4YUEXBmkKNZduoN73l3P2VwQN/Tp5ooJoujOOnWSdyoPFL979atGMA8JPkS6wp G3c+H/iKgoHL9HZwj2Amlqtme3njS79QJgVFrCz6rhtmlL77nweDlgaWEW2pdG9i1WiQJRPJ koM4C0soKMuskuxQbHVVhukoHmCr1gEVsBZCeES5wSEy66S6AGcblXoVRYYNoZg7pVvA2V3i BnZxLsFGACDrpXOGWKD+OmugwqeKApNLGU5ZSQEaRAKtoyLTJ4IsjrDSdNqEaiQh9LzGC3tz z3ikBXSl4n/nuZQifzloAmvbyaE48GQE1Vrvlm/sneNt1shPOaYi5qUBU83BBqqBKKQVRG/s XcNgKByB8heXMjWxERhrAjgdYxFBspp0hWB2DaD/LF7rlxBHkJPm6gKulmSw28zba45lcfBO hO7hO+ozMY70IGWRaF2eZmtLM8h0LLtE9/oPtiNMIEePcIgKVXdon4+DaJ144wLuBJ2+U3YE c3EGftA8F5AUfg3pNZIb7l1PUAXKtAWmjqIGMGTI+WP2ruCfn+FIYrpw3PVBt3VGJis+V2Pm /4GbpPi40wGDIXWP3mGmaZOfAtiBSVqWvjLRzl/K7frzvxOQzp6VZc8ANoJJuRYokiivruSo yzmBBYHkAGXaL+uAVziV02PoYjHBf5XxU/X9wR2Zz5EAlAvPtSi6rkxbZwyceV1/eBv16csH fIEZ9+BErJETTGeo2YRapz0rYpDchW3hF3RY3r5MWZnJ5MwFRbU/tLEfxf08HVcBCSAqsZj8 aar0RnWQMRfSl06XtrWcv+m03i4oWMZxLBpR0LNL9QKIBfs/YFmJjbflPgyJ81QexzPyiHDj 1SdAAsCpPmLqIgwqYGbiaeBpoavMu1/AksFQDWLsefobXHXpzPxz5VBXeCEeSHmeFn1oKjyN /9Iy/zcMeEcmAoYuYRLDLs2n7k14MHipuEGw108TmnLdVmiFphpPmKCgZtUrqRIy7JU5Vm2V 0aI9oUIMLmFIpq4QlsYJQ5jZeWfz/AE3DLV6K1tckn94SZ2+puBUFlTYEbQ2HAMcuMtPdN32 /olte4X9xe720gjPduxhyxJ83iBcy4bWKI9u5BGWILmh2LHEL2ZjUAw3sMu3KyyVg== IronPort-HdrOrdr: A9a23:pprZf61ZUOn8izpAeBbdQwqjBLQkLtp133Aq2lEZdPRUGvb2qy nIpoV96faUskdpZJhOo7G90cW7LE80sKQFg7X5Xo3SODUO2lHJEGgK1+KLqFfd8m/Fh4tgPM 9bAs5D4bbLY2SS4/yX3ODBKadC/OW6 X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59370474" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Juergen Gross Subject: [XEN PATCH 05/57] libs: Remove -Iinclude from CFLAGS Date: Mon, 6 Dec 2021 17:01:48 +0000 Message-ID: <20211206170241.13165-6-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 They are no more directory libs/*/include. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/libs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index ebdb2a4782..830bdc851f 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -12,7 +12,7 @@ MINOR ?= 0 SHLIB_LDFLAGS += -Wl,--version-script=libxen$(LIBNAME).map CFLAGS += -Werror -Wmissing-prototypes -CFLAGS += -I./include $(CFLAGS_xeninclude) +CFLAGS += $(CFLAGS_xeninclude) CFLAGS += $(foreach lib, $(USELIBS_$(LIBNAME)), $(CFLAGS_libxen$(lib))) LDUSELIBS = $(foreach lib, $(USELIBS_$(LIBNAME)), $(LDLIBS_libxen$(lib))) From patchwork Mon Dec 6 17:01:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12658919 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 291C8C433EF for ; Mon, 6 Dec 2021 17:03:16 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239420.414995 (Exim 4.92) (envelope-from ) id 1muHOP-00076c-03; Mon, 06 Dec 2021 17:03:09 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239420.414995; Mon, 06 Dec 2021 17:03:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOO-00076P-Qt; Mon, 06 Dec 2021 17:03:08 +0000 Received: by outflank-mailman (input) for mailman id 239420; Mon, 06 Dec 2021 17:03:07 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHON-0005ta-Ar for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:07 +0000 Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6161c2ab-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:03:06 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6161c2ab-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810186; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PF7/5zEo4jDOxqZUxq2UUbdYIZsE8xugvykCl7MlfeA=; b=IOvCR0hAmGfvnMho4dsTZb0iP6Zfq4eCDMvqBVowvp0BCv3WdjbMS0QE FplmuyhlYCsxFx4fkP9AZrzBKXkNvz+5xD0TbuQjrlS8+QB1Qi7Spc7Go 1lYbLYpPvP8e77oPBlKRggQh5/jBtk0r3FYiSm2d/EtCO4iFkaGrqXxOk k=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: n6U9gc6/9UNcQbsKdjvz9fL3AJSy6ydRf6ZAl+5Rionxf8kDM84dd0gdl/bqsKxGBmz5lZL7LP LxRUjdwc9qZt4mnJLeFuBZHtYp6OlmNP8W/U8fRmMX44xJxjKMcWOm/v/mro5tDMapNXMqPVAw gGrDvQmlVFHhQ8SwTnCH6OsA2YVSwXiGaqr2ZDStqxA3pYNFwHMEg4WHvPDDKkcdpRmiXZ2tfP t3Ee/nfjCvt1+YtrqzCGDUgqm0mVXyE/WyM9FofspfeT/m3Lo1SU4+j/Xs2EMDsbSjFbOFraJR v/urDFspNKj4356RFAadETh3 X-SBRS: 5.1 X-MesageID: 59387743 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:YwohFKB+5vpF7BVW/9jkw5YqxClBgxIJ4kV8jS/XYbTApGgn3jRWz 2IYCm6OOq2PajGmL48lPorl9htS75bVnYBhQQY4rX1jcSlH+JHPbTi7wuYcHM8wwunrFh8PA xA2M4GYRCwMo/u1Si6FatANl1ElvU2zbue6WLGs1hxZH1c+EX570Uw7wYbVv6Yz6TSHK1LV0 T/Ni5W31G+Ng1aY5UpNtspvADs21BjDkGtwUm4WPJinj3eH/5UhN7oNJLnZEpfNatI88thW5 Qr05OrREmvxp3/BAz4++1rxWhVirrX6ZWBihpfKMkQLb9crSiEai84G2PQghUh/qgyJgPN71 M92moGIFR4ZIYLuscYFekwNe81+FfUuFL7vJHG+tYqYzlHccmuqyPJrZK00FdRGoKAtWzgIr KFGbmBWBvyAr7veLLaTQ+9whsMlPY/zMZkWoH1IxjDFF/c2B5vERs0m4PcFjWxg2Z8SRp4yY eIwODw1chLFOCR2O3o4A6gwksL3pyfwJmgwRFW9+vNsvjm7IBZK+KfpGMrYfJqNX8o9tkSXv GXd5EziHwoXcteYzFKt822urv/CmzvhX4AfH6H+8eRl6HWDy2pWBBAIWF+TpfiillX4S99ZM 1YT+Cclse417kPDZtD7Qx2/pm/CphMGUsBcO+I/4QCJjKHT5m6k6nMsF2AbLoZ87YlvGGJsh gThc87V6SJHkYSVVlGX6q2vgi6KZTElMkAgTA0cZF5QizX8m70bghXKR9dlNae6iNzpBD39q wy3QDgCa6Y71pBSifjilbzTq3f1/8WSEFZpjunCdjv9tlsRWWKzW2C/BbE3B95kJZ3RcFSOt WNsdyO2vLFXVsHleMBgrYww8FCVCxStbWS0bb1HRcBJG9GRF5iLJ9o4DNZWfhgBDyr8UWW1C HI/QCsIjHOpAFOkbLVsf6W6ANkwwK7rGLzND66PPoUUM8UrLlHYrEmCgHJ8OUi3yiDAdollZ v+mnTuEVy5GWcyLMhLoLwvi7VPb7n9nnj6CLXwK5x+mzaCfdBaopUQtazOzghQCxPrc+m39q o8HX+PTkkk3eLCuM0H/rN9IRXhXfCdTOHwDg5EOHgJ1ClE9Qz9J5j646e5JRrGJaIwJzLqVp S/kBRcDoLc97FWeQTi3hrlYQOuHdf5CQbgTZETA5H6khCouZ5iB9qAae8dldLUr7rU7n/V1U +MEa4OLBfEWEmbL/DEUbJ/cqo1+dUv02VLSbnT9ODVvLYR9QwHp+8P/ele9/ic5ESfq59A1p Ket112HTMNbFRhiFsvfdNmm00i14SoGgOt3UkaReotTdUzg/ZJEMSv0ivNrccgAJQ+anmmR1 hqMAAderu7I+tdn/N7MjKGCjoGoD+ohQRYKQziFte67bHCI8HCizIlMVPezUQrcDG6kqr+/Y eh1zu3nNKFVllh9rIchQa1gyrgz5oWzquYCnBhkBnjCc3+iFqhkfiudxcBKu6BAmu1ZtA+xV h7d89VWI+zUasbsEVpXLws5dOWTk/oTn2CKv/gyJUz74g5x/aaGDhoOb0Xd1nQFIesnKp4hz McgpNUSul62hRcdO9qbijxZqjaXJXsaXqR77pwXDecHUObwJo2utXAENhLL3Q== IronPort-HdrOrdr: A9a23:/gqaCqphLyvcB3/DgszHo/IaV5oteYIsimQD101hICG8cqSj+P xG+85rsiMc6QxhIU3I9urgBEDtex7hHNtOkOss1NSZLW3bUQmTTL2KhLGKq1aLJ8S9zJ856U 4JSdkZNDSaNzZHZKjBjDVQa+xQo+W6zA== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59387743" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Juergen Gross Subject: [XEN PATCH 06/57] libs/libs.mk: Remove generic variable that already exist Date: Mon, 6 Dec 2021 17:01:49 +0000 Message-ID: <20211206170241.13165-7-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 comma, empty, space are already defined in "Config.mk". Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/libs.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index 830bdc851f..dfbbef4080 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -26,9 +26,6 @@ ifneq ($(nosharedlibs),y) LIB += lib$(LIB_FILE_NAME).so endif -comma:= , -empty:= -space:= $(empty) $(empty) PKG_CONFIG ?= $(LIB_FILE_NAME).pc PKG_CONFIG_NAME ?= Xen$(LIBNAME) PKG_CONFIG_DESC ?= The $(PKG_CONFIG_NAME) library for Xen hypervisor From patchwork Mon Dec 6 17:01:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12658925 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5CBE9C433EF for ; Mon, 6 Dec 2021 17:03:20 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239422.415017 (Exim 4.92) (envelope-from ) id 1muHOR-0007lO-Ss; Mon, 06 Dec 2021 17:03:11 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239422.415017; Mon, 06 Dec 2021 17:03:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOR-0007kg-L9; Mon, 06 Dec 2021 17:03:11 +0000 Received: by outflank-mailman (input) for mailman id 239422; Mon, 06 Dec 2021 17:03:10 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOP-0005ti-TL for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:10 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 62568e49-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:03:09 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 62568e49-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810188; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AqCx8xVKCHbiltbPVLDXC8pN1HeD+g0vLeuICQJzUro=; b=OUA2kz0NewsT4bjgZ1J81sQqvPk55TZFbuzd98Z8qKdIwLOcIsOp3JUx q1pt4tZzRGLsLPyY/HyBXk6rAt7ypxuNqJUNoAEdu9rgjVIb/q5bdzGE8 k5TMF55EdtQ8zf1KKf744UY+BqtiVEpjDmMQyW6vwt5hTqR5aUZi68zvc Y=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: HJjA2Up8hf8DgKMSCXZebzVgqV349LhdLVMYes+U2mPE3xpuNPK5L2hdCmi2ubW0cUGP1CDSHS UUEf2xTYYpynmnEUecbQcNzjKcUDL4EVNK2HidrbXD2TDrskuTuvmddd64RafEx4tyG21XY8yA ZpJNVGdAxm21uXsTrEr3ySyBHMsfr5lR8KYevbpPy8qOqTkhxjnG1SUQdRd1TDvJSfDgmcBUGc j4pqzcc3lRtj8nzMpUHIArGGVDCfXOXM41Ce1FRGbKWsaQ6yzG/0PXQb9bhJnA5ibiCKaiNNTM dndxTkEf+FW/8o/fVBmscTB+ X-SBRS: 5.1 X-MesageID: 58884283 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:Pg+hravF2vr3pgb5U9tkiR2suOfnVKdZMUV32f8akzHdYApBsoF/q tZmKTrXPvbZYDH3f90jYdu38xxQ6JPczNQxQQRpriswQX9E+JbJXdiXEBz9bniYRiHhoOOLz Cm8hv3odp1coqr0/0/1WlTZQP0VOZigHtIQMsadUsxKbVIiGHhJZS5LwbZj29cy2YbhWWthh PupyyHhEA79s9JLGjp8B5Kr8HuDa9yr5Vv0FnRnDRx6lAe2e0s9VfrzFonoR5fMeaFGH/bSe gr25OrRElU1XfsaIojNfr7TKiXmS1NJVOSEoiI+t6OK2nCuqsGuu0qS2TV1hUp/0l20c95NJ NplqJDgYjkbO6/1nadGAz5VEQpuYY5F0eqSSZS/mZT7I0zudnLtx7NlDV0sPJ1e8eFyaY1M3 aVGcnZXNEnF3r/ohuLgIgVvrp1LwM3DNYUDunZm3HfBAOwvW5zrSKTW/95Imjw3g6iiGN6DN 5pJNWA/N3wsZTVsIFoaDatgo92Pg0bYLSdWrVm1poM4tj27IAtZj+G2bYu9lsaxbdpRtlaVo CTB5WuRKhMVLtuE0hKe72mhwOTImEvTWZ0QPK218OZwh1+ezXBVDwcZPXOrrP/8hkOgVtZ3L 00P5jFovaU07FasTNT2Q1u/unHslhcaR9pXFfx88AyXw7DYywmcD2kACDVGbbQbWNQeHGJwk AXTxpWwWGIp4Ob9pW+hGqm8sD/iEhYnKG07YGxfHSwI4fLz/KIwp0eaJjp8K5KdgtrwEDD25 jmFqikimrke5fI2O7WHEUPv2Gz1+MWQJuIhzkCOBz/+sFslDGKwT9XwsQCz0BpWEGqOorBtV lAgktPW0u0BBIrleMelELRUR+HBCxpo3VThbb9T83sJqm3FF52LJ9k4DNRCyKFBaJxsldjBO hC7hO+pzMUPVEZGlIcuC25LN+wkzLL7CfPuXe3OY9xFb/BZLVHcrH40NBPKhT6ywCDAdJ3T3 7/BK65A6l5AVsxaIMeeHb9BgdfHOAhgrY8seXwL50v+iufPDJJkYbwELEGPfogEAFCs+23oH yJkH5LSkX13CbSmCgGOqNJ7BQ1afBATWMGtw+QKJ7HrH+aTMDx4YxMn6eh6ININcmU8vrqgw 0xRrWcEkgei3iOedl3RAp2hAZu2NatCQbsAFXREFT6VN7ILOO5DNY8TKMk6e6cJ7utmwaImR vUJYZzYUP9OVi7G63IWapyk9N5ucxGihASvOSu5YWdgI848FlKRotK0LBHy8CQuDzassZdsq bOXyQ6GE4EIQB5vDZiKZav3nU+xp3UUhMl7Q1DMfotIYEzp/YUzc37xg/Y7LtsiMxLGwjfGh Q+aDQ1B/bvGopMv8cmPjqeB9t/7H+x7F0tcPm/a8bfpanWKojv9mddNCb/acyrcWWX4/LSZS d9Ul/ysYucamFtqspZnF+o5x6wJ+Nay9aRRyR5pHSuXYg3zWK9gOHSPweJGqrZJmu1CoQKzV 0+CpotaNLGONJ+3GVIdPlN4POGK1PVSkTjO9/UlZk794XYvrraAVExTOTiKiTBcc+QpYN90n 795tZ5E8RG7hzorLs2C33Jd+Gm7J3AdV7kq68MBC4jxhwt3klxPbPQw0MMtDE1jvzmUDnQXH w== IronPort-HdrOrdr: A9a23:YHOioql0awuY245S25XUtKoqfQbpDfIm3DAbv31ZSRFFG/Fxl6 iV88jzsiWE7Qr5OUtQ/uxoV5PgfZqxz/NICOoqTNWftWvd2FdARbsKheCJ/9SJIVybygc378 ldmsZFZOEYdWIK7vrH3A== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="58884283" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Juergen Gross Subject: [XEN PATCH 07/57] libs/guest: Drop spurious include in Makefile Date: Mon, 6 Dec 2021 17:01:50 +0000 Message-ID: <20211206170241.13165-8-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 This include hasn't been useful since e567964a54 (tools: drop ia64 support). Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/guest/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile index b49e5059f2..c6d882e239 100644 --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -71,8 +71,6 @@ SRCS-y += xg_dom_decompress_unsafe_xz.c SRCS-y += xg_dom_decompress_unsafe_zstd.c endif --include $(XEN_TARGET_ARCH)/Makefile - CFLAGS += -Werror -Wmissing-prototypes CFLAGS += -I. -I./include $(CFLAGS_xeninclude) CFLAGS += -D__XEN_TOOLS__ From patchwork Mon Dec 6 17:01:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12658989 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7A56BC433EF for ; Mon, 6 Dec 2021 17:07:18 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239450.415121 (Exim 4.92) (envelope-from ) id 1muHSI-0005sf-Cs; Mon, 06 Dec 2021 17:07:10 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239450.415121; Mon, 06 Dec 2021 17:07:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHSI-0005rg-5t; Mon, 06 Dec 2021 17:07:10 +0000 Received: by outflank-mailman (input) for mailman id 239450; Mon, 06 Dec 2021 17:07:09 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOh-0005ta-MC for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:27 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6d4fd33b-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:03:26 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6d4fd33b-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810206; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6zpFISsadUpEdibZxGtzCtaH4deu+VADURLBhws2jBc=; b=SeHQwDa0XVc4UsQOU/i5z1+hx6LezT6sbrmFJESuc6gQk4IAyNAN53bo LFV6ywxXOo7NCAoGYDTSkw13SHDe+Z3wsQw9ge0NHJATs3HdYE+1tvgH+ RAiJrVfHeMdMfqAyx2CFv49KoFQDUlHmE6yBnVg4LCkfTFu/lZgl5Ctu7 I=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: PcBNEWStTXnPQRTOStgLiSO+Hkw4w2ZGUiqgPSko1EwZGkhTwxQe6XtTMNgvx0tP/m7s8MwshY OiV9P7E8pjM3FCO/7WdzjhbSFuvkaIiFeeFe6JGZ16oiQjg/0LBxxKwV0/7q/LV+CTwkYe8XLb +I9W9kbIwWKQ31JY540+AFef3ZLiYhiBzHlgMuXlqXM5EcHnF9b7XxtXiGUcs0mx8r/HLyvTh8 wnILDiLU1+2LDufcFD04FBMNVcPdO1XnDdgvpolmerxkyW4sCGlVWhR7GeW0gXf4VAhAhBoE3I nhIWzsygH60kyi8WIwaWM4QL X-SBRS: 5.1 X-MesageID: 59766356 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:gSNHa6kv82GQ8P1r6eCQ3Svo5gxxIURdPkR7XQ2eYbSJt1+Wr1Gzt xIcWmCEOPeKZ2WmfowlboXi/EoOvJXTx9JgTQJqqStmFiMWpZLJC+rCIxarNUt+DCFioGGLT Sk6QoOdRCzhZiaE/n9BClVlxJVF/fngqoDUUYYoAQgsA187IMsdoUg7wbdg2NY22YLR7z6l4 rseneWOYDdJ5BYsWo4kw/rrRMRH5amaVJsw5zTSVNgT1LPsvyB94KE3fMldG0DQUIhMdtNWc s6YpF2PEsE1yD92Yj+tuu6TnkTn2dc+NyDW4pZdc/DKbhSvOkXee0v0XRYRQR4/ttmHozx+4 IsWupagcBUIAor3srQ6Ux9UQhtcGpQTrdcrIVDn2SCS50jPcn+qyPRyFkAme4Yf/46bA0kXq 6ZecmpUKEne2aTmm9pXScE17ignBMDtIIMYvGAm1TzDBOwqaZvCX7/L9ZlT2zJYasVmQKeBO ZRCNGQHgBLoODdRZwwmDcIEgeK6oFClSxJV63e7uv9ii4TU5FMoi+W8WDbPQfSVQe1Fk0Deo XjJl0z7DQsdL8e30iee/zSngeqntSLkWqoCGbug7PlojVaPgGsJB3U+RVa95PW0lEO6c9ZeM FAPvDojq7Ao806mRcW7WAe3yFaNuAIcXNxBVfU38giXxoLb5g+YAi4PSTspVTA9nJZoH3pwj AbPxo63Q2w02FGIdZ6D3unPojmiADo0EUg5T38jTQ0JsuPBh7hm23ojUe1fOKKyi9T0HxT5z DaLsDUyit0vsCIb60mo1QuZ2mzx//AlWiZwv1yKBTz9smuVcab8P9TwgWU3+8qsO2pworOpm HEf0/aT4+kVZX1mvHzcGb5ddF1FChvsDdE9vbKNN8R4n9hO0yT6FWy13N2YDB0zWirjUWW2C HI/QSsLuPdu0IKCNMebmb6ZBcUw1rTHHt/4TP3SZdcmSsEvL1/YpnAzPxTOgDCFfK0QfUcXY 83znSGEVylyNEia5GDuG7d1PUEDmEjSOl8/tbiklk/6gNJylVaeSKsfMUvmUwzKxPjsnekhy P4Gb5Hi40wGCIXWO3CLmaZOfQFiBSVqXvje9p0IHtNv1yI7QQnN/deKmuh/E2Gk9owI/tr1E oaVBhUFlQGh3CKfcm1nqBlLMdvSYHq2llpjVQREALpi8yNzCWp2xKtAJZYxY5c98+lvkax9Q /UfIp3SCfVTUDXXvT8aaMCl/oBlcR2qgyOIPjakP2djL8IxGVSR94+2ZBbr+QkPEjGz6Zk0r Yq/216JWpEEXQljUprbMar901OrsHEBs+tuRE+UcMJLcUDh/dEyeSz8h/M6Oe8WLhDHymfI3 gqaG05A9+LMv5U04J/CgqXd99WlFO53H0x7GWjH7OnpaXmGrzT7mYIZCbSGZzHQUm/w6Z6OX +QNwqGuKuADkXZLr5F4T+Rhw5Uh6oa9vLRd1AllQinGNgz5FrN6L3Ca9sBTrakRlKRBsA67V 0/TqNlXPbKFZJHsHFILfVd3a+2C0bcfmyXI7ORzK0L/vXcl8L2CWERUHh+NlC0Cc+clbNJ7m b8s6JwM9giyqhs2KdLX3Clb+lOFImEET6h65IoRB5Xmi1Zzx1xPCXAG5vQaPH1bhw1wD3QX IronPort-HdrOrdr: A9a23:9Lw3I62aXwsciwjlYF5alwqjBLQkLtp133Aq2lEZdPRUGvb2qy nIpoV96faUskdpZJhOo7G90cW7LE80sKQFg7X5Xo3SODUO2lHJEGgK1+KLqFfd8m/Fh4tgPM 9bAs5D4bbLY2SS4/yX3ODBKadC/OW6 X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59766356" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Juergen Gross Subject: [XEN PATCH 08/57] libs/light: Remove non-existing CFLAGS_libxl.o var Date: Mon, 6 Dec 2021 17:01:51 +0000 Message-ID: <20211206170241.13165-9-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 This var was originally $(CFLAGS_$*.o), and probably was copied from the generic %.o:%.c rules. Nothing sets CFLAGS_libxl.o, so remove it. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/light/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index 194bc5f268..975413ade8 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -200,7 +200,7 @@ libxl.api-ok: check-libxl-api-rules _libxl.api-for-check touch $@ _libxl.api-for-check: $(XEN_INCLUDE)/libxl.h $(AUTOINCS) - $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_libxl.o) -c -E $< $(APPEND_CFLAGS) \ + $(CC) $(CPPFLAGS) $(CFLAGS) -c -E $< $(APPEND_CFLAGS) \ -DLIBXL_EXTERNAL_CALLERS_ONLY=LIBXL_EXTERNAL_CALLERS_ONLY \ >$@.new mv -f $@.new $@ From patchwork Mon Dec 6 17:01:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12658929 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B891BC4332F for ; Mon, 6 Dec 2021 17:03:25 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239427.415034 (Exim 4.92) (envelope-from ) id 1muHOY-00005S-9n; Mon, 06 Dec 2021 17:03:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239427.415034; Mon, 06 Dec 2021 17:03:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOX-0008WA-SC; Mon, 06 Dec 2021 17:03:17 +0000 Received: by outflank-mailman (input) for mailman id 239427; Mon, 06 Dec 2021 17:03:16 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOW-0005ti-8n for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:16 +0000 Received: from esa6.hc3370-68.iphmx.com (esa6.hc3370-68.iphmx.com [216.71.155.175]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 6588a4fd-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:03:14 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6588a4fd-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810194; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=h0c7AVYNaXZXmkfcs0ZxJdS6Ur35AwxyJVtAoKnfTKc=; b=LWFF16ct4xVIY6fDCj6QcwdMTo9oDR7dP/MH/+RRviEa7qdK2zDqGtKm Bp8soBIxMFRy8FA/53O9ERtDjEzJjk4ErUMIa8vhdCf20XoV1ktluqA1k v3pv+WESYs5Xrft8PZXQE5qkHJZZ8zTTKrutKz2ASLc0L5wmVDqDf3wIt E=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: CUPI3Te5pu8yikiSgt36ZmvPy4SXldVYUlepazbb7qdU9b+0gLED1RSYTYEaCcbZeInv6nsXpl L5/QHf3iFQlcO1g/QSx3wyHCUws3X79RfytV5ZAwKXfs8DWaxBwMkhaa+HT1l9200NsoOJE3ky GXry/CCnS9s++b+6ESnU3cSQ9qV3OiBa9LtvTbbGkVzSc4Lpb5uge5cvVPI2X9BebpHxI2t5P8 D+z5fT5eOEY/pMfTM7m+8qegH8TYMgSFEvZ/n2ZfViNqfMH37DT7RaCsLgpxu5RS/KZSDIDO9L 16ynw3bfaExbj7QBjsxybNmc X-SBRS: 5.1 X-MesageID: 59323973 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:AM8JzagBsNLPyXWlzKBE0n2tX161kRcKZh0ujC45NGQN5FlHY01je htvD2qBOqncM2X1KNF3ao7npE8B68LSyNI1SlRsrS8yQykb9cadCdqndUqhZCn6wu8v7a5EA 2fyTvGacajYm1eF/k/F3oAMKRCQ7InQLlbGILes1htZGEk0F0/NtTo5w7Rg29Qw34Dja++wk YiaT/P3aQfNNwFcagr424rbwP+4lK2v0N+wlgVWicFj5DcypVFMZH4sDfjZw0/DaptVBoaHq 9Prl9lVyI97EyAFUbtJmp6jGqEDryW70QKm0hK6UID66vROS7BbPg/W+5PwZG8O4whlkeydx /1zi56gbh87EpT2u6MYYgsDOTFaEJR/reqvzXiX6aR/zmXDenrohf5vEFs3LcsT/eMf7WNmr KJCbmpXN1ba2rzwkOnTpupE36zPKOHiOp8fvXdxiynUF/88TbjIQrnQ5M8e1zA17ixLNauPP JBCOGU0BPjGSz9sKEU9J5Fvps3ytiXQVxxXmBW1iINitgA/yyQuieOwYbI5YOeiWsF9jkue4 GXc8AzRAB4AM8eE4SGY6X/qjejK9Qv6R4A6BLC+7uRtglCY2ioUEhJ+fUu2p7y1h1CzX/pbK lcI4Ww+oK4q7kupQ9LhGRqirxastxgAW91WAqsi5RuE0Kb87AOQB2xCRTlEAOHKr+dvG2Zsj AXQ2Yq0W3o/69V5VE5x6J+qkzGiHjAHAVY4RmgBfBleycnHjbgK20enoslYLIa5idj8GDfVy j+MrTQji7h7sfPnx5lX7nic3Wvy+8Ghohodo1yOAzn7tl8RiJuNPtTwsTDmAeB8wJF1p7Vrl FwNgICg4e8HFvlhfwTdEbxWTNlFCxtoWQAwYGKD/bF8rlxBGFb5JOi8BQ2Swm8zaK7onhezP yfuVft5vsM7AZdTRfYfj3iNI8or17P8Mt/uS+rZaNFDCrAoKlTXo3s/OBTKgT+9+KTJrU3ZE c3BGSpLJSxFYZmLMRLsH7tNuVPV7n5WKZzvqWDTkE38jOv2iI+9QrYZKlqeBt3VH4vfyDg5B +13bpPQoz0GCbWWSnCOreY7cABbRVBmVMueg5EGKYa+zv9ORThJ5wn5muh6JeSIXs19y4/1w 51KchMClQek2ySYcV7ih7IKQOqHYKuTZEkTZUQEVWtEEVB5CWp2xKtAJZYxY5c98+lvkax9Q /UfIp3SCfVTUDXXvT8aaMCl/oBlcR2qgyOIPjakP2djL8IxGVSR94+2ZBbr+QkPEjGz6Zk0r Yq/216JWpEEXQljUprbMar901OrsHEBs+tuRE+UcMJLcUDh/dEyeSz8h/M6Oe8WLhDHymfI3 gqaG05A9+LMv5U04J/CgqXd99WlFO53H0x7GWjH7OnpaXmGrzT7mYIZCbSGZzHQUm/w6Z6OX +QNwqGuKuADkXZLr5F4T+Rhw5Uh6oa9vLRd1AllQinGNgz5FrN6L3Ca9sBTrakRlKRBsA67V 0/TqNlXPbKFZJHsHFILfVd3a+2C0bcfmyXI7ORzK0L/vXcl8L2CWERUHh+NlC0Cc+clbNJ7m b8s6JwM9giyqhs2KdLX3Clb+lOFImEET6h65IoRB5Xmi1Zzx1xPCXAG5vQaPH1bhw1wD3QX IronPort-HdrOrdr: A9a23:Ff8hiK19/q6VXWir7HklWwqjBLQkLtp133Aq2lEZdPRUGvb2qy nIpoV96faUskdpZJhOo7G90cW7LE80sKQFg7X5Xo3SODUO2lHJEGgK1+KLqFfd8m/Fh4tgPM 9bAs5D4bbLY2SS4/yX3ODBKadC/OW6 X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59323973" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Juergen Gross Subject: [XEN PATCH 09/57] libs/light: Remove -I. Date: Mon, 6 Dec 2021 17:01:52 +0000 Message-ID: <20211206170241.13165-10-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 There is no need to include current directory. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/light/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index 975413ade8..bfd58226ce 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -44,7 +44,6 @@ SRCS-$(CONFIG_X86) += $(ACPI_OBJS:.o=.c) CFLAGS += -Wno-format-zero-length -Wmissing-declarations \ -Wno-declaration-after-statement -Wformat-nonliteral -CFLAGS += -I. CFLAGS-$(CONFIG_X86) += -DCONFIG_PCI_SUPP_LEGACY_IRQ From patchwork Mon Dec 6 17:01:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12658927 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6779CC433EF for ; Mon, 6 Dec 2021 17:03:25 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239426.415028 (Exim 4.92) (envelope-from ) id 1muHOX-0008R6-KG; Mon, 06 Dec 2021 17:03:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239426.415028; Mon, 06 Dec 2021 17:03:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOX-0008QC-BC; Mon, 06 Dec 2021 17:03:17 +0000 Received: by outflank-mailman (input) for mailman id 239426; Mon, 06 Dec 2021 17:03:15 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOV-0005ti-Nh for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:15 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 66618f48-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:03:14 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 66618f48-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810194; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7opyQyqBD4bp65pDWsyDxZ8R2Dsh09XMMGy7CWwOvJI=; b=Fgj3h/7HAaQJnB5vD7uZFcKyj0c8uCDydFmDrA2h2u0SHwfSMUXgShfu qvA8z7YWepiiFNv6RKNEGSIYrw1NA0u6i8Ivia8G8Hiu/QnHB9FzP/O4c JhJaWtzJlT7Zte8AhmdYJ34r9I+Aqbu3r8CMl3vYbodB8iMTAwd8sqNPf o=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: 8pVUxEHKFUaBG3nW93DwpRmzURM2NQdzzTlXAu0dv9eARkPc86GZAfDlgyxHaQ2+4qZYs3UBXe rJ69QzDvJUaR8S34/qi92Rr6934oTj+YPWDx5kSbv6I5RxsH/GO8QsTlRJJ56Or3jbPfS3JrWj gdY8jzCHTY5nnfqTi+Ftv5iW6HilNnerQ3u5XLG7lOHv9jNEcDW98zyLojblhcasmCApYRKSlC 9QEVBNXHLeLrZbHs0fiaoS1QhNuN3yJH+KNfSekVIHbGX4+lkps/BQdCSRfZd53GltrypV7duZ YkOPP4jvcaH1CpYih5qzD6lf X-SBRS: 5.1 X-MesageID: 58884308 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:TEoWtKzDfR/VkO+P1916t+fGwSrEfRIJ4+MujC+fZmUNrF6WrkUHz TQXWj/QO66OajHyct4ga4y18UwH7ZfcnYBqSQE+qiAxQypGp/SeCIXCJC8cHc8zwu4v7q5Dx 59DAjUVBJlsFhcwnvopW1TYhSEUOZugH9IQM8aZfHAuLeNYYH1500s6wbZn2tQAbeWRWGthh /uj+6UzB3f9s9JEGjp8B3Wr8U4HUFza4Vv0j3RmDRx5lAa2e0o9VfrzEZqZPXrgKrS4K8bhL wr1IBNVyUuCl/slIovNfr8W6STmSJaKVeSFoiI+t6RPHnGuD8H9u0o2HKN0VKtZt9mGt85gy /lTvKHzc0AoY4fOlcZEeABVHC4raMWq+JefSZS+mcmazkmAeHrw2fR+SkoxOOX0+M4uXzsIr 6ZBbmlQMFbT3Ipaw5riIgVors0lMMnsOpJZonx6xCvVJf0nXYrCU+PB4towMDIY25AeTaqFP 5pxhTxHRz+RWgF+BE0tJIMzo7b5jWnOdj4IgQfAzUYwyzeKl1EguFT3C/LKfvSaSMMTmVyXz krE8H7+GQoyL8GExHyO9XfEru7QnwvrVYQKDrq6+/V2xlqJyQQ7GBAQEFe2v/S9okq/QM5Eb VwZ/DI0qqo//1DtScPyNzWxpmKEuRgNHcJdCeQg5CmCz6PV50CSAW1sc9JaQIV47olsH2Vsj wLX2YOybdByjFGLYWyM9ZuKpA7xA28UcEUAaA1dZhII7Na29enfkSnzZtpkFae0iPj8Fjfx3 y2GoUACulkDsSIY//7lpA6a2lpAsrCMF1dovVuPAgpJ+ysgPNb9D7FE/2Q3+hqpwGyxalCa9 EYJlMGFhAzlJcHczXfdKAnh8VzA2hpkDNE+qQM2d3XC3270k5JGQWy2yGskTKuOGpxbEQIFm GeJ5WtsCGZ7ZRNGl5NfbYOrENgNxqP9D9njXf28RoMQOcguLl7apnswOh74M4XRfK4Ey/tX1 XCzK5nEMJrnIf4/kGreqxk1j9fHORzSNUuMHMumnnxLIJKVZWKPSKdtDbd9RrtR0U9wmy2Mq 4w3H5LTk313CbSiCgGKod97BQ1bdhATWMGpw/G7g8bee2KK7kl6UKSPqV7gEqQ495loehDgo ivgBxQGkQWn3hUq62yiMxheVV8mZr4nxVpTAMDmFQ/AN6ELbdn94aEBWYEweLV7puVvweQtF 6sOetmaA+QJQTPComxPYZ74pY1kVRKqmQPRYHb1PGlhJ8ZtF17T59vpXgrz7y1SXCC5gtQz/ u+73QTBTJtdGwk7VJTKaOiixk+atGQGnL4gRFPBJ9ReIR2+8IVjJyHroOUwJsUAdUfKyjeAj l7EChYEv+jd5YQy9YCR16yDqo6oFcp4H1ZbQDaHverna3GC8zP6k4FaUeuOcTTMb0/O+f2vN bdP0vXxEPwbh1IW4YByJKlmkPAl7Nz1qr4Ekgk9RCfXb06mA69LK2Wd2ZUdrbVEw7JUtFfkW k+L/dUGa7yFNNm8TQwULQshKO+CyesVin/Z6vFseBf24yp+/bymV0ROPkbT1HwBfeUtaI51k /08vMM26hCkjkt4O9mLuSlY6mCQIyFSSK4grJwbXNfmhwdDJouuunAA5vsaOK2yVug= IronPort-HdrOrdr: A9a23:f16jNq/R3G++yVG+Dbluk+DeI+orL9Y04lQ7vn2YSXRuHfBw8P re+8jztCWE8Qr5N0tApTntAsS9qDbnhPxICOoqTNOftWvd2FdARbsKheCJ/9SjIVyaygc079 YHT0EUMrPN5DZB4foSmDPIcOod/A== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="58884308" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Juergen Gross Subject: [XEN PATCH 10/57] libs/stat: Remove duplicated CFLAGS from deps Date: Mon, 6 Dec 2021 17:01:53 +0000 Message-ID: <20211206170241.13165-11-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Those CFLAGS_* are already added in libs.mk via USELIBS_stat. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/stat/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libs/stat/Makefile b/tools/libs/stat/Makefile index c99508ae6b..911a2de8ec 100644 --- a/tools/libs/stat/Makefile +++ b/tools/libs/stat/Makefile @@ -15,7 +15,7 @@ XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(CFLAGS_xeninclude) -include $(XEN_ROOT)/tools/config.h +CFLAGS += -include $(XEN_ROOT)/tools/config.h SRCS-y += xenstat.c SRCS-y += xenstat_qmp.c From patchwork Mon Dec 6 17:01:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12658931 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EAF4AC433EF for ; Mon, 6 Dec 2021 17:03:32 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239430.415045 (Exim 4.92) (envelope-from ) id 1muHOZ-0000ZY-NN; Mon, 06 Dec 2021 17:03:19 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239430.415045; Mon, 06 Dec 2021 17:03:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOZ-0000Xh-DY; Mon, 06 Dec 2021 17:03:19 +0000 Received: by outflank-mailman (input) for mailman id 239430; Mon, 06 Dec 2021 17:03:18 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOX-0005ti-Nr for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:17 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 676f0b32-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:03:16 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 676f0b32-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810196; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+OlQ+THP4J9buVH+FPSpdVxwEazvI9jKgpeddJ/Kp5A=; b=iKtBvJc+2k0w4+GT68DgiCO1zLX0/PnFkYYDTCjGBwYR7QeBAjR2pif3 mjXDXdiVHQgwoJW7j2VybdR4Zt44cGSQAM+O30hsvuPhba8S/+s0CGSSv d2ySe1QbvPUtOHo76aCq26L1uuC/GcLhoT98bgVkxRUg3s+A7WGVU6ktr I=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: JphdPSgst0BUiYRj99VRgUlnyVZmt1yRiAvgwSsBdNYRgLBuKZeAtaitwXnORAfWTvWzxWq32C zruFi2OAg3zCXKYLrZTAJpFtD4EtijKIEqfy9XM0JciFW1aEj52A1GfhNQXc1Rmg/NU3Hz+vfD Bi5/ghIaV0VNXVxqmtAN3PEtnwA7dEqjxV756NR2o1Egr7Lidr737KyeWV8EoRyTZHJDpqg5Q5 x46551nG8uN9EYCWx2mkIPPqvnOEoquUom/1NmXTgFifTm4mhRdGvXheF4FB/ZF1JoYlS4PCyF UlWGPcPHJ2b2DU7z55Q1hQ3I X-SBRS: 5.1 X-MesageID: 58884312 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:3ZPd76hzM32AmLbB5oEqUblgX161kRcKZh0ujC45NGQN5FlHY01je htvCmCPaPePZzfzfYt+a4S/90tS78TVn95gHAE5/no0Hykb9cadCdqndUqhZCn6wu8v7a5EA 2fyTvGacajYm1eF/k/F3oAMKRCQ7InQLlbGILes1htZGEk0F0/NtTo5w7Rg29Qw34Dja++wk YiaT/P3aQfNNwFcagr424rbwP+4lK2v0N+wlgVWicFj5DcypVFMZH4sDfjZw0/DaptVBoaHq 9Prl9lVyI97EyAFUbtJmp6jGqEDryW70QKm0hK6UID66vROS7BbPg/W+5PwZG8O4whlkeydx /1Hl4WtVz5uM5Hss8sGSDtDUCp0FL1JreqvzXiX6aR/zmXDenrohf5vEFs3LcsT/eMf7WNmr KJCbmpXN1ba2rzwkOnTpupE36zPKOHiOp8fvXdxiynUF/88TbjIQrnQ5M8e1zA17ixLNauON 5pFMmM1BPjGSyRJGmkuFdU0puWh33jELjBm9n2NgpNitgA/yyQuieOwYbI5YOeiWsF9jkue4 GXc8AzRAB4AM8eE4SGY6X/qjejK9Qv6R4A6BLC+7uRtglCY2ioUEhJ+fUu2p7y1h1CzX/pbK lcI4Ww+oK4q7kupQ9LhGRqirxastxgAW91WAqsi5RuE0Kb87AOQB2xCRTlEAOHKr+dvG2Zsj AXQ2Yq0W3o/69V5VE5x6J+ejyqvJxFSIFMiTgAfVikeoNLpiZE820enoslYLIa5idj8GDfVy j+MrTQji7h7sfPnx5lX7nic3Wvy+8Ghohodo1yOAzn7tl8RiJuNPtTwsTDmAeB8wJF1p7Vrl FwNgICg4e8HFvlhfwTdEbxWTNlFCxtoWQAwYGKD/bF8rlxBGFb5JOi8BQ2Swm8zaK7onhezP yfuVft5vsM7AZdTRfYfj3iNI8or17P8Mt/uS+rZaNFDCrAoKlTXo3s/OBTKgT+9+KTJrU3ZE c3BGSpLJSxFYZmLMRLsH7tNuVPV7n5WKZzvqWDTkE38jOv2iI+9QrYZKlqeBt3VH4vfyDg5B +13bpPQoz0GCbWWSnCOreY7cABbRVBmVMueg5EGKYa+zv9ORThJ5wn5muh6JeSIXs19y4/1w 51KchMClQek2ySYcV7ih7IKQOqHYKuTZEkTZUQEVWtEEVB6CWp2xKtAJZYxY5c98+lvkax9Q /UfIp3SCfVTUDXXvT8aaMCl/oBlcR2qgyOIPjakP2djL8IxGVSR94+2ZBbr+QkPEjGz6Zk0r Yq/216JWpEEXQljUprbMar901OrsHEBs+tuRE+UcMJLcUDh/dEyeSz8h/M6Oe8WLhDHymfI3 gqaG05A9+LMv5U04J/CgqXd99WlFO53H0x7GWjH7OnpaXmGrzT7mYIZCbSGZzHQUm/w6Z6OX +QNwqGuKuADkXZLr5F4T+Rhw5Uh6oa9vLRd1AllQinGNgz5FrN6L3Ca9sBTrakRlKRBsA67V 0/TqNlXPbKFZJHsHFILfVd3a+2C0bcfmyXI7ORzK0L/vXcl8L2CWERUHh+NlC0Cc+clbNJ7m b8s6JwM9giyqhs2KdLX3Clb+lOFImEET6h65IoRB5Xmi1Zzx1xPCXAG5vQaPH1bhw1wD3QX IronPort-HdrOrdr: A9a23:mWu96q6G6aQ8/iYysgPXwMLXdLJyesId70hD6qhwISY7TiX+rb HKoB17726StN9/YhAdcLy7VZVoIkmsl6Kdg7NwAV7KZmCP0wGVxelZnO/fKlbbdREWmNQw6U 4ZSdkcNOHN X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="58884312" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Juergen Gross Subject: [XEN PATCH 11/57] libs/store: Remove PKG_CONFIG_REMOVE Date: Mon, 6 Dec 2021 17:01:54 +0000 Message-ID: <20211206170241.13165-12-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 PKG_CONFIG_REMOVE doesn't do anything anymore. Commit dd33fd2e81 (tools: split libxenstore into new tools/libs/store directory) had reintroduced it without saying why. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/store/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/libs/store/Makefile b/tools/libs/store/Makefile index 43b018aa8c..c208dbb48a 100644 --- a/tools/libs/store/Makefile +++ b/tools/libs/store/Makefile @@ -27,8 +27,6 @@ CFLAGS += -I $(XEN_ROOT)/tools/xenstore xs.opic: CFLAGS += -DUSE_PTHREAD ifeq ($(CONFIG_Linux),y) xs.opic: CFLAGS += -DUSE_DLSYM -else -PKG_CONFIG_REMOVE += -ldl endif -include $(DEPS_INCLUDE) From patchwork Mon Dec 6 17:01:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659015 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9195DC433FE for ; Mon, 6 Dec 2021 17:07:54 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239492.415252 (Exim 4.92) (envelope-from ) id 1muHSr-0002yP-Lh; Mon, 06 Dec 2021 17:07:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239492.415252; Mon, 06 Dec 2021 17:07:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHSr-0002wC-29; Mon, 06 Dec 2021 17:07:45 +0000 Received: by outflank-mailman (input) for mailman id 239492; Mon, 06 Dec 2021 17:07:43 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOa-0005ti-Li for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:20 +0000 Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 689c9f84-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:03:19 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 689c9f84-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810199; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=o+VIkl7f43OW2o365l1olvv7vAkXSoY1AlwWimrAG00=; b=THkylvUyJ5DCfhEqb6RvhlFWZay+kQisAdmvxQvS+giF4tH/D13Cob/n BXOXXVMDL6hJ58W81RgkQasX3nUwpQEz4Gnu7ojGdoTmozwuXWTXdCLpn 34ZHaW6fouxbRc5Wc1D4e+/TMUsK9hwwyH6+VL/J5L6cRfxdb/E5Caok8 k=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: 0u3+9w6TGNhrEv6BTnCAmsn0lu//TRr+GLUBiUyj5sWVevqLmlzTFlq60tqodiJ4DpEl4WBbVD mBSA/JV/bsdIHKk8KmvM+AH4BsGEYCUjMRhizOEECYvPUM7UmOj1nFAR/IoUOUcuFj3fezBwoN kPb/MYMaAA+UwUPBhJjAIPq5v48XlOP0Bz1k70HePCxfVQj4D41yWnzisQ3eJp4/TqZ0I/WFxu sOs7snehAiFw2E40cZY6HNh0kVrvX6pBQxnfqYLEzmifHJ/nk0dYtf5JnNJb+K2ywYfsyhKu8h 9tijHoiQOyz2cTa8VMoWX5/V X-SBRS: 5.1 X-MesageID: 59387780 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:0tTLJKBZwyv3zhVW/8/kw5YqxClBgxIJ4kV8jS/XYbTApDh00WYGy 2AaDzrSOKmPZjD2c9Fxa4rj9EoB7ZCEyIBqQQY4rX1jcSlH+JHPbTi7wuYcHM8wwunrFh8PA xA2M4GYRCwMo/u1Si6FatANl1ElvU2zbue6WLGs1hxZH1c+EX570Uw7wYbVv6Yz6TSHK1LV0 T/Ni5W31G+Ng1aY5UpNtspvADs21BjDkGtwUm4WPJinj3eH/5UhN7oNJLnZEpfNatI88thW5 Qr05OrREmvxp3/BAz4++1rxWhVirrX6ZWBihpfKMkQLb9crSiEai84G2PQghUh/lQvSjfNsw oV3tI2MSSYTPvySieU3akwNe81+FfUuFL7vJHG+tYqYzlHccmuqyPJrZK00FdRGoKAtWzgIr KFGbmBWBvyAr7veLLaTQ+9whsMlPY/zMZkWoH1IxjDFF/c2B5vERs0m4PcFjWxg2Z8eRZ4yY eIEUwJTNzLcQiZTBWkHU6t5oOSFqkLGJmgwRFW9+vNsvjm7IBZK+LnyMvLFd9qSX8JXk02E4 GXc8AzRHRUyJNGZjz2f/RqEluLJ2C/2Ro8WPLm57eJxxk2ewHQJDx8bXkf9puO24ma3Xc5fL EoFvDIjt6Eo+GSkS9D8W1uzp3vsg/IHc4MOSatgsljLk/eKpVbCboQZctJfQMIY790VWDZ67 F6Yo9PIPzw+7qyUY0vIo994sgiOESQSKGYDYwoNQg0E/8TvrekPs/7fcjpwOPXr14OoQFkc1 xjP9XFj3OtL0abnwo3ipQif6w9AsKQlWeLcCu//emu+pj10a4e+D2BDwQiKtK0QRGp1o7Tog ZTlpyR8xL1XZX1uvHbUKAnoIF1Pz6zfWNE7qQQwd6TNDxz3pxaekXl4uVmS3ntBPMceYiPOa 0TOow5X75I7FCL0Nv8oOdPsUZ50kviI+THZuhb8NIAmjn9ZLlDvwc2TTRTIgzCFfLYEz8nTx qt3ge7zVC1HWMyLPRK9RvsH0K9D+8zN7Ti7eHwP9Dz+ieD2TCfMEd8taQLSBshkvPLsiFiEq L53aprVoyizpcWjO0E7B6ZIdgtURZX6bLirw/FqmhmrflA7RTp/UqCJmtvMueVNxsxoqwsBx VnlMmcw9bY1rSavxdyiZi8xZbXxc4x4qH5nbyUgMUzxgyooYJq17bdZfJwyJOF1+OtmxP9yb v8EZ8TfXagfFmWZo2wQPcvnsYhvVBW3ngbSbSCrVycyIsx7TAvT9966Iga2rHsSDjC6vNcVq qG70l+JWoIKQglvVZ6EaP+mw16rk2IaneZ+AxnBLtVJIR2++4l2MS3hyPQwJphUexnEwzKb0 SeQAAsZ+raR89NkroGRiPnd/YmzEuZ4Ek5LJEXh7O67ZXvA426u4Y5cS+LULzrTY3z5pfe5b uJPwvCibPBexARWs5BxGqpAxL4l44e9vKdTywlpESmZb1mvDb88cHCK0dMW6/9Iz75d/wC3R liO6p9RPrDQYJHpF1sYJQwEaOWf1K5LxmmOvKpteEiqtjVq+LenUFlJO0jegSNQG7J5LYc5z Lpzo8UR8QG+1kInP9vuYvq4LIhQwqjsi5kai6w= IronPort-HdrOrdr: A9a23:p5n6PK3LpLGMJROv8H3UUAqjBLQkLtp133Aq2lEZdPRUGvb2qy nIpoV96faUskdpZJhOo7G90cW7LE80sKQFg7X5Xo3SODUO2lHJEGgK1+KLqFfd8m/Fh4tgPM 9bAs5D4bbLY2SS4/yX3ODBKadC/OW6 X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59387780" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu Subject: [XEN PATCH 12/57] tools: remove some unneeded subdir-distclean-* targets Date: Mon, 6 Dec 2021 17:01:55 +0000 Message-ID: <20211206170241.13165-13-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Those two are already covered by subdir-distclean-% target in Rules.mk. Signed-off-by: Anthony PERARD --- tools/Makefile | 3 --- tools/firmware/Makefile | 3 --- 2 files changed, 6 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 757a560be0..8936b754c8 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -296,9 +296,6 @@ subdir-uninstall-debugger/kdd: .phony subdir-all-debugger/kdd: .phony $(MAKE) -C debugger/kdd all -subdir-distclean-firmware: .phony - $(MAKE) -C firmware distclean - subtree-force-update: ifeq ($(CONFIG_QEMU_XEN),y) $(MAKE) qemu-xen-dir-force-update diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index 1f27117794..345037b93b 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -85,9 +85,6 @@ clean: subdirs-clean .PHONY: distclean distclean: subdirs-distclean -subdir-distclean-etherboot: .phony - $(MAKE) -C etherboot distclean - subdir-distclean-ovmf-dir: .phony rm -rf ovmf-dir ovmf-dir-remote From patchwork Mon Dec 6 17:01:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659055 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2A826C433F5 for ; Mon, 6 Dec 2021 17:08:59 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239529.415469 (Exim 4.92) (envelope-from ) id 1muHTu-0006RD-ED; Mon, 06 Dec 2021 17:08:50 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239529.415469; Mon, 06 Dec 2021 17:08:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHTt-0006Jh-Nw; Mon, 06 Dec 2021 17:08:49 +0000 Received: by outflank-mailman (input) for mailman id 239529; Mon, 06 Dec 2021 17:08:46 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOl-0005ta-Ux for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:32 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6fcc8f94-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:03:30 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6fcc8f94-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810210; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UhFgmmoOwKtG2lUQa+HnpdBh/Zms8eKZ6E/nA9EQD1A=; b=Z1VIgh6Ab/2rTOtL/4e3YhCyiaQlQaK2quttx2yYlvlwny9ApUgUNPrM Ez5mWSmul+jzc+x12kmMAOTbvhUdfWT7NW3bShADSiKybNT3BYOHuF0HP BfYpcpdewlx3qOr/R5RvVaN3YlEWgZ8RDAr1hlJQwIAL+/1/9b9rmJj6u A=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: 2cQgVYcnPwKL4omFLQzgezRglJDjdbeB177CK6FPg8FOgTO0hKvmBJs0wS5rSKMvxBQAxvep1e 16YVNcy5ZFA0xxFgAOuBi4t0o7AMl7pBPGvKH78636RH4zuzpvzScc2OXD/C2rxzkyofIkeV9j xpZOkg6GtVWtDU9qsrb9eemm22XuSBjFrfRRcOb1pNfPteTF53HOHxF5cJAZeDTa30nIPqiwui 7WhbBTOI8+qcQ6vB2Kzf2HG5DLNvydzw1+xBzEy6MuTlSy39XiQTuPAEbQvsJtXXNUnNQBnkp/ RfyYzGSb6Ca/KLwBNZydODSp X-SBRS: 5.1 X-MesageID: 59766370 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:jw7WIan2kwBJLn13GEGcVNHo5gxzIURdPkR7XQ2eYbSJt1+Wr1Gzt xIeUDiFbP2PZTanL492YYWxpEsPvJ6Dx99mSAE4qntgFiMWpZLJC+rCIxarNUt+DCFioGGLT Sk6QoOdRCzhZiaE/n9BClVlxJVF/fngqoDUUYYoAQgsA187IMsdoUg7wbdg2NY22YLR7z6l4 rseneWOYDdJ5BYsWo4kw/rrRMRH5amaVJsw5zTSVNgT1LPsvyB94KE3fMldG0DQUIhMdtNWc s6YpF2PEsE1yD92Yj+tuu6TnkTn2dc+NyDW4pZdc/DKbhSvOkXee0v0XRYRQR4/ttmHozx+4 PVLjaW5bVsYBJfzpOtFYTJgDgBhA6ITrdcrIVDn2SCS50jPcn+qyPRyFkAme4Yf/46bA0kXq 6ZecmpUKEne2aTmm9pXScE17ignBMDtIIMYvGAm1TzDBOwqaZvCX7/L9ZlT2zJYasVmQKeBO ZRCNmIHgBLoc1pRPEwyGrsCt9yZ2iCgXmx8iVDJuv9ii4TU5FMoi+W8WDbPQfSVQe1Fk0Deo XjJl0z4HRMyJNGZ0SCC8H+nmqnIhyyTcIAYGaC89/VqqEaO3WFVAxoTPXOrrP/8hkOgVtZ3L 00P5jFovaU07FasTNT2Q1u/unHslhcaR9pXFfx88AyXw7DYywmcD2kACDVGbbQbWNQeHGJwk AXTxpWwWGIp4Ob9pW+hGqm8jTWKACExcV44XxA4QlM3yOH+gZ4NgUeaJjp8K5KdgtrwEDD25 jmFqikimrke5fI2O7WHEUPv2Gz1+MWQJuIhzkCOBz/+sFslDGKwT9XwsQCz0BpWEGqOorBtV lAgktPW0u0BBIrleMelELRUR+HBCxpo3VThbb9T83sJqm3FF52LJ9k4DNRCyKFBaJxsldjBO hC7hO+pzMUPVEZGlIcuC25LN+wkzLL7CfPuXe3OY9xFb/BZLVHcrH40NBPKhT6ywCDAdJ3T3 7/BK65A6l5AVsxaIMeeHb9BgdfHOAhgrY8seXwL50v+iufPDJJkYbwELEGPfogEAFCs+23oH yJkH5LSkX13CbSmCgGOqNJ7BQ1afBATWMGtw+QKJ7HrH+aTMDx4YxMn6eh6ININcmU8vrqgw 0xRrWcEkgei3iOedl3RAp2hAZu2NatCQbsAFXREFT6VN7ILO9bHAH43e8RlcL852vZkyPIoH fAJd9/ZWqZESyjd+iRbZp749dQweBOujAOIHiykfDlgIMIwG12XoofpLln16S0DLiurrs9i8 beu4RzWHMgYTAN4AceINP/2lwGtvWIQkf5ZVlfTJoUBY13l9YVncnSjjvI+L8wWBw/Ewz+Wi 1SfDRsC/LGfqI4p6tjZw6uDqt7xQed5G0NbGUjd7Kq3anaGrjbyn9cYXb/RLz7HVW7y9KGzX slvzqnxYK8dgVJHk4tgCLI3n6gw0MTi+u1BxQN+EXSVM1nyUuF8ImOL1NVkv7FWwuMLohO/X 0+C94UIObiNP8+5QlcdKBB8M7aG3PAQ3DLT8e40MAPx4youpOiLVkBbPh+tji1BLeQqbNN5k Ll54MNGuRaijhcKM8qdinEG/muBGXUMTqE7u8xIG4TskAcqlglPbJG05vUaO31ThwGg6nUXH wI= IronPort-HdrOrdr: A9a23:7DuPbaP/E6TtBcBcTsejsMiBIKoaSvp037Eqv3ofdfUzSL3+qy nOpoVj6faaslcssR0b9OxofZPwI080lqQFhbX5X43DYOCOggLBR+tfBMnZsljd8kXFh4hgPM xbHZSWZuedMbEDt7eY3DWF X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59766370" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Wei Liu , Ian Jackson Subject: [XEN PATCH 13/57] tools/firmware/hvmloader: remove "subdirs-*" prerequisite Date: Mon, 6 Dec 2021 17:01:56 +0000 Message-ID: <20211206170241.13165-14-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 hvmloader's last subdir have been removed in 73b72736e6 ("acpi: Move ACPI code to tools/libacpi"), so there is no need to use "subdirs-*" target anymore. Signed-off-by: Anthony PERARD --- tools/firmware/hvmloader/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index e980ce7c5f..b754220839 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -60,7 +60,7 @@ ROMS += $(ROMBIOS_ROM) $(STDVGA_ROM) $(CIRRUSVGA_ROM) endif .PHONY: all -all: acpi subdirs-all +all: acpi $(MAKE) hvmloader .PHONY: acpi @@ -104,7 +104,7 @@ endif mv $@.new $@ .PHONY: clean -clean: subdirs-clean +clean: rm -f roms.inc roms.inc.new acpi.h rm -f hvmloader hvmloader.tmp *.o $(DEPS_RM) $(MAKE) -C $(ACPI_PATH) ACPI_BUILD_DIR=$(CURDIR) clean From patchwork Mon Dec 6 17:01:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12658933 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1A80BC433F5 for ; Mon, 6 Dec 2021 17:03:34 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239436.415061 (Exim 4.92) (envelope-from ) id 1muHOh-0001hU-3o; Mon, 06 Dec 2021 17:03:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239436.415061; Mon, 06 Dec 2021 17:03:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOg-0001hG-Vm; Mon, 06 Dec 2021 17:03:26 +0000 Received: by outflank-mailman (input) for mailman id 239436; Mon, 06 Dec 2021 17:03:25 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOf-0005ta-M2 for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:25 +0000 Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6b143b41-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:03:23 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6b143b41-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810203; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=w1OhVzUVsrx+N6DExzCgUwZ3ahqbZkwu+S8c7CbAdw8=; b=ViSjD6rE/UWDJTaNOWM1wjzvA2LCCSzTEr2F36OlMcBoL7HwF67sGKTf X3oTjNiiaA4GSQN18Y+eo+b88ZsJu30CCRjMSmOve2iI3QybzW2M8sESF NLtyUoGpjyhnQAMzKxneZzCmT9/v69nn4BXso4XkfYdoofSEdFOqb0ggd U=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: bwRPUq4fICmYJLpimF/3ueD5XfxVp4E3AL4hfpYkj4/UihUftKhHUC8AsKBaP4DAe0uvstUWOH 0UqN06As0HvWcRYdQFQZm0WCkK4mv5NcNdnSvIzV6boHkSjtGP7r4PxrwGbGj1TshW198t15v0 wVTk3gC+dig9LOTdJ7giNmgRtkmgh6sU1KSTzBxvgj6QazJ0TmaSFqe4M2JEl7gOUn6IvCtrzz mCSfCbi52c9p7YrujQqvA+qL+iCv+yLzyqVNGlQDBr+0JDVgLXnDUxF6HX0ZBB2asj2bbbZwcR sl4lf1kMP272OmqQV4rWbXYQ X-SBRS: 5.1 X-MesageID: 59370544 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:KWF+IKpwVQiRakiB6bmxgvMxvEBeBmKFYhIvgKrLsJaIsI4StFCzt garIBnUaKvcYGr0fNh2adji9ENSvJGAn9RjSlQ/ripjQiwQo5uZCYyVIHmrMnLJJKUvbq7GA +byyDXkBJppJpMJjk71atANlZT4vE2xbuKU5NTsY0idfic5Dnd+4f5fs7Rh2Ncx24DnW1nlV e7a+KUzBnf0g1aYDUpMg06zgEsHUCPa4W5wUvQWPJinjXeG/5UnJMt3yZKZdhMUdrJ8DO+iL 9sv+Znilo/vE7XBPfv++lrzWhVirrc/pmFigFIOM0SpqkAqSiDfTs/XnRfTAKtao2zhojx/9 DlCnYCvTg0tOpTzo74UcTtYAR5xDK5DyqCSdBBTseTLp6HHW37lwvEoB0AqJ4wIvO1wBAmi9 9RBdmpLNErawbvrnvTrEYGAhex6RCXvFIoZpnFnyyCfFfs8SIrPa67L+cVZzHE7gcUm8fP2O ptCNmIyMEiojxtnI1c+Jssep82TnWT0bBxojnGnt5oe7D2GpOB2+Oe0a4eEEjCQfu1Zhl2dp 37G123hDwsGKceEzj6Y7nOrgPSJliT+MKoTC7+Q5vNsmEeUxGEYFFsRT1TTiea9ol6zXZRYM UN80jojq+0++VKmSvH5XgakuziUsxgEQd1SHuYmrgaXxcL86gCFBm8CX3hZZcYvrsMeSjkj1 1vPlNTsbRRjv7GYRmiU3quFpjO1fy4OJCkNYjFscOcey4C9+sdp1EuJF4s9Vv7u5jHoJd3u6 yyVqyI6g4wstpQC9Ye772/IsjGplIecG2bZ+T7rdm6i6wp4YqusaIqp9UXX4J58EWqJcrWSl CNawpbDtYjiGbnIzXXQG7tVQNlF8t7caGWE6WODCaXN4NhEF5SLWYlLqA9zK05yWirvUW+4O RSD0e+9CXI6AZdLUUOVS9/oYyjJ5fK5fTgAahwyRoAUCnSWXFXYlByCnWbKgwjQfLEEyMnTw 6uzf8e2Fmo9Aq961jewTOp1+eZ1nXBhnzKOH8qlkETPPV+iiJi9E+1t3LymNL9R0U95iF+Nr 4Y32zWilX2zr9ESkgGIqNVOfDjm3FAwBIzsqtw/SwJwClEOJY3VMNeImelJU9U8x8x9z76Ul lngCh4w4Aeu3hXvdFTVAk2PnZuyBP6TW1pgZndyVbtpslB+CbuSAFA3K8FqIOJ5rbM7lpaZj ZAtIq29PxiGcRyfkxx1UHU3hNUKmM2DiV3cMiy7TiI4epI8FQXF9sW9Jlnk9TUUDzrxvsw7+ uXy2gTeSJsFZgJjEMeJN67/kwLv5SAQyLBoQk/FAthPY0GwooJkHDP8060sKMYWJBSdmjbDj 1SKAQ0VrPXmqpMu9IWbnriNqoqkSrMsHkdTE2TBw6yxMC3WojiqzYNaCb7adjHBTmLkvq6lY LwNnf37NfQGmndMspZ9TOk3nf5vuYO3quYDnAp+HXjNY1C6MZ9aIyGLjZtVq6lA5r5Fog/qC EiBzcZXZOeSM8T/HV9PeAd8Nraf1esZkyX55OguJBmo/zd++beKXBkAPxSIjyABfrJ5PJl8n LUksc8SrQe+lgArIpCNiSUNrzaAKXkJUqMGsJAGAdC01lp3mw8aOZGMWDXr5JyvaslXNhh4K zCZs6POmrBAyxeQaHE0D3XMgbJQiJlmVMqmF7Pey4BlQub4u8I= IronPort-HdrOrdr: A9a23:23baMa/0SjlEZ9hPreJuk+DeI+orL9Y04lQ7vn2YSXRuHfBw8P re+8jztCWE8Qr5N0tApTntAsS9qDbnhPxICOoqTNOftWvd2FdARbsKheCJ/9SjIVyaygc079 YHT0EUMrPN5DZB4foSmDPIcOod/A== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59370544" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Daniel De Graaf , "Daniel P. Smith" , Ian Jackson , Wei Liu Subject: [XEN PATCH 14/57] tools/flask/utils: remove unused variables/targets from Makefile Date: Mon, 6 Dec 2021 17:01:57 +0000 Message-ID: <20211206170241.13165-15-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 They are no *.opic or *.so in this subdir, so no need to clean them. The TEST* variables doesn't seems to be used anywhere, and they weren't used by xen.git when introduced. Both CLIENTS_* variables aren't used. Both target "print-dir" and "print-end" only exist in this directory and are probably not used anywhere. Signed-off-by: Anthony PERARD Reviewed-by: Daniel P. Smith --- tools/flask/utils/Makefile | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile index ae87102144..5449f05b13 100644 --- a/tools/flask/utils/Makefile +++ b/tools/flask/utils/Makefile @@ -4,13 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror CFLAGS += $(CFLAGS_libxenctrl) -TESTDIR = testsuite/tmp -TESTFLAGS= -DTESTING -TESTENV = XENSTORED_ROOTDIR=$(TESTDIR) XENSTORED_RUNDIR=$(TESTDIR) - CLIENTS := flask-loadpolicy flask-setenforce flask-getenforce flask-label-pci flask-get-bool flask-set-bool -CLIENTS_SRCS := $(patsubst flask-%,%.c,$(CLIENTS)) -CLIENTS_OBJS := $(patsubst flask-%,%.o,$(CLIENTS)) .PHONY: all all: $(CLIENTS) @@ -35,21 +29,13 @@ flask-set-bool: set-bool.o .PHONY: clean clean: - rm -f *.o *.opic *.so + rm -f *.o rm -f $(CLIENTS) $(RM) $(DEPS_RM) .PHONY: distclean distclean: clean -.PHONY: print-dir -print-dir: - @echo -n tools/flask/utils: - -.PHONY: print-end -print-end: - @echo - .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(sbindir) From patchwork Mon Dec 6 17:01:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659019 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D533FC433F5 for ; Mon, 6 Dec 2021 17:08:00 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239496.415279 (Exim 4.92) (envelope-from ) id 1muHSx-0004LM-CO; Mon, 06 Dec 2021 17:07:51 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239496.415279; Mon, 06 Dec 2021 17:07:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHSx-0004Jc-4f; Mon, 06 Dec 2021 17:07:51 +0000 Received: by outflank-mailman (input) for mailman id 239496; Mon, 06 Dec 2021 17:07:49 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOn-0005ta-2J for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:33 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6ff0ced6-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:03:32 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6ff0ced6-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810211; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=O21sRR07hYjYj9vZuB9LwkDXcVWb8j2cB7UEoDG9SQo=; b=gzQISgmCBs5jFoLRLGEge8hR6s8xJ/7YGN9xFVAox3wghdopMpD6fcjw Bp1IPN6H/445TC/ZnlAam5aFBLy58BiU/h6MpfUMPk/BNEcZV3Ju0wAxc qlkEI4JCvTh/jXhcnB4/WQme1yZay7c/BzLiRHZIl0ZIsEMZGuQj0c8xS g=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: oZfcFkjPoi6ndXydETePffndu0po/Iso82qr0s/mXfuc2V1tiZVOzKp1GOqx0G+Jtv07mUwSR9 /U5HLCvRDYG7kLXyHHh6fJkL0NYnt5/rrKSmKlO9WWeaXFJrBUztWpASrL9HTpT4SMBJ8cx6kG ZKrmxi52a2VBPi2BtDqLFxl3TUYcUhxNNuUOYg71jBFeYO3l7PdxcB1PxbEUhKl4Q17oyaFgSt uheY96XsUd1RKqR84dNTFkXcFqxmRMZqdtL6uUe7LtnsIGx6oGAsPFkJkVfOa2/hD0ghHAKU+N qCPj7LOGOwni5OlqqHTJ8Gu7 X-SBRS: 5.1 X-MesageID: 59766382 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:5SPthq6GHf8bIFRZ2URFjwxRtMrAchMFZxGqfqrLsTDasY5as4F+v mtLUTqEOPbZYDH8eNF3bNu29R9X6JaGmtdgQQJvrio3Hi5G8cbLO4+Ufxz6V8+wwmwvb67FA +E2MISowBUcFyeEzvuV3zyIQUBUjclkfJKlYAL/En03FVAMpBsJ00o5wrdj2tAw27BVPivW0 T/Mi5yHULOa82Yc3lI8s8pvfzs24ZweEBtB1rAPTagjUG32zhH5P7pGTU2FFFPqQ5E8IwKPb 72rIIdVXI/u10xF5tuNyt4Xe6CRK1LYFVDmZnF+A8BOjvXez8CbP2lS2Pc0MC9qZzu1c99Zk dBWkJqUGSYQIKDnyMoBdEBAPzpwMvgTkFPHCSDXXc27ykTHdz3nwul0DVFwNoodkgp1KTgQr 7pCcmlLN03dwbLtqF64YrAEasALJc/3PIQZqzd4wCvQF/oOSpHfWaTao9Rf2V/cg+gTTKmAO ZFJM1KDajybXSNOOmc0D6kcgb3zhWPATzcGmVCs8P9fD2/7k1UqjemF3MDuUt2VR+1Fk0CAv GXE8m/lRBYAO7S31j6t4n+qwOjVkkvTWogfCbm5/f5Cm0CIyyoYDxh+fUu2p7y1h1CzX/pbK lcI4Ww+oK4q7kupQ9LhGRqirxastxgAW91WAqsi5RuE0Kb87AOQB2xCRTlEAOHKr+dvG2Zsj AXQ2Yq0W3o/69V5VE5x6J/NqCiXPwxFDFYcaARUYxciusHPu48820enoslYLIa5idj8GDfVy j+MrTQji7h7sfPnx5lX7nic3Wvy+8Ghohodo1yOAzn7tl8RiJuNPtTwsTDmAeB8wJF1p7Vrl FwNgICg4e8HFvlhfwTdEbxWTNlFCxtoWQAwYGKD/bF8rlxBGFb5JOi8BQ2Swm8zaK7onhezP yfuVft5vsM7AZdTRfYfj3iNI8or17P8Mt/uS+rZaNFDCrAoKlTXo3s/OBTKgT+9+KTJrU3ZE c3BGSpLJSxFYZmLMRLsH7tNuVPV7n5WKZzvqWDTkE38jOv2iI+9QrYZKlqeBt3VH4vfyDg5B +13bpPQoz0GCbWWSnCOreY7cABbRVBmVMueg5EGKYa+zv9ORThJ5wn5muh6JeSIXs19y4/1w 51KchMClQek2ySYcV7ih7IKQOqHYKuTZEkTZUQEVWtEEVB5Me5DNY8TKMk6e6cJ7utmwaImR vUJYZzYUP9OVi7G63IWapyk9N5ucxGihASvOSu5YWdgI848FlKRotK0LBHy8CQuDzassZdsq bOXyQ6GE4EIQB5vDZiKZav3nU+xp3UUhMl7Q1DMfotIYEzp/YUzc37xg/Y7LtsiMxLGwjfGh Q+aDQ1B/bvGopMv8cmPjqeB9t/7H+x7F0tcPm/a8bfpanWKojv9mddNCb/acyrcWWX4/LSZS d9Ul/ysYucamFtqspZnF+o5x6wJ+Nay9aRRyR5pHSuXYg3zWK9gOHSPweJGqrZJmu1CoQKzV 0+CpotaNLGONJ+3GVIdPlN4POGK1PVSkTjO9/UlZk794XYvrraAVExTOTiKiTBcc+QpYN90n 795tZ5E8RG7hzorLs2C33Jd+Gm7J3AdV7kq68MBC4jxhwt3klxPbPQw0MMtDE1jvzmUDnQXH w== IronPort-HdrOrdr: A9a23:vHcYuK+g+3P0knOV80Fuk+DeI+orL9Y04lQ7vn2YSXRuHfBw8P re+8jztCWE8Qr5N0tApTntAsS9qDbnhPxICOoqTNOftWvd2FdARbsKheCJ/9SjIVyaygc079 YHT0EUMrPN5DZB4foSmDPIcOod/A== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59766382" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Jan Beulich , Ian Jackson , Wei Liu Subject: [XEN PATCH 15/57] tools/libacpi: cleanup Makefile, don't check for iasl binary Date: Mon, 6 Dec 2021 17:01:58 +0000 Message-ID: <20211206170241.13165-16-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 iasl is been check for presence by ./configure, so this Makefile doesn't have to do it. Also start to use $(IASL) that ./configure generate. iasl hasn't been download by our build system for a while and the dependency on iasl is in the main xen.git README. Make use of $< in one rule instead of spelling the %.asl file again. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- tools/libacpi/Makefile | 17 ++++------------- tools/libacpi/README | 6 ------ 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/tools/libacpi/Makefile b/tools/libacpi/Makefile index 2448687dbb..60860eaa00 100644 --- a/tools/libacpi/Makefile +++ b/tools/libacpi/Makefile @@ -38,11 +38,10 @@ MKDSDT_CFLAGS-$(CONFIG_X86) = -DCONFIG_X86 # complete $(ACPI_BUILD_DIR) as path, even if it has '.' symbols. TMP_SUFFIX = tmp -vpath iasl $(PATH) all: $(C_SRC) $(H_SRC) -$(H_SRC): $(ACPI_BUILD_DIR)/%.h: %.asl iasl - iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $< +$(H_SRC): $(ACPI_BUILD_DIR)/%.h: %.asl + $(IASL) -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $< sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $(ACPI_BUILD_DIR)/$*.hex >$@ rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex) @@ -74,21 +73,13 @@ $(ACPI_BUILD_DIR)/dsdt_anycpu_arm.asl: $(MK_DSDT) $(MK_DSDT) --debug=$(debug) >> $@.$(TMP_SUFFIX) mv -f $@.$(TMP_SUFFIX) $@ -$(C_SRC): $(ACPI_BUILD_DIR)/%.c: iasl $(ACPI_BUILD_DIR)/%.asl - iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $(ACPI_BUILD_DIR)/$*.asl +$(C_SRC): $(ACPI_BUILD_DIR)/%.c: $(ACPI_BUILD_DIR)/%.asl + $(IASL) -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $< sed -e 's/AmlCode/$*/g' -e 's/_aml_code//g' $(ACPI_BUILD_DIR)/$*.hex > $@.$(TMP_SUFFIX) echo "int $*_len=sizeof($*);" >> $@.$(TMP_SUFFIX) mv -f $@.$(TMP_SUFFIX) $@ rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex) -iasl: - @echo - @echo "ACPI ASL compiler (iasl) is needed" - @echo "Download and install Intel ACPI CA from" - @echo "http://acpica.org/downloads/" - @echo - @exit 1 - clean: rm -f $(C_SRC) $(H_SRC) $(MK_DSDT) $(C_SRC:=.$(TMP_SUFFIX)) rm -f $(patsubst %.c,%.hex,$(C_SRC)) $(patsubst %.c,%.aml,$(C_SRC)) $(patsubst %.c,%.asl,$(C_SRC)) diff --git a/tools/libacpi/README b/tools/libacpi/README index 2b9d6e188c..4ab5ed2de7 100644 --- a/tools/libacpi/README +++ b/tools/libacpi/README @@ -24,9 +24,3 @@ In case that the acpi_dsdt.asl need to be updated, please Follow the instruction: # make acpi_dsdt.c - -Note: -DSDT compiler "iasl" is needed. By default, it will be downloaded -using wget in Makefile. if it failed, please download manually from -http://developer.intel.com/technology/iapc/acpi/downloads.htm. -then compile and install iasl From patchwork Mon Dec 6 17:01:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659047 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D515EC433EF for ; Mon, 6 Dec 2021 17:08:54 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239525.415451 (Exim 4.92) (envelope-from ) id 1muHTq-0005dg-Tv; Mon, 06 Dec 2021 17:08:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239525.415451; Mon, 06 Dec 2021 17:08:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHTq-0005bs-8i; Mon, 06 Dec 2021 17:08:46 +0000 Received: by outflank-mailman (input) for mailman id 239525; Mon, 06 Dec 2021 17:08:44 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOj-0005ta-0t for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:29 +0000 Received: from esa4.hc3370-68.iphmx.com (esa4.hc3370-68.iphmx.com [216.71.155.144]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6d8bd62f-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:03:27 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6d8bd62f-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810207; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=s3UfqkrJCrnPU+r8syU57IaF/HqfNRQQBSiB7nWPZBY=; b=GF/H/cQFUOq5+kGF3FD5MfbubV0i2pV7rNiTa2wwE8mKIZLl22cUosa0 vsRj1HWRGzCTAlDabNG+QPVkTbpoGX9h9TH8gll+m29VNKwxjfi3uvGPi Aaj4fAM2aTUsll+9+T+4EGGfWoKceO6TKlldC/1ToTapiuQUx3pzVuAtX Q=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: HYhPvvTleilbuF6X8DLTbabFZKcrRfFBG/XY4Mui4lz53nhgfaMq/YsdElTK5/anpFGDVc3Z/y pHiYx6Q1kDxW2rqRXjhQz1pURUtCw7uoI0CLC6cMpO283BM4GUsSlKWXbLT3uC3LvuyPcC17zQ bBlaApaUAVzsXZxyc+j/n3cQroxFZR8vlQ6GY6/dQvfLEVg4F8mppewlw7uaZR5RcHF5r5E5/8 44XCTxsbvXTJKic1pK/IumRlLrplsbj5sHfc39o6oFSQxzGCHAJ+CwjAgWg2+qcmQqyEfW87zk fOnZsXQJ+Q3oh6Sh/lbUL0m8 X-SBRS: 5.1 X-MesageID: 61420628 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:vVb2Zqn3Lf42Oa/bZd7wKzjo5gwrIURdPkR7XQ2eYbSJt1+Wr1Gzt xJOWmyBa/jeNzTwc9pyaonnpBgP7ZeBmoNgSlBt/ns8QSMWpZLJC+rCIxarNUt+DCFioGGLT Sk6QoOdRCzhZiaE/n9BClVlxJVF/fngqoDUUYYoAQgsA187IMsdoUg7wbdg2NY22YLR7z6l4 rseneWOYDdJ5BYsWo4kw/rrRMRH5amaVJsw5zTSVNgT1LPsvyB94KE3fMldG0DQUIhMdtNWc s6YpF2PEsE1yD92Yj+tuu6TnkTn2dc+NyDW4pZdc/DKbhSvOkXee0v0XRYRQR4/ttmHozx+4 PFn8sSZTAMAApWPurggXzN/GnpxE6ITrdcrIVDn2SCS50jPcn+qyPRyFkAme4Yf/46bA0kXq 6ZecmpUKEne2aTmm9pXScE17ignBMDtIIMYvGAm1TzDBOwqaZvCX7/L9ZlT2zJYasVmQ6+CP ZJHM2oHgBLoaCVkY01KArgFu9y0oWLZS2F5tmjKqv9ii4TU5FMoi+W8WDbPQfSRXtlclEuco mPA/kz6DwscOdjZziCKmlqum+vOkCXTSI8UUrqi+ZZCjFSNy0QJBRYRVF/9puO24mahX/pPJ kpS/TAhxYA78lCrSd/sGQW1uneesjYTXtNRF6sx7wTl4rrZ5UOVC3YJShZFacc6r4kmSDoyz FiLktj1Qzt1v9W9S3iQ67OVpjOaIjUOICkJYipsZQoa4fHzrYcrlBXNQ91/VqmvgbXI9SrYm m7Q6nJk3vNK0JBNh/7TEU37byyEgrKOFicw4izrZiGHsj51TqmsPIOG5g2OhRpfF7qxQl6Et XkCvsGR6uESEJ2A/BCwrPUx8KKBvKjcbmCF6bJ7N9x4rmn2pSb/FWxFyGgmfB8BDyoSRdP+j KY/Uyt17YQbAnalZLQfj2mZW5VzlviI+TgIu5npgjtyjnpZKVbvEMJGPxf4M4XRfK4Ey/tX1 XCzK5nEMJriIf47pAdavs9EuVPR+ggwxHnIWbfwxAm93LyVaRa9EOleYATUP71jtv3b8G05F uqz0ePQkX2zt8WkPUHqHXM7dwhWfRDX+7iowyCoSgJzClU/QzxwYxMg6bggZ5Zkj8xoehTgp RmAtrtj4AOn3xXvcFzSAlg6Me+Hdcsv/BoTYH13VX71iidLXGpaxPpGH3fBVeJ8r7ILID8dZ 6RtRvhs9dwTEGmaoGpEMsGmxGGgHTzy7T+z0+OeSGBXV/Zdq8bhoLcIpyPjq3sDCDSZr8w7r +Hy3w/XW8NbFQ9jENzXeLSkyFbo5SoRn+d7Xk3pJNhPeRqzrNg2enKp1vJncdsRLRjjxyeB0 1rECxkvuuSQ8ZQ+98PEhP7Yot7xQfd+BEdTA0LS8a2yaXvB5mOmzIIZCLSIcDnRWXna4qKnY ekJnfjwPOdexARBspZmEqYtxqU7voO9q7hfxwViPXPKc1X0Ve8wfijYhZFC7/QfyKVYtA26X lO01uNbYbjZatn4FFMxJRY+arjR3/8jhTSPv+8+J1/35XEr8ePfA1lSJRSFlAdUMKBxbNE+2 e4ktcMbt16/hx4tPorUhyxY7T3RfHkJUqFhvZAGGo77zAEszwgaM5DbDyb35rCJaslNbRZ2c mPF2vKaiuQO3FfGfloyCWPJjLhUipk5sRxXyEMPegaSkd3fi/5rhBBc/FzblOiOIsmrBw6rB lVWCg== IronPort-HdrOrdr: A9a23:BelfVqyk0NFLBGIL0wFUKrPwKr1zdoMgy1knxilNoRw8SKOlfq eV7ZMmPH7P+U8ssR4b+OxoVJPsfZqYz+8W3WBzB8bHYOCFgguVxehZhOOIqQEIWReOk9K1vZ 0QFZSWY+efMbEVt6rHCXGDYrUd/OU= X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="61420628" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Julien Grall , "Stefano Stabellini" , Wei Liu , Christian Lindig , David Scott Subject: [XEN PATCH 16/57] tools/ocaml: Remove generation of _paths.h Date: Mon, 6 Dec 2021 17:01:59 +0000 Message-ID: <20211206170241.13165-17-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 _paths.h isn't useful anymore in systemd_stubs. Signed-off-by: Anthony PERARD --- .gitignore | 1 - tools/ocaml/xenstored/Makefile | 7 ------- tools/ocaml/xenstored/systemd_stubs.c | 2 -- 3 files changed, 10 deletions(-) diff --git a/.gitignore b/.gitignore index 111eb03b86..b42264e209 100644 --- a/.gitignore +++ b/.gitignore @@ -409,7 +409,6 @@ tools/ocaml/libs/xentoollog/xentoollog.ml tools/ocaml/libs/xentoollog/xentoollog.mli tools/ocaml/libs/xs/paths.ml tools/ocaml/libs/xc/xenctrl_abi_check.h -tools/ocaml/xenstored/_paths.h tools/ocaml/xenstored/oxenstored tools/ocaml/xenstored/oxenstored.conf tools/ocaml/xenstored/paths.ml diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index 89ec3ec76a..0b5711b507 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -30,8 +30,6 @@ systemd_OBJS = systemd systemd_C_OBJS = systemd_stubs OCAML_LIBRARY += systemd -$(foreach obj,$(systemd_C_OBJS),$(obj).o): _paths.h - LIBS_systemd += $(LDFLAGS-y) OBJS = paths \ @@ -100,8 +98,3 @@ genpath-target = $(call buildmakevars2module,paths.ml) $(eval $(genpath-target)) GENERATED_FILES += paths.ml - -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - -GENERATE_FILES += _paths.h diff --git a/tools/ocaml/xenstored/systemd_stubs.c b/tools/ocaml/xenstored/systemd_stubs.c index 31a1a5d384..f4c875075a 100644 --- a/tools/ocaml/xenstored/systemd_stubs.c +++ b/tools/ocaml/xenstored/systemd_stubs.c @@ -27,8 +27,6 @@ #include -#include "_paths.h" - CAMLprim value ocaml_sd_notify_ready(value ignore) { CAMLparam1(ignore); From patchwork Mon Dec 6 17:02:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659011 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2B06FC433EF for ; Mon, 6 Dec 2021 17:07:49 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239481.415216 (Exim 4.92) (envelope-from ) id 1muHSm-0001dq-Ho; Mon, 06 Dec 2021 17:07:40 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239481.415216; Mon, 06 Dec 2021 17:07:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHSl-0001Zt-T3; Mon, 06 Dec 2021 17:07:39 +0000 Received: by outflank-mailman (input) for mailman id 239481; Mon, 06 Dec 2021 17:07:36 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOj-0005ta-Vz for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:30 +0000 Received: from esa4.hc3370-68.iphmx.com (esa4.hc3370-68.iphmx.com [216.71.155.144]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6efd5052-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:03:29 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6efd5052-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810208; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xZ8A4jgJ4Y38L4d9figc1Ddx9Yxc2qvFPaFW8MGy500=; b=HnkWPBaHObDBKQwgG5LZ6gF08fvqp4yXg/JWzUjs0elW+cWrkaEbTFFM lRnVjHUeBlqPm7ynSX6hTYLRZ2WS8mowd0T2NIrLPqr81bMM5OYR5GO3v T1M6aQZDqOVYNmRUK//BkZ9HqC0aSfq7PEajrbbZNxY3VlKSK9w8szB5l 4=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: repNzCQmembTuxtYYe4kLpCJIOHAMIBVWfcZn6aJyjwy5jPOmG9aQICne92kvFmNGgFtXLKp3n J0k6mD2z5fwGo2FZiB5SOJtEy0jwpEpEqbmBJLHgzazVhg73dwAxy9WdFEeHnVv8xAa2iPwp47 NFC9lTisWdhTLf5T7wMRr8z93+0fDD8T18a2OaYh6Wg/3hrqV2nav42XO+SgKlmcviVV2yQuCo AdsAwb7LMuUmKbv95RgPzBVDkIdTPXyAH4mKnvinjCIzksaOgCbbQ1PVy0kgUoK8gqUIiRoJtn V9sY3/Bpepaie9d3RCe9Vi98 X-SBRS: 5.1 X-MesageID: 61420633 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:OZlPaa6fPS2ASOrKJYN37wxRtN7AchMFZxGqfqrLsTDasY5as4F+v mAWW2+DPqmNa2LxeYglati3oBwF68DWnNJqHVZrpCFhHi5G8cbLO4+Ufxz6V8+wwmwvb67FA +E2MISowBUcFyeEzvuV3zyIQUBUjclkfJKlYAL/En03FVAMpBsJ00o5wrdj2tAw27BVPivW0 T/Mi5yHULOa82Yc3lI8s8pvfzs24ZweEBtB1rAPTagjUG32zhH5P7pGTU2FFFPqQ5E8IwKPb 72rIIdVXI/u10xF5tuNyt4Xe6CRK1LYFVDmZnF+A8BOjvXez8CbP2lS2Pc0MC9qZzu1c99Zl NFVhbq8WwITLqT0xOAtAkdADAUvBPgTkFPHCSDXXc27ykTHdz3nwul0DVFwNoodkgp1KTgQr 7pCcmlLN03dwbLtqF64YrAEasALJc/3PIQZqzd4wCvQF/oOSpHfWaTao9Rf2V/cg+gQRKqEP 5RCMlKDajzwbgEIP21ULqkOs7qi3GvAI2FIonmK8P9fD2/7k1UqjemF3MDuUt2VR+1Fk0CAv GXE8m/lRBYAO7S31j6t4n+qwOjVkkvTSI8UUbG16PNuqFmS3XAITg0bU0Ohpvu0gVL4XMhQQ 2Qd/DYuqq4jslSmVNDnUzW3pXeFulgXXN84LgEhwFjTkOyOuV/fXzVaCG4aADA7iCMobWAuz m+vk8HsPyxmiOGReSPD7qiw/ArnbED5MlQ+TSMDSAIE5fzqr4cykg/DQ75fLUKlsjHmMWqum m7X9UDSk51W1JdWjPvjoTgrlhr1/sCRJjPZ8Dk7SY5MAulRQIe+L7Kl5lHAhRqrBNbIFwLR1 JTodiX30QzvMX1vvHHUKAnuNOvwjxpgDNE6qQQ1d3XG327yk0NPhagKvFlDyL5Ba67ogwPBb k7Joh9275ROJnasZqIfS9vvUJR1l/m9T467CaC8gj9yjn5ZLlXvEMZGPxH44owQuBJ0zfFX1 WmzL65A8kr2+Yw4lWHrFo/xIJcgxzwkxHO7eHwI50/P7FZqX1bMEe1tGALXNogRtfrYyC2Io 4c3H5bbkH13DbyhChQ7BKZOdDjm21BgXsuowyGWH8beSjdb9JYJV6WMnOh/ItM9xMy4VI7gp xmAZ6OR83Kn7VWvFOlAQioLhGrHUcktoHQlEzYrOFr0iXEvbZz2tPUUdoctfKlh/+tmlKYmQ /4AcsSGI/JOVjWYpGhNMcij9NRvJEaxmAaDHyu5ezxjLZRucBPEp43/dQz1+ShQUifu7Zkio 6et3x/wSIYYQ1gwF97fbf+ilgvjvXUUlO9ocVHPJ91fJBfl/IRwcnSjhf4rOcAcbx7Ew2LCh QqRBB4Zo8jLopM0r4aV1fzV8d/xHrInTERAHmTd4bKnDgXg/zKukd1aTeKFXTHBT2eoqq+sU vpYkqPnO/odkVcU74clS+R3zbgz7sfErqNBylg2B23CalmmB+8yInSC2sUT5KRByqUA5FmzU 0OLvNJbJa+IKIXuF1tIfFgpaeGK1Pc1nDjO7KtqfBWmtXEvpLfXA19POxSsiTBGKOonOYwo9 u4tpcoK5lHtkREtKNuH0nhZ+mnkwqbsiEn7WkX22LPWtzc= IronPort-HdrOrdr: A9a23:WoN1567+X5EqBYCxqQPXwMLXdLJyesId70hD6qhwISY7TiX+rb HKoB17726StN9/YhAdcLy7VZVoIkmsl6Kdg7NwAV7KZmCP0wGVxelZnO/fKlbbdREWmNQw6U 4ZSdkcNOHN X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="61420633" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu Subject: [XEN PATCH 17/57] tools/xl: Remove unnecessary -I. from CFLAGS Date: Mon, 6 Dec 2021 17:02:00 +0000 Message-ID: <20211206170241.13165-18-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 GCC will search the directory where the source file is for quote-includes. Signed-off-by: Anthony PERARD --- tools/xl/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xl/Makefile b/tools/xl/Makefile index 656b21c7da..2e129f00e1 100644 --- a/tools/xl/Makefile +++ b/tools/xl/Makefile @@ -7,7 +7,7 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ -Wno-declaration-after-statement -Wformat-nonliteral -CFLAGS += -I. -fPIC +CFLAGS += -fPIC CFLAGS += $(PTHREAD_CFLAGS) LDFLAGS += $(PTHREAD_LDFLAGS) From patchwork Mon Dec 6 17:02:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659049 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 761B8C433FE for ; Mon, 6 Dec 2021 17:08:55 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239524.415446 (Exim 4.92) (envelope-from ) id 1muHTq-0005YQ-01; Mon, 06 Dec 2021 17:08:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239524.415446; Mon, 06 Dec 2021 17:08:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHTp-0005XQ-M4; Mon, 06 Dec 2021 17:08:45 +0000 Received: by outflank-mailman (input) for mailman id 239524; Mon, 06 Dec 2021 17:08:44 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOn-0005ti-Qt for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:34 +0000 Received: from esa4.hc3370-68.iphmx.com (esa4.hc3370-68.iphmx.com [216.71.155.144]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 700d862b-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:03:32 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 700d862b-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810211; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RWy6yBKQlpWU/yOobumQhfvikIxayYaBVBCgNTpsaGY=; b=Ix2xokHxeNA08wqscMEfNNR4NaOJBxqVXTDHwcwH1Kn+kE5BGOtgfUaU BzB8NalIk+peJ2Tq28kZWPye2WYm2HVYfg8Ii1V0KSp2kEjwKoKCtn1u3 UvIYfFTQYZTPufXSOFWoabirY4VFQH8D28I5f8s4+R7APixf8vQtYo/W2 o=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: obWCpb7PgP7lGZ/vw06wj6m0gHJBU8RE7gWQvx/pTLNahDBgblg3U6Q5ByCSCSgbzGB1F2w1pI SL2+zthHzTPYMe/ysIqhbJzJ8iRLQjLQFn9zlME7hEHLm/ABXeTfl1FntUXy5wCtW+6IVvfY0e A99BeNIHArW4xCNfYOXx38dYSD7D49oVwlnT3SdXdmRVxH+OGZQ4peOhu7qT6V6XR4JQ8ICusd xG9Xk/5q7zO3oIA2pRZshU/64X64SioAxjtXU79vnLeQIeZ2lLM1j7HTGDCSnprpYF61AWbh0X BaOrReTNfUx/zR8hhEH85UBQ X-SBRS: 5.1 X-MesageID: 61420642 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:hqg2YKr+XxWLlLt/GyNHLjxo2YleBmKyYhIvgKrLsJaIsI4StFCzt garIBnUM/7bazOgfN8nYNu1pkxXvsSBnIUwQFQ//CBkEyhD9JuZCYyVIHmrMnLJJKUvbq7GA +byyDXkBJppJpMJjk71atANlZT4vE2xbuKU5NTsY0idfic5Dnd+4f5fs7Rh2Ncx24DnW1nlV e7a+KUzBnf0g1aYDUpMg06zgEsHUCPa4W5wUvQWPJinjXeG/5UnJMt3yZKZdhMUdrJ8DO+iL 9sv+Znilo/vE7XBPfv++lrzWhVirrc/pmFigFIOM0SpqkAqSiDfTs/XnRfTAKtao2zhojx/9 DlCncS+STUCY4fzpLUYakV9CDBgAbFa5IaSdBBTseTLp6HHW37lwvEoB0AqJ4wIvO1wBAmi9 9RBdmpLNErawbvrnvTrEYGAhex6RCXvFIoZpnFnyyCfFfs8SIrPa67L+cVZzHE7gcUm8fP2O ZNFM2IxME6ojxtnPQkuBrE6kPmU2nTnaB1BuXHJt6E72j2GpOB2+Oe0a4eEEjCQfu1OhVqRr G/C+2X/AzkZOcaZxD7D9Wij7sfNgCf6VYQ6BLC+sPlwjzW7xGMJDwYNfUCmuvT/gUm7M/pAL 2QE9yxoqrI9nGSiSMX9WBup5maJpBcGV/JfFuQ77EeGza+8yxaUAC0IQyBMbPQitdQqXno62 1mRhdTrCDdz9rqPRhq19L2ZsDezMig9NnIZaGkPSg5ty9j8oqkjgxTXVNFhHaWpyNrvFlnNL yui9XZkwe9J1IhSivv9rQuvby+QSobhFgA11C6KdF2ZvwZAOKu+dpKU9UTH1KMVRGqGdWWps H8BksmYyekBC5CRiSCAKNkw8KGVC+Wta2OF3wM2d3U133H0oiP4I9gMiN1rDB4xap5sRNP/X KPEVeq9Drd3NWDiU6J4apnZ5y8Cnfm5ToSNuhw5g7NzjnlNmO2voXgGia24hTmFfK0QfUcXY 83znSGEVylyNEif5GDqL9rxKJdyrszE+UvdRIrg0zOs2qeEaXieRN8taQXVPr9jvf7e+luKo 76z0vdmLT0FCoUShQGNruYuwa0idyBnVfgaVeQJHgJ8HuaWMD54UKKAqV/QU4dkg75Uho/1E oKVASdlJK7ErSSfc22iMyk7AJu2BMoXhS9rbEQEYAfzs1B+MNnH0UvqX8ZuFVXR3Lc4lqAco jhsU5joP8mjvRyboWlANsek89Q5HPlp7CrXVxeYjPEEV8YIb2T0FhXMJ2MDLQECUXi6s9UQu bql2l+JSJYPXV06Xs3XdOiu3xW6un1EwLB+WE7BI99yfkTw8dc1d3yt36Fve8xcew/ewja61 hqNBUtKr+f6vIJoosLCgrqJrtn1HrImTFZaBWTS8Z2/KTLeoji42YZFXevRJWLdWWr49b+Mf +JQy/2gYvQLkEwT69h3EqpxzLJ47Nzq/ucIwgNhFXTNTlKqFrI/fSXWgZgR7vVAn+YLtxG3V 0SD/shhFY+IYM61QkQMIAcFb/iY0a1GkDfl8vlocl7x4zV6/eTbXBwKbQWMkiFUMJB8LJghn bU6oMcT5gGy1kgqP9KBgnwG/miANCVdAaAut5VcC473kAs7jFpFZMWEWCPx5ZiObfRKM1Urf WDI1PaT2ewEyxqQaWc3GFjMwfFZ1MYHtx19xVMfI0iEx4jejfgt0RwNqTk6Q2y5FPmcPz6f7 oSzC3BIGA== IronPort-HdrOrdr: A9a23:Db7ZU6k+b6ypTBP9Y1458iQUkWPpDfIm3DAbv31ZSRFFG/Fxl6 iV88jzsiWE7Qr5OUtQ/uxoV5PgfZqxz/NICOoqTNWftWvd2FdARbsKheCJ/9SJIVybygc378 ldmsZFZOEYdWIK7vrH3A== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="61420642" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Julien Grall , "Stefano Stabellini" , Wei Liu , Juergen Gross Subject: [XEN PATCH 18/57] tools: Use config.h from autoconf instead of "buildmakevars2header" Date: Mon, 6 Dec 2021 17:02:01 +0000 Message-ID: <20211206170241.13165-19-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 This avoid the need to generate the _paths.h header when the information is from autoconf anyway. They are no more users of the "buildmakevars2header" macro, so it can be removed from "Config.mk". Also removed the extra "-f" flag where "$(RM)" is used (xl/Makefile). Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- Config.mk | 9 ------ tools/libs/libs.mk | 1 - .gitignore | 6 ---- configure | 45 ++++++++++++++++++++++++++++ docs/configure | 45 ++++++++++++++++++++++++++++ m4/paths.m4 | 9 ++++++ tools/config.h.in | 27 +++++++++++++++++ tools/configure | 45 ++++++++++++++++++++++++++++ tools/console/Makefile | 12 ++------ tools/console/client/main.c | 1 - tools/console/daemon/main.c | 1 - tools/helpers/Makefile | 8 ++--- tools/helpers/init-xenstore-domain.c | 1 - tools/libs/guest/Makefile | 5 ---- tools/libs/guest/xg_dom_core.c | 1 - tools/libs/guest/xg_suspend.c | 1 - tools/libs/light/Makefile | 8 ++--- tools/libs/light/libxl_dom.c | 2 -- tools/libs/light/libxl_internal.h | 1 - tools/libs/light/libxl_utils.c | 1 - tools/libs/stat/Makefile | 7 +---- tools/libs/stat/xenstat_qmp.c | 1 - tools/xl/Makefile | 7 +---- tools/xl/xl.h | 1 - 24 files changed, 179 insertions(+), 66 deletions(-) diff --git a/Config.mk b/Config.mk index 6587c7d626..1c1998a5a8 100644 --- a/Config.mk +++ b/Config.mk @@ -167,15 +167,6 @@ define buildmakevars2file-closure $(call move-if-changed,$(1).tmp,$(1)) endef -buildmakevars2header = $(eval $(call buildmakevars2header-closure,$(1))) -define buildmakevars2header-closure - $(1): .phony - rm -f $(1).tmp; \ - $(foreach var, $(BUILD_MAKE_VARS), \ - echo "#define $(var) \"$($(var))\"" >>$(1).tmp;) \ - $(call move-if-changed,$(1).tmp,$(1)) -endef - CFLAGS += -fno-strict-aliasing CFLAGS += -std=gnu99 diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index dfbbef4080..5c2f16dda4 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -132,7 +132,6 @@ clean: rm -f lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) lib$(LIB_FILE_NAME).so.$(MAJOR) rm -f headers.chk headers.lst rm -f $(PKG_CONFIG) - rm -f _paths.h .PHONY: distclean distclean: clean diff --git a/.gitignore b/.gitignore index b42264e209..b39b996718 100644 --- a/.gitignore +++ b/.gitignore @@ -123,7 +123,6 @@ tools/libs/foreignmemory/headers.chk tools/libs/foreignmemory/xenforeignmemory.pc tools/libs/devicemodel/headers.chk tools/libs/devicemodel/xendevicemodel.pc -tools/libs/guest/_*.[ch] tools/libs/guest/libxenguest.map tools/libs/guest/xenguest.pc tools/libs/guest/xc_bitops.h @@ -146,7 +145,6 @@ tools/libs/light/test_timedereg tools/libs/light/test_fdderegrace tools/libs/light/tmp.* tools/libs/light/xenlight.pc -tools/libs/stat/_paths.h tools/libs/stat/headers.chk tools/libs/stat/libxenstat.map tools/libs/stat/xenstat.pc @@ -163,8 +161,6 @@ tools/libs/vchan/libxenvchan.map tools/libs/vchan/xenvchan.pc tools/console/xenconsole tools/console/xenconsoled -tools/console/client/_paths.h -tools/console/daemon/_paths.h tools/debugger/gdb/gdb-6.2.1-linux-i386-xen/* tools/debugger/gdb/gdb-6.2.1/* tools/debugger/gdb/gdb-6.2.1.tar.bz2 @@ -207,7 +203,6 @@ tools/fuzz/x86_instruction_emulator/afl-harness-cov tools/fuzz/x86_instruction_emulator/wrappers.c tools/fuzz/x86_instruction_emulator/x86_emulate tools/fuzz/x86_instruction_emulator/x86-emulate.[ch] -tools/helpers/_paths.h tools/helpers/init-xenstore-domain tools/helpers/xen-init-dom0 tools/hotplug/common/hotplugpath.sh @@ -422,7 +417,6 @@ tools/firmware/etherboot/ipxe.tar.gz tools/firmware/etherboot/ipxe/ tools/python/xen/lowlevel/xl/_pyxl_types.c tools/python/xen/lowlevel/xl/_pyxl_types.h -tools/xl/_paths.h tools/xl/xl docs/txt/misc/*.txt diff --git a/configure b/configure index 502273b263..bb7f27ddad 100755 --- a/configure +++ b/configure @@ -1946,6 +1946,11 @@ CONFIG_DIR=$sysconfdir XEN_CONFIG_DIR=$CONFIG_DIR/xen +cat >>confdefs.h <<_ACEOF +#define XEN_CONFIG_DIR "$XEN_CONFIG_DIR" +_ACEOF + + # Check whether --with-initddir was given. if test "${with_initddir+set}" = set; then : @@ -1998,6 +2003,11 @@ fi XEN_SCRIPT_DIR=$xen_scriptdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_SCRIPT_DIR "$XEN_SCRIPT_DIR" +_ACEOF + + # Check whether --with-xen-dumpdir was given. if test "${with_xen_dumpdir+set}" = set; then : @@ -2038,6 +2048,11 @@ LIBEXEC=`eval echo $libexecdir/$libexec_subdir` LIBEXEC_BIN=${LIBEXEC}/bin + +cat >>confdefs.h <<_ACEOF +#define LIBEXEC_BIN "$LIBEXEC_BIN" +_ACEOF + LIBEXEC_LIB=${LIBEXEC}/lib LIBEXEC_INC=${LIBEXEC}/include @@ -2045,12 +2060,27 @@ LIBEXEC_INC=${LIBEXEC}/include XENFIRMWAREDIR=${LIBEXEC}/boot +cat >>confdefs.h <<_ACEOF +#define XENFIRMWAREDIR "$XENFIRMWAREDIR" +_ACEOF + + XEN_RUN_DIR=$rundir_path/xen +cat >>confdefs.h <<_ACEOF +#define XEN_RUN_DIR "$XEN_RUN_DIR" +_ACEOF + + XEN_LOG_DIR=$localstatedir/log/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LOG_DIR "$XEN_LOG_DIR" +_ACEOF + + XEN_LIB_STORED=$localstatedir/lib/xenstored @@ -2060,6 +2090,11 @@ XEN_RUN_STORED=$rundir_path/xenstored XEN_LIB_DIR=$localstatedir/lib/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LIB_DIR "$XEN_LIB_DIR" +_ACEOF + + SHAREDIR=$prefix/share @@ -2073,12 +2108,22 @@ case "$host_os" in esac +cat >>confdefs.h <<_ACEOF +#define XEN_LOCK_DIR "$XEN_LOCK_DIR" +_ACEOF + + XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging XEN_DUMP_DIR=$xen_dumpdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_DUMP_DIR "$XEN_DUMP_DIR" +_ACEOF + + DEBUG_DIR=$debugdir_path diff --git a/docs/configure b/docs/configure index f93d086e9a..d4fced9858 100755 --- a/docs/configure +++ b/docs/configure @@ -1849,6 +1849,11 @@ CONFIG_DIR=$sysconfdir XEN_CONFIG_DIR=$CONFIG_DIR/xen +cat >>confdefs.h <<_ACEOF +#define XEN_CONFIG_DIR "$XEN_CONFIG_DIR" +_ACEOF + + # Check whether --with-initddir was given. if test "${with_initddir+set}" = set; then : @@ -1901,6 +1906,11 @@ fi XEN_SCRIPT_DIR=$xen_scriptdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_SCRIPT_DIR "$XEN_SCRIPT_DIR" +_ACEOF + + # Check whether --with-xen-dumpdir was given. if test "${with_xen_dumpdir+set}" = set; then : @@ -1941,6 +1951,11 @@ LIBEXEC=`eval echo $libexecdir/$libexec_subdir` LIBEXEC_BIN=${LIBEXEC}/bin + +cat >>confdefs.h <<_ACEOF +#define LIBEXEC_BIN "$LIBEXEC_BIN" +_ACEOF + LIBEXEC_LIB=${LIBEXEC}/lib LIBEXEC_INC=${LIBEXEC}/include @@ -1948,12 +1963,27 @@ LIBEXEC_INC=${LIBEXEC}/include XENFIRMWAREDIR=${LIBEXEC}/boot +cat >>confdefs.h <<_ACEOF +#define XENFIRMWAREDIR "$XENFIRMWAREDIR" +_ACEOF + + XEN_RUN_DIR=$rundir_path/xen +cat >>confdefs.h <<_ACEOF +#define XEN_RUN_DIR "$XEN_RUN_DIR" +_ACEOF + + XEN_LOG_DIR=$localstatedir/log/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LOG_DIR "$XEN_LOG_DIR" +_ACEOF + + XEN_LIB_STORED=$localstatedir/lib/xenstored @@ -1963,6 +1993,11 @@ XEN_RUN_STORED=$rundir_path/xenstored XEN_LIB_DIR=$localstatedir/lib/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LIB_DIR "$XEN_LIB_DIR" +_ACEOF + + SHAREDIR=$prefix/share @@ -1976,12 +2011,22 @@ case "$host_os" in esac +cat >>confdefs.h <<_ACEOF +#define XEN_LOCK_DIR "$XEN_LOCK_DIR" +_ACEOF + + XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging XEN_DUMP_DIR=$xen_dumpdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_DUMP_DIR "$XEN_DUMP_DIR" +_ACEOF + + DEBUG_DIR=$debugdir_path diff --git a/m4/paths.m4 b/m4/paths.m4 index 7be314a3e2..826faada45 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -39,6 +39,7 @@ AC_SUBST(CONFIG_DIR) XEN_CONFIG_DIR=$CONFIG_DIR/xen AC_SUBST(XEN_CONFIG_DIR) +AC_DEFINE_UNQUOTED([XEN_CONFIG_DIR], ["$XEN_CONFIG_DIR"], [Xen's config dir]) AC_ARG_WITH([initddir], AS_HELP_STRING([--with-initddir=DIR], @@ -83,6 +84,7 @@ AC_ARG_WITH([xen-scriptdir], [xen_scriptdir_path=$XEN_CONFIG_DIR/scripts]) XEN_SCRIPT_DIR=$xen_scriptdir_path AC_SUBST(XEN_SCRIPT_DIR) +AC_DEFINE_UNQUOTED([XEN_SCRIPT_DIR], ["$XEN_SCRIPT_DIR"], [Xen's script dir]) AC_ARG_WITH([xen-dumpdir], AS_HELP_STRING([--with-xen-dumpdir=DIR], @@ -117,18 +119,22 @@ AC_SUBST(LIBEXEC) dnl These variables will be substituted in various .in files LIBEXEC_BIN=${LIBEXEC}/bin AC_SUBST(LIBEXEC_BIN) +AC_DEFINE_UNQUOTED([LIBEXEC_BIN], ["$LIBEXEC_BIN"], [Xen's libexec path]) LIBEXEC_LIB=${LIBEXEC}/lib AC_SUBST(LIBEXEC_LIB) LIBEXEC_INC=${LIBEXEC}/include AC_SUBST(LIBEXEC_INC) XENFIRMWAREDIR=${LIBEXEC}/boot AC_SUBST(XENFIRMWAREDIR) +AC_DEFINE_UNQUOTED([XENFIRMWAREDIR], ["$XENFIRMWAREDIR"], [Xen's firmware dir]) XEN_RUN_DIR=$rundir_path/xen AC_SUBST(XEN_RUN_DIR) +AC_DEFINE_UNQUOTED([XEN_RUN_DIR], ["$XEN_RUN_DIR"], [Xen's runstate path]) XEN_LOG_DIR=$localstatedir/log/xen AC_SUBST(XEN_LOG_DIR) +AC_DEFINE_UNQUOTED([XEN_LOG_DIR], ["$XEN_LOG_DIR"], [Xen's log dir]) XEN_LIB_STORED=$localstatedir/lib/xenstored AC_SUBST(XEN_LIB_STORED) @@ -138,6 +144,7 @@ AC_SUBST(XEN_RUN_STORED) XEN_LIB_DIR=$localstatedir/lib/xen AC_SUBST(XEN_LIB_DIR) +AC_DEFINE_UNQUOTED([XEN_LIB_DIR], ["$XEN_LIB_DIR"], [Xen's lib dir]) SHAREDIR=$prefix/share AC_SUBST(SHAREDIR) @@ -151,12 +158,14 @@ case "$host_os" in *) XEN_LOCK_DIR=$localstatedir/lock ;; esac AC_SUBST(XEN_LOCK_DIR) +AC_DEFINE_UNQUOTED([XEN_LOCK_DIR], ["$XEN_LOCK_DIR"], [Xen's lock dir]) XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging AC_SUBST(XEN_PAGING_DIR) XEN_DUMP_DIR=$xen_dumpdir_path AC_SUBST(XEN_DUMP_DIR) +AC_DEFINE_UNQUOTED([XEN_DUMP_DIR], ["$XEN_DUMP_DIR"], [Xen's dump directory]) DEBUG_DIR=$debugdir_path AC_SUBST(DEBUG_DIR) diff --git a/tools/config.h.in b/tools/config.h.in index 52e01b2c84..9563d3acb6 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -96,6 +96,9 @@ /* IPXE path */ #undef IPXE_PATH +/* Xen's libexec path */ +#undef LIBEXEC_BIN + /* OVMF path */ #undef OVMF_PATH @@ -129,6 +132,30 @@ /* QMP proxy path */ #undef STUBDOM_QMP_PROXY_PATH +/* Xen's firmware dir */ +#undef XENFIRMWAREDIR + +/* Xen's config dir */ +#undef XEN_CONFIG_DIR + +/* Xen's dump directory */ +#undef XEN_DUMP_DIR + +/* Xen's lib dir */ +#undef XEN_LIB_DIR + +/* Xen's lock dir */ +#undef XEN_LOCK_DIR + +/* Xen's log dir */ +#undef XEN_LOG_DIR + +/* Xen's runstate path */ +#undef XEN_RUN_DIR + +/* Xen's script dir */ +#undef XEN_SCRIPT_DIR + /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE # define _DARWIN_USE_64_BIT_INODE 1 diff --git a/tools/configure b/tools/configure index 8e4a59c2cb..829753b5dd 100755 --- a/tools/configure +++ b/tools/configure @@ -3926,6 +3926,11 @@ CONFIG_DIR=$sysconfdir XEN_CONFIG_DIR=$CONFIG_DIR/xen +cat >>confdefs.h <<_ACEOF +#define XEN_CONFIG_DIR "$XEN_CONFIG_DIR" +_ACEOF + + # Check whether --with-initddir was given. if test "${with_initddir+set}" = set; then : @@ -3978,6 +3983,11 @@ fi XEN_SCRIPT_DIR=$xen_scriptdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_SCRIPT_DIR "$XEN_SCRIPT_DIR" +_ACEOF + + # Check whether --with-xen-dumpdir was given. if test "${with_xen_dumpdir+set}" = set; then : @@ -4018,6 +4028,11 @@ LIBEXEC=`eval echo $libexecdir/$libexec_subdir` LIBEXEC_BIN=${LIBEXEC}/bin + +cat >>confdefs.h <<_ACEOF +#define LIBEXEC_BIN "$LIBEXEC_BIN" +_ACEOF + LIBEXEC_LIB=${LIBEXEC}/lib LIBEXEC_INC=${LIBEXEC}/include @@ -4025,12 +4040,27 @@ LIBEXEC_INC=${LIBEXEC}/include XENFIRMWAREDIR=${LIBEXEC}/boot +cat >>confdefs.h <<_ACEOF +#define XENFIRMWAREDIR "$XENFIRMWAREDIR" +_ACEOF + + XEN_RUN_DIR=$rundir_path/xen +cat >>confdefs.h <<_ACEOF +#define XEN_RUN_DIR "$XEN_RUN_DIR" +_ACEOF + + XEN_LOG_DIR=$localstatedir/log/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LOG_DIR "$XEN_LOG_DIR" +_ACEOF + + XEN_LIB_STORED=$localstatedir/lib/xenstored @@ -4040,6 +4070,11 @@ XEN_RUN_STORED=$rundir_path/xenstored XEN_LIB_DIR=$localstatedir/lib/xen +cat >>confdefs.h <<_ACEOF +#define XEN_LIB_DIR "$XEN_LIB_DIR" +_ACEOF + + SHAREDIR=$prefix/share @@ -4053,12 +4088,22 @@ case "$host_os" in esac +cat >>confdefs.h <<_ACEOF +#define XEN_LOCK_DIR "$XEN_LOCK_DIR" +_ACEOF + + XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging XEN_DUMP_DIR=$xen_dumpdir_path +cat >>confdefs.h <<_ACEOF +#define XEN_DUMP_DIR "$XEN_DUMP_DIR" +_ACEOF + + DEBUG_DIR=$debugdir_path diff --git a/tools/console/Makefile b/tools/console/Makefile index 3f4cddab03..207c04c9cd 100644 --- a/tools/console/Makefile +++ b/tools/console/Makefile @@ -22,27 +22,19 @@ all: $(BIN) clean: $(RM) *.a *.so *.o *.rpm $(BIN) $(DEPS_RM) $(RM) client/*.o daemon/*.o - $(RM) client/_paths.h - $(RM) daemon/_paths.h .PHONY: distclean distclean: clean -daemon/main.o: daemon/_paths.h +daemon/main.o: CFLAGS += -include $(XEN_ROOT)/tools/config.h daemon/io.o: CFLAGS += $(CFLAGS_libxenevtchn) $(CFLAGS_libxengnttab) $(CFLAGS_libxenforeignmemory) $(CONSOLE_CFLAGS-y) xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c)) $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxenforeignmemory) $(LDLIBS_xenconsoled) $(APPEND_LDFLAGS) -client/main.o: client/_paths.h +client/main.o: CFLAGS += -include $(XEN_ROOT)/tools/config.h xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c)) $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_xenconsole) $(APPEND_LDFLAGS) -genpath-target = $(call buildmakevars2header,client/_paths.h) -$(eval $(genpath-target)) - -genpath-target = $(call buildmakevars2header,daemon/_paths.h) -$(eval $(genpath-target)) - .PHONY: install install: $(BIN) $(INSTALL_DIR) $(DESTDIR)/$(sbindir) diff --git a/tools/console/client/main.c b/tools/console/client/main.c index 80157be421..ada6728caa 100644 --- a/tools/console/client/main.c +++ b/tools/console/client/main.c @@ -41,7 +41,6 @@ #include #include "xenctrl.h" -#include "_paths.h" #define ESCAPE_CHARACTER 0x1d diff --git a/tools/console/daemon/main.c b/tools/console/daemon/main.c index 30124a1c19..aac7233a48 100644 --- a/tools/console/daemon/main.c +++ b/tools/console/daemon/main.c @@ -31,7 +31,6 @@ #include "utils.h" #include "io.h" -#include "_paths.h" int log_reload = 0; int log_guest = 0; diff --git a/tools/helpers/Makefile b/tools/helpers/Makefile index 1bcc97ea8a..7f6c422440 100644 --- a/tools/helpers/Makefile +++ b/tools/helpers/Makefile @@ -24,6 +24,7 @@ $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenguest) $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenstore) $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenlight) +$(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h .PHONY: all all: $(PROGS) @@ -31,8 +32,6 @@ all: $(PROGS) xen-init-dom0: $(XEN_INIT_DOM0_OBJS) $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS) $(LDLIBS_libxenctrl) $(LDLIBS_libxentoollog) $(LDLIBS_libxenstore) $(LDLIBS_libxenlight) $(APPEND_LDFLAGS) -$(INIT_XENSTORE_DOMAIN_OBJS): _paths.h - init-xenstore-domain: $(INIT_XENSTORE_DOMAIN_OBJS) $(CC) $(LDFLAGS) -o $@ $(INIT_XENSTORE_DOMAIN_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenlight) $(APPEND_LDFLAGS) @@ -47,9 +46,6 @@ uninstall: .PHONY: clean clean: - $(RM) -f *.o $(PROGS) $(DEPS_RM) _paths.h + $(RM) -f *.o $(PROGS) $(DEPS_RM) distclean: clean - -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) diff --git a/tools/helpers/init-xenstore-domain.c b/tools/helpers/init-xenstore-domain.c index b205a79ee6..dba4292803 100644 --- a/tools/helpers/init-xenstore-domain.c +++ b/tools/helpers/init-xenstore-domain.c @@ -16,7 +16,6 @@ #include #include "init-dom-json.h" -#include "_paths.h" #define LAPIC_BASE_ADDRESS 0xfee00000UL #define MB(x) ((uint64_t)x << 20) diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile index c6d882e239..8f5f3acd21 100644 --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -106,11 +106,6 @@ include $(XEN_ROOT)/tools/libs/libs.mk libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(filter -l%,$(zlib-options)) libxenguest.so.$(MAJOR).$(MINOR): APPEND_LDFLAGS += $(COMPRESSION_LIBS) -lz -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - -$(LIB_OBJS) $(PIC_OBJS): _paths.h - -include $(DEPS_INCLUDE) .PHONY: cleanlocal diff --git a/tools/libs/guest/xg_dom_core.c b/tools/libs/guest/xg_dom_core.c index 2e4c1330ea..c17cf9f712 100644 --- a/tools/libs/guest/xg_dom_core.c +++ b/tools/libs/guest/xg_dom_core.c @@ -33,7 +33,6 @@ #define XG_NEED_UNALIGNED #include "xg_private.h" -#include "_paths.h" /* ------------------------------------------------------------------------ */ /* debugging */ diff --git a/tools/libs/guest/xg_suspend.c b/tools/libs/guest/xg_suspend.c index 128353029c..0ce6364963 100644 --- a/tools/libs/guest/xg_suspend.c +++ b/tools/libs/guest/xg_suspend.c @@ -19,7 +19,6 @@ #include #include "xc_private.h" -#include "_paths.h" #include "xenguest.h" #define SUSPEND_LOCK_FILE XEN_RUN_DIR "/suspend-evtchn-%d.lock" diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index bfd58226ce..fb5a9ca87e 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -153,7 +153,7 @@ LIBXL_TEST_OBJS += $(foreach t, $(LIBXL_TESTS_INSIDE),libxl_test_$t.opic) TEST_PROG_OBJS += $(foreach t, $(LIBXL_TESTS_PROGS),test_$t.o) test_common.o TEST_PROGS += $(foreach t, $(LIBXL_TESTS_PROGS),test_$t) -AUTOINCS = $(XEN_INCLUDE)/_libxl_list.h _paths.h _libxl_save_msgs_callout.h _libxl_save_msgs_helper.h +AUTOINCS = $(XEN_INCLUDE)/_libxl_list.h _libxl_save_msgs_callout.h _libxl_save_msgs_helper.h AUTOSRCS = _libxl_save_msgs_callout.c _libxl_save_msgs_helper.c CLIENTS = testidl libxl-save-helper @@ -191,9 +191,6 @@ build: $(CLIENTS) $(TEST_PROGS) $(AUTOSRCS) $(AUTOINCS) $(LIB_OBJS) $(PIC_OBJS) $(SAVE_HELPER_OBJS) $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS): $(AUTOINCS) libxl.api-ok -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - libxl.api-ok: check-libxl-api-rules _libxl.api-for-check $(PERL) $^ touch $@ @@ -216,9 +213,8 @@ _libxl_save_msgs_helper.h _libxl_save_msgs_callout.h: \ $(XEN_INCLUDE)/libxl.h: $(XEN_INCLUDE)/_libxl_types.h $(XEN_INCLUDE)/_libxl_list.h $(XEN_INCLUDE)/libxl_json.h: $(XEN_INCLUDE)/_libxl_types_json.h -libxl_internal.h: _libxl_types_internal.h _libxl_types_private.h _libxl_types_internal_private.h _paths.h +libxl_internal.h: _libxl_types_internal.h _libxl_types_private.h _libxl_types_internal_private.h libxl_internal_json.h: _libxl_types_internal_json.h -xl.h: _paths.h $(LIB_OBJS) $(PIC_OBJS) $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS) $(SAVE_HELPER_OBJS): $(XEN_INCLUDE)/libxl.h $(LIB_OBJS) $(PIC_OBJS) $(LIBXL_TEST_OBJS): libxl_internal.h diff --git a/tools/libs/light/libxl_dom.c b/tools/libs/light/libxl_dom.c index fe9f760f71..c28867f87b 100644 --- a/tools/libs/light/libxl_dom.c +++ b/tools/libs/light/libxl_dom.c @@ -24,8 +24,6 @@ #include #include -#include "_paths.h" - //#define DEBUG 1 libxl_domain_type libxl__domain_type(libxl__gc *gc, uint32_t domid) diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_internal.h index 0b4671318c..37d5c27756 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -73,7 +73,6 @@ #endif #include "libxl.h" -#include "_paths.h" #include "_libxl_save_msgs_callout.h" #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) diff --git a/tools/libs/light/libxl_utils.c b/tools/libs/light/libxl_utils.c index 4699c4a0a3..b91c2cafa2 100644 --- a/tools/libs/light/libxl_utils.c +++ b/tools/libs/light/libxl_utils.c @@ -18,7 +18,6 @@ #include #include "libxl_internal.h" -#include "_paths.h" #ifndef LIBXL_HAVE_NONCONST_LIBXL_BASENAME_RETURN_VALUE const diff --git a/tools/libs/stat/Makefile b/tools/libs/stat/Makefile index 911a2de8ec..01417b5334 100644 --- a/tools/libs/stat/Makefile +++ b/tools/libs/stat/Makefile @@ -30,8 +30,6 @@ APPEND_LDFLAGS += $(LDLIBS-y) include $(XEN_ROOT)/tools/libs/libs.mk -$(LIB_OBJS) $(PIC_OBJS): _paths.h - PYLIB=bindings/swig/python/_xenstat.so PYMOD=bindings/swig/python/xenstat.py PYSRC=bindings/swig/python/_xenstat.c @@ -121,10 +119,7 @@ clean: cleanlocal .PHONY: cleanlocal cleanlocal: - rm -f $(BINDINGS) $(BINDINGSRC) $(DEPS_RM) _paths.h + rm -f $(BINDINGS) $(BINDINGSRC) $(DEPS_RM) rm -f libxenstat.map -include $(DEPS_INCLUDE) - -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) diff --git a/tools/libs/stat/xenstat_qmp.c b/tools/libs/stat/xenstat_qmp.c index 2205a04131..9909b9727e 100644 --- a/tools/libs/stat/xenstat_qmp.c +++ b/tools/libs/stat/xenstat_qmp.c @@ -23,7 +23,6 @@ #include #include "xenstat_priv.h" -#include "_paths.h" #ifdef HAVE_YAJL_YAJL_VERSION_H # include diff --git a/tools/xl/Makefile b/tools/xl/Makefile index 2e129f00e1..b7f439121a 100644 --- a/tools/xl/Makefile +++ b/tools/xl/Makefile @@ -29,11 +29,6 @@ $(XL_OBJS): CFLAGS += $(CFLAGS_libxentoollog) $(XL_OBJS): CFLAGS += $(CFLAGS_XL) $(XL_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h # libxl_json.h needs it. -genpath-target = $(call buildmakevars2header,_paths.h) -$(eval $(genpath-target)) - -$(XL_OBJS): _paths.h - .PHONY: all all: xl @@ -54,7 +49,7 @@ uninstall: .PHONY: clean clean: - $(RM) -f *.o xl _paths.h $(DEPS_RM) + $(RM) *.o xl $(DEPS_RM) distclean: clean diff --git a/tools/xl/xl.h b/tools/xl/xl.h index cf12c79a9b..c5c4bedbdd 100644 --- a/tools/xl/xl.h +++ b/tools/xl/xl.h @@ -17,7 +17,6 @@ #include -#include "_paths.h" #include struct cmd_spec { From patchwork Mon Dec 6 17:02:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ADA72C4332F for ; Mon, 6 Dec 2021 17:07:46 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239476.415187 (Exim 4.92) (envelope-from ) id 1muHSj-0000rY-DF; Mon, 06 Dec 2021 17:07:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239476.415187; Mon, 06 Dec 2021 17:07:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHSi-0000py-Vb; Mon, 06 Dec 2021 17:07:36 +0000 Received: by outflank-mailman (input) for mailman id 239476; Mon, 06 Dec 2021 17:07:35 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOq-0005ti-Ho for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:36 +0000 Received: from esa6.hc3370-68.iphmx.com (esa6.hc3370-68.iphmx.com [216.71.155.175]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 714dd024-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:03:34 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 714dd024-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810214; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=87Jwg3dUCW2JRgwzDCH17RKTaiNypi0W5MI+j9zb2Dw=; b=LQZ1fSRynnjoshix7PuQJUgu4lwgFfIx5cXQl47wdlSPOeFSCWkQQFCU 6hy+1H35iV3yaZ2rlwXE2i+KdjFZVVy0kDROboZgan1IyARYSwBKH28C9 FWXsqcLPqeqFhx5NYmtBU02VEtWOm0P6HoH+25dss2LULOtyp35kbOcM/ k=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: aRgDtDW9+i7arDAhUgwN9Wt3ZP+K9bzn48v7bdjUxgCDVK4pTw3RyGQ/3ZpDYguReP0VIyqa8g P+AMN+z2PsPWPaBKj2RNfhnMiKc/q+YpE9wEJ0eCYZYcrEwvC8D6evICfZaAcSWZvUfl+UAgpj tiesAr6vB1vHb2CtvL5UEVbgBJDFERpA/7T8s47WHyug4QkBleYKfDj4npuUULkHrMIxoCy/oF X37WQBIXSp5FNrSOo7AGmwf49WYlWBZnI8xZicEgk5R4VqII/lvsMxu0s+CTnlOtribpmLBRrn 4sy7WHlXmCM8U2pSY/0RXVZ5 X-SBRS: 5.1 X-MesageID: 59324028 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:ejcUyqNr2ibBIcDvrR1UkMFynXyQoLVcMsEvi/4bfWQNrUoj0TEHz mRJDTvTP/vYMDHzftF3Odu1801TupPRn4dlQAto+SlhQUwRpJueD7x1DKtR0wB+jCHnZBg6h ynLQoCYdKjYdpJYz/uUGuCJQUNUjMlkfZKhTr6bUsxNbVU8En5400o9w7RRbrNA2rBVPSvc4 bsenOWHULOV82Yc3rU8sv/rRLtH5ZweiRtA1rAMTakjUGz2zhH5OKk3N6CpR0YUd6EPdgKMq 0Qv+5nilo/R109F5tpICd8XeGVSKlLZFVDmZna7x8FOK/WNz8A/+v9TCRYSVatYoyi1rfVSw tdOjMyTdwk1bojjg88dbSANRkmSPYUekFPGCX22sMjVxEzaaXr8hf5pCSnaP6VBpLwxWzsXs 6VFdnZdNXhvhMrvqF6/YuBqmsQkKtitJI4Fs2ts5TrYEewnUdbIRKCiCdpwgWZr3JwWR6a2i 8wxWSo/MyrQWkJzCnwSJ8wQhPy5mGDfWmgNwL6SjfVuuDWCpOBr65DyNPLFd9rMQt9a9m6aq XjB5H/RGQwBOZqUzj/t2nOzhMffkCXjQoUQGbaksPlwjzW71mEVTREbS1a/if24kVKlHcJSL VQO/SgjprR081akJvH0WQG4p3iV+AYRQdNKH8U17QiMzuzf5APxO4QfZmcfMpp87pZwHGF0k A/S9z/0OdBxmKCpe1e+/LWXlGORByYJfUotfgQEczJQtrEPv7oPph7IS99iFou8gdv0BSz8z li2kcQuu1kApZVVjvvmpDgrlxrp/8GUFVBtum07S0r8tlshDLNJcbBE/rQyARxoCI+CBmeMs 3Ef8yR1xLBfVMrd/MBhrQhkIV1I2xpnGGCF6bKMN8N4n9hIx5JFVdoKiN2ZDB02WvvogRezP CfuVfp5vfe/xkeCY65teJ6WAM8316XmHtmNfqmKNYoROMksLlXZo3EGiausM4bFyhJEfUYXY 8jzTCpRJSxCVfQPIMSeGY/xLoPHNghhnDiOFPgXPjys0KaEZW79dFv2GADmUwzN14vd+F+92 48Gb6OikkwDOMWjMni/2dNCdjgicClkba0aXuQKL4Zv1CI9Qzp/YxIQqJt8E7FYc1N9yr2Vo yrjAxAAkzISRxTvcG23V5yqU5u3Nb4XkJ7xFXZE0Y+A1ydxbICxwr0YcpdrL7Ar+PY6lax/T uUfetXGCfNKE2yV9zMYZJj7jYpjaBX02l7eY3v7OGAyL8x6WgjE2t74ZQ+zpiMAOTW66Jklq Lq62wKFHZdaH1Z+DNzbYe6Exk+quSRPg/p7WkbFe4EBeEjl/IVwBTb2i/s7f5MFJRnZn2PI3 AeKGxYI4+LKptZtotXOgKmFqaavEvd/QRUGTzWKs+7uOHCDrGS5wIJGXOKZRhznVTv5qPe4e OFY7/DgK/lbzlxEhJVxTuRwxqUk6tqx+7IDllZ4HG/GZkiAA697JiXUxtFGs6BAy+MLuQayX U7TqNBWNa/QZZHgGV8VYgEkcv6CxbcfnTyLtaY5J0Dz5SlW+rubUBoNY0nQ2XIFdLYlYpk4x eoBudIN713tgxUnBd+KkyRI+jneNXcHSagm6skXDYKDZtDHEb2ejUgw0hPL3aw= IronPort-HdrOrdr: A9a23:K8bvzKEIbgwv9TqvpLqE4seALOsnbusQ8zAXP0AYc3Nom6uj5q WTdZUgpHjJYVkqOU3I9ersBEDiewK/yXcW2+ks1N6ZNWGM0ldARLsSibcKqAePJ8SRzIJgPN 9bAstDNOE= X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59324028" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Juergen Gross Subject: [XEN PATCH 19/57] tools/configure.ac: Create ZLIB_LIBS and ZLIB_CFLAGS Date: Mon, 6 Dec 2021 17:02:02 +0000 Message-ID: <20211206170241.13165-20-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Use both ZLIB_CFLAGS and ZLIB_LIBS instead of cherry-picking flags from a single "ZLIB" variable. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/configure.ac | 19 ++++++++++++++----- config/Tools.mk.in | 3 ++- tools/configure | 22 ++++++++++++++-------- tools/libs/guest/Makefile | 12 +++++------- 4 files changed, 35 insertions(+), 21 deletions(-) diff --git a/tools/configure.ac b/tools/configure.ac index 5a4fb9022d..56afe7930d 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -391,17 +391,26 @@ AX_CHECK_FETCHER # Checks for libraries. AC_CHECK_HEADER([bzlib.h], [ -AC_CHECK_LIB([bz2], [BZ2_bzDecompressInit], [zlib="$zlib -DHAVE_BZLIB -lbz2"]) + AC_CHECK_LIB([bz2], [BZ2_bzDecompressInit], + [ZLIB_CFLAGS="$ZLIB_CFLAGS -DHAVE_BZLIB" + ZLIB_LIBS="$ZLIB_LIBS -lbz2"]) ]) AC_CHECK_HEADER([lzma.h], [ -AC_CHECK_LIB([lzma], [lzma_stream_decoder], [zlib="$zlib -DHAVE_LZMA -llzma"]) + AC_CHECK_LIB([lzma], [lzma_stream_decoder], + [ZLIB_CFLAGS="$ZLIB_CFLAGS -DHAVE_LZMA" + ZLIB_LIBS="$ZLIB_LIBS -llzma"]) ]) AC_CHECK_HEADER([lzo/lzo1x.h], [ -AC_CHECK_LIB([lzo2], [lzo1x_decompress], [zlib="$zlib -DHAVE_LZO1X -llzo2"]) + AC_CHECK_LIB([lzo2], [lzo1x_decompress], + [ZLIB_CFLAGS="$ZLIB_CFLAGS -DHAVE_LZO1X" + ZLIB_LIBS="$ZLIB_LIBS -llzo2"]) ]) PKG_CHECK_MODULES([libzstd], [libzstd], - [zlib="$zlib -DHAVE_ZSTD $libzstd_CFLAGS $libzstd_LIBS"], [true]) -AC_SUBST(zlib) + [ZLIB_CFLAGS="$ZLIB_CFLAGS -DHAVE_ZSTD $libzstd_CFLAGS" + ZLIB_LIBS="$ZLIB_LIBS $libzstd_LIBS"], + [true]) +AC_SUBST([ZLIB_CFLAGS]) +AC_SUBST([ZLIB_LIBS]) AX_CHECK_EXTFS AX_CHECK_PTHREAD AX_CHECK_PTYFUNCS diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 934d899967..6c1a0a676f 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -66,7 +66,8 @@ CONFIG_9PFS := @ninepfs@ LINUX_BACKEND_MODULES := @LINUX_BACKEND_MODULES@ #System options -ZLIB := @zlib@ +ZLIB_CFLAGS := @ZLIB_CFLAGS@ +ZLIB_LIBS := @ZLIB_LIBS@ CONFIG_LIBICONV := @libiconv@ EXTFS_LIBS := @EXTFS_LIBS@ CURSES_LIBS := @CURSES_LIBS@ diff --git a/tools/configure b/tools/configure index 829753b5dd..a052c186a5 100755 --- a/tools/configure +++ b/tools/configure @@ -641,7 +641,8 @@ PTHREAD_LIBS PTHREAD_LDFLAGS PTHREAD_CFLAGS EXTFS_LIBS -zlib +ZLIB_LIBS +ZLIB_CFLAGS libzstd_LIBS libzstd_CFLAGS FETCHER @@ -8605,7 +8606,7 @@ fi ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default" if test "x$ac_cv_header_bzlib_h" = xyes; then : -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzDecompressInit in -lbz2" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzDecompressInit in -lbz2" >&5 $as_echo_n "checking for BZ2_bzDecompressInit in -lbz2... " >&6; } if ${ac_cv_lib_bz2_BZ2_bzDecompressInit+:} false; then : $as_echo_n "(cached) " >&6 @@ -8642,7 +8643,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzDecompressInit" >&5 $as_echo "$ac_cv_lib_bz2_BZ2_bzDecompressInit" >&6; } if test "x$ac_cv_lib_bz2_BZ2_bzDecompressInit" = xyes; then : - zlib="$zlib -DHAVE_BZLIB -lbz2" + ZLIB_CFLAGS="$ZLIB_CFLAGS -DHAVE_BZLIB" + ZLIB_LIBS="$ZLIB_LIBS -lbz2" fi @@ -8652,7 +8654,7 @@ fi ac_fn_c_check_header_mongrel "$LINENO" "lzma.h" "ac_cv_header_lzma_h" "$ac_includes_default" if test "x$ac_cv_header_lzma_h" = xyes; then : -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_stream_decoder in -llzma" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_stream_decoder in -llzma" >&5 $as_echo_n "checking for lzma_stream_decoder in -llzma... " >&6; } if ${ac_cv_lib_lzma_lzma_stream_decoder+:} false; then : $as_echo_n "(cached) " >&6 @@ -8689,7 +8691,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_stream_decoder" >&5 $as_echo "$ac_cv_lib_lzma_lzma_stream_decoder" >&6; } if test "x$ac_cv_lib_lzma_lzma_stream_decoder" = xyes; then : - zlib="$zlib -DHAVE_LZMA -llzma" + ZLIB_CFLAGS="$ZLIB_CFLAGS -DHAVE_LZMA" + ZLIB_LIBS="$ZLIB_LIBS -llzma" fi @@ -8699,7 +8702,7 @@ fi ac_fn_c_check_header_mongrel "$LINENO" "lzo/lzo1x.h" "ac_cv_header_lzo_lzo1x_h" "$ac_includes_default" if test "x$ac_cv_header_lzo_lzo1x_h" = xyes; then : -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzo1x_decompress in -llzo2" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzo1x_decompress in -llzo2" >&5 $as_echo_n "checking for lzo1x_decompress in -llzo2... " >&6; } if ${ac_cv_lib_lzo2_lzo1x_decompress+:} false; then : $as_echo_n "(cached) " >&6 @@ -8736,7 +8739,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzo2_lzo1x_decompress" >&5 $as_echo "$ac_cv_lib_lzo2_lzo1x_decompress" >&6; } if test "x$ac_cv_lib_lzo2_lzo1x_decompress" = xyes; then : - zlib="$zlib -DHAVE_LZO1X -llzo2" + ZLIB_CFLAGS="$ZLIB_CFLAGS -DHAVE_LZO1X" + ZLIB_LIBS="$ZLIB_LIBS -llzo2" fi @@ -8812,10 +8816,12 @@ else libzstd_LIBS=$pkg_cv_libzstd_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - zlib="$zlib -DHAVE_ZSTD $libzstd_CFLAGS $libzstd_LIBS" + ZLIB_CFLAGS="$ZLIB_CFLAGS -DHAVE_ZSTD $libzstd_CFLAGS" + ZLIB_LIBS="$ZLIB_LIBS $libzstd_LIBS" fi + ac_fn_c_check_header_mongrel "$LINENO" "ext2fs/ext2fs.h" "ac_cv_header_ext2fs_ext2fs_h" "$ac_includes_default" if test "x$ac_cv_header_ext2fs_ext2fs_h" = xyes; then : diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile index 8f5f3acd21..1f4b7f7c58 100644 --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -89,13 +89,12 @@ CFLAGS += $(CFLAGS_libxendevicemodel) CFLAGS += $(CFLAGS_libxencall) $(CFLAGS_libxenforeignmemory) ifeq ($(CONFIG_MiniOS),y) -zlib-options = -else -zlib-options = $(ZLIB) +ZLIB_CFLAGS := +ZLIB_LIBS := endif -xg_dom_bzimageloader.o: CFLAGS += $(filter -D%,$(zlib-options)) -xg_dom_bzimageloader.opic: CFLAGS += $(filter -D%,$(zlib-options)) +xg_dom_bzimageloader.o: CFLAGS += $(ZLIB_CFLAGS) +xg_dom_bzimageloader.opic: CFLAGS += $(ZLIB_CFLAGS) LIBHEADER := xenguest.h @@ -103,8 +102,7 @@ NO_HEADERS_CHK := y include $(XEN_ROOT)/tools/libs/libs.mk -libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(filter -l%,$(zlib-options)) -libxenguest.so.$(MAJOR).$(MINOR): APPEND_LDFLAGS += $(COMPRESSION_LIBS) -lz +libxenguest.so.$(MAJOR).$(MINOR): APPEND_LDFLAGS += $(ZLIB_LIBS) -lz -include $(DEPS_INCLUDE) From patchwork Mon Dec 6 17:02:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12658999 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8D037C433EF for ; Mon, 6 Dec 2021 17:07:34 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239467.415164 (Exim 4.92) (envelope-from ) id 1muHSY-00085Z-7I; Mon, 06 Dec 2021 17:07:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239467.415164; Mon, 06 Dec 2021 17:07:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHSY-00084i-19; Mon, 06 Dec 2021 17:07:26 +0000 Received: by outflank-mailman (input) for mailman id 239467; Mon, 06 Dec 2021 17:07:24 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOs-0005ti-Hz for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:38 +0000 Received: from esa6.hc3370-68.iphmx.com (esa6.hc3370-68.iphmx.com [216.71.155.175]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 72be75aa-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:03:35 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 72be75aa-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810215; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TP5c4pGgMR6VLoF6V/Z6C00XsVMt1l37Dl5Mn5goLHs=; b=XNEFPWL3ysde62lYteDSgvIx87Kso0Agwkk4anpu0fNgWzXUSjVUFdB4 IbdxUzbxfBiXX3w4DvlQpyQZhl8z5vdh3X8+a1j8dXFRtSxoh/FSNdpCs UQsYlxUmwsRivnBcTVACV4zQnM5af+NCRpv/4koY7YNIBz17lrrLeA+rB 8=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: 3opwMbn2x99q3zhORKoPiG1HPUCQz+KfI/stRL/eUlB/VpKRjdaFi+5ZdqH5cJMC5Fwz4ARgYd KjG5m/WCPXAcyqWEnzT2rYGMqmfwmCWPAVfmoNZb27rzSw9A0Bp6/ht/HLeu4mdsZIJPvszldp odOwOtxX1o9r/KM5BKbfSRtnVTTnLLyg4MBRlS63driEzDVobqQEtKTGB1l00eJqTC7AEFs+jz g7cMc3XhAaamoTsYjXedwDZCw7Z1odriExKccmuyjqWf4LDerzxrIm0Y/ojutyq1ntenzHwIx6 hA4Fby4hGAlEwtdi8F+6FpW2 X-SBRS: 5.1 X-MesageID: 59324043 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:Ocq29qj/XbQ/3OmvjBdDANPvX161kRcKZh0ujC45NGQN5FlHY01je htvWGGBMv+Ja2bxKt0ga4qx9BxX7cSAnNE1SQBsry1mFnkb9cadCdqndUqhZCn6wu8v7a5EA 2fyTvGacajYm1eF/k/F3oAMKRCQ7InQLlbGILes1htZGEk0F0/NtTo5w7Rg29Qw34Dja++wk YiaT/P3aQfNNwFcagr424rbwP+4lK2v0N+wlgVWicFj5DcypVFMZH4sDfjZw0/DaptVBoaHq 9Prl9lVyI97EyAFUbtJmp6jGqEDryW70QKm0hK6UID66vROS7BbPg/W+5PwZG8O4whlkeydx /0dsJuqTAINP5TCncMAYiRfKyJ1EepJreqvzXiX6aR/zmXDenrohf5vEFs3LcsT/eMf7WNmr KJCbmpXN1ba2rzwkOnTpupE36zPKOHiOp8fvXdxiynUF/88TbjIQrnQ5M8e1zA17ixLNauPP JBFMWY0BPjGSwJ9BHoOBKA+puDytHz9axFlr2CO9INitgA/yyQuieOwYbI5YOeiWsF9jkue4 GXc8AzRAB4AM8eE4SGY6X/qjejK9Qv6R4A6BLC+7uRtglCY2ioUEhJ+fUu2p7y1h1CzX/pbK lcI4Ww+oK4q7kupQ9LhGRqirxastxgAW91WAqsi5RuE0Kb87AOQB2xCRTlEAOHKr+dvG2Zsj AXQ2Yq0W3o/69V5VE5x6J/EqDSoPC0xLFYMYAgZfDYC29rojMY820enoslYLIa5idj8GDfVy j+MrTQji7h7sfPnx5lX7nic3Wvy+8Ghohodo1yOAzn7tl8RiJuNPtTwsTDmAeB8wJF1p7Vrl FwNgICg4e8HFvlhfwTdEbxWTNlFCxtoWQAwYGKD/bF8rlxBGFb5JOi8BQ2Swm8zaK7onhezP yfuVft5vsM7AZdTRfYfj3iNI8or17P8Mt/uS+rZaNFDCrAoKlTXo3s/OBTKgT+9+KTJrU3ZE c3BGSpLJSxFYZmLMRLsH7tNuVPV7n5WKZzvqWDTkE38jOv2iI+9QrYZKlqeBt3VH4vfyDg5B +13bpPQoz0GCbWWSnCOreY7cABbRVBmVMueg5EGKYa+zv9ORThJ5wn5muh6JeSIXs19y4/1w 51KchMClQek2ySYcV7ih7IKQOqHYKuTZEkTZUQEVWtEEVB9CWp2xKtAJZYxY5c98+lvkax9Q /UfIp3SCfVTUDXXvT8aaMCl/oBlcR2qgyOIPjakP2djL8IxGVSR94+2ZBbr+QkPEjGz6Zk0r Yq/216JWpEEXQljUprbMar901OrsHEBs+tuRE+UcMJLcUDh/dEyeSz8h/M6Oe8WLhDHymfI3 gqaG05A9+LMv5U04J/CgqXd99WlFO53H0x7GWjH7OnpaXmGrzT7mYIZCbSGZzHQUm/w6Z6OX +QNwqGuKuADkXZLr5F4T+Rhw5Uh6oa9vLRd1AllQinGNgz5FrN6L3Ca9sBTrakRlKRBsA67V 0/TqNlXPbKFZJHsHFILfVd3a+2C0bcfmyXI7ORzK0L/vXcl8L2CWERUHh+NlC0Cc+clbNJ7m b8s6JwM9giyqhs2KdLX3Clb+lOFImEET6h65IoRB5Xmi1Zzx1xPCXAG5vQaPH1bhw1wD3QX IronPort-HdrOrdr: A9a23:2qWUFa974l+A6GU9IWRuk+DgI+orL9Y04lQ7vn2YSXRuHPBw8P re+sjztCWE8Ar5N0tBpTntAsW9qDbnhPtICOoqTNCftWvdyQiVxehZhOOIqVDd8m/Fh4pgPM 9bAtFD4bbLbGSS4/yU3ODBKadD/OW6 X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59324043" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Juergen Gross Subject: [XEN PATCH 20/57] tools/Rules.mk: introduce FORCE target Date: Mon, 6 Dec 2021 17:02:03 +0000 Message-ID: <20211206170241.13165-21-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 And replace the one defined in libs.mk. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/Rules.mk | 3 +++ tools/libs/libs.mk | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 4e9b4ee17f..0d3febfbb6 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -210,3 +210,6 @@ $(PKG_CONFIG_DIR)/%.pc: Makefile $(XEN_ROOT)/tools/Rules.mk $(PKG_CONFIG_DIR) echo "Libs.private: $(PKG_CONFIG_LIBSPRIV)"; \ echo "Requires.private: $(PKG_CONFIG_REQPRIV)"; \ } > $@ + +.PHONY: FORCE +FORCE: diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index 5c2f16dda4..996d467346 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -135,6 +135,3 @@ clean: .PHONY: distclean distclean: clean - -.PHONY: FORCE -FORCE: From patchwork Mon Dec 6 17:02:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659035 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CC0DDC4332F for ; Mon, 6 Dec 2021 17:08:36 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239516.415380 (Exim 4.92) (envelope-from ) id 1muHTZ-00029u-Ql; Mon, 06 Dec 2021 17:08:29 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239516.415380; Mon, 06 Dec 2021 17:08:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHTZ-00029W-Lw; Mon, 06 Dec 2021 17:08:29 +0000 Received: by outflank-mailman (input) for mailman id 239516; Mon, 06 Dec 2021 17:08:28 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOt-0005ti-I1 for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:39 +0000 Received: from esa4.hc3370-68.iphmx.com (esa4.hc3370-68.iphmx.com [216.71.155.144]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 7392cda0-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:03:36 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 7392cda0-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810216; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ncr3lIi38E0siWJzJi6btExaNaeaiEW2/teWOIwBcPA=; b=XqLP5lf+8ZGqBKikfTLLnVMx2N3n96+HxSjcir0iQ2bzAtZkLyiAtXCK 6VfT+cfGlmYaWi6VyfKVCWBNRgqeT1QqtQJUfdJm5Bo1yVfyFaRnjCI3r zLunzSnnE3NtdsZo9+lHhVqO8dlfTnY6KvHibjJVnPAvjN10A48CaL/0A k=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: Ek1RNuKqMkEJMUikv7DTFzl70J0nrxT6CuQdemUffhBIDJ/a2TxQgpNwYzDSS6JqcForF07C74 v4oydXezartqG+ofeCK+cnAIBcboagjErP50ngRKTFP7UFtqlWksPNivnrR3M6eDmKtSlXtKD5 a4HTmQ/cFWlN2uebgNLTG6R5SVgWefVQ3VYjs5RWXBjmweHw5JtmhX/0zx2OZqOoeHC6OFSvL2 8d8i6MTgM3lFjhPtXti64qljJ/JsICkQaxkmKzrxh81WaGhjITsugSIE8TgqmG53eeBP0fho7D sbjJH/LOwzqSa1YSho6KvOqq X-SBRS: 5.1 X-MesageID: 61420662 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:b9u3z67Cnf4KxuhWL6cLkAxRtN7AchMFZxGqfqrLsTDasY5as4F+v mEbWTqEM/+PajH1Ltxya9u+8EhX7JCBzIJqGVRl+H1gHi5G8cbLO4+Ufxz6V8+wwmwvb67FA +E2MISowBUcFyeEzvuV3zyIQUBUjclkfJKlYAL/En03FVAMpBsJ00o5wrdj2tAw27BVPivW0 T/Mi5yHULOa82Yc3lI8s8pvfzs24ZweEBtB1rAPTagjUG32zhH5P7pGTU2FFFPqQ5E8IwKPb 72rIIdVXI/u10xF5tuNyt4Xe6CRK1LYFVDmZnF+A8BOjvXez8CbP2lS2Pc0MC9qZzu1c99Zx tJDlcGVZBcVEo7AoOYMbT1UGConIvgTkFPHCSDXXc27ykTHdz3nwul0DVFwNoodkgp1KTgQr 7pCcmlLN03dwbLtqF64YrAEasALJc/3PIQZqzd4wCvQF/oOSpHfWaTao9Rf2V/cg+gQRKqEP 5RHM1KDajz9chBmAmoIUakvlcmyoHKvKWZYhnOK8P9fD2/7k1UqjemF3MDuUt2VR+1Fk0CAv GXE8m/lRBYAO7S31j6t4n+qwOjVkkvTSI8UUbG16PNuqFmS3XAITg0bU0Ohpvu0gVL4XMhQQ 2Qd/DYuqq4jslSmVNDnUzW3pXeFulgXXN84LgEhwFjTkOyOuV/fXzVaCG4aADA7iCMobTIt2 H/Uuv75ORBMvIWXWEy5+ryf9CznbED5MlQ+TSMDSAIE5fzqr4cykg/DQ75fLUKlsjHmMWqum m7X9UDSk51W1JdWjPvjoTgrlhr1/sCRJjPZ8Dk7SY5MAulRQIe+L7Kl5lHAhRqrBNbIFwLR1 JTodiX30QzvMX1vvHHUKAnuNOvwjxpgDNE6qQQ1d3XG327yk0NPhagKvFlDyL5Ba67ogwPBb k7Joh9275ROJnasZqIfS9vvUJR1l/m9T467CaC8gj9yjn5ZLlXvEMZGPxH44owQuBJ0zfFX1 WmzL65A8kr2+Yw4lWHrFo/xIJcgxzwkxHO7eHwI50/P7FZqX1bMEe1tGALXNogRtfrYyC2Io 4c3H5bbkH13DbyhChQ7BKZOdDjm21BgXsuowyGWH8beSjdb9JYJV6WMnOh/ItM9xMy4VI7gp xmAZ6OR83Kn7VWvFOlAQisLhGrHUcktoHQlEzYrOFr0iXEvbZz2tPUUdoctfKlh/+tmlKYmQ /4AcsSGI/JOVjWYpGhNMcij9NRvJEaxmAaDHyu5ezxjLZRucBPEp43/dQz1+ShQUifu7Zkio 6et3x/wSIYYQ1gwF97fbf+ilgvjvXUUlO9ocVHPJ91fJBfl/IRwcnSjhf4rOcAcbx7Ew2LCh QqRBB4Zo8jLopM0r4aV1fzV8d/xHrInTERAHmTd4bKnDgXg/zKukd1aTeKFXTHBT2eoqq+sU vpYkqPnO/odkVcU74clS+R3zbgz7sfErqNBylg2B23CalmmB+8yInSC2sUT5KRByqUA5FmzU 0OLvNJbJa+IKIXuF1tIfFgpaeGK1Pc1nDjO7KtqfBWmtXEvpLfXA19POxSsiTBGKOonOYwo9 u4tpcoK5lHtkREtKNuH0nhZ+mnkwqbsiEn7WkX22LPWtzc= IronPort-HdrOrdr: A9a23:Ap5ncKG7vr5hDYJHpLqE4seALOsnbusQ8zAXP0AYc3Nom6uj5q WTdZUgpHjJYVkqOU3I9ersBEDiewK/yXcW2+ks1N6ZNWGM0ldARLsSibcKqAePJ8SRzIJgPN 9bAstDNOE= X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="61420662" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu Subject: [XEN PATCH 21/57] tools/include/xen-foreign: avoid to rely on default .SUFFIXES Date: Mon, 6 Dec 2021 17:02:04 +0000 Message-ID: <20211206170241.13165-22-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 When a rule isn't a pattern rule, and thus don't have a %, the value of the automatic variable stem $* depends on .SUFFIXES. GNU make manual explain that it is better to avoid this "bizarre" behavior which exist for compatibility. Use $(basename ) instead. So we can one day avoid make's build-in rules and variables. Signed-off-by: Anthony PERARD --- tools/include/xen-foreign/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/include/xen-foreign/Makefile b/tools/include/xen-foreign/Makefile index e395011fdd..6ce51daf5e 100644 --- a/tools/include/xen-foreign/Makefile +++ b/tools/include/xen-foreign/Makefile @@ -25,28 +25,28 @@ check-headers: checker rm tmp.size arm32.h: mkheader.py structs.py $(ROOT)/arch-arm.h $(ROOT)/xen.h - $(PYTHON) $< $* $@.tmp $(filter %.h,$^) + $(PYTHON) $< $(basename $@) $@.tmp $(filter %.h,$^) #Avoid mixing an alignment directive with a uint64_t cast or sizeof expression sed 's/(__align8__ \(uint64_t\))/(\1)/g' < $@.tmp > $@.tmp2 rm $@.tmp $(call move-if-changed,$@.tmp2,$@) arm64.h: mkheader.py structs.py $(ROOT)/arch-arm.h $(ROOT)/xen.h - $(PYTHON) $< $* $@.tmp $(filter %.h,$^) + $(PYTHON) $< $(basename $@) $@.tmp $(filter %.h,$^) #Avoid mixing an alignment directive with a uint64_t cast or sizeof expression sed 's/(__align8__ \(uint64_t\))/(\1)/g' < $@.tmp > $@.tmp2 rm $@.tmp $(call move-if-changed,$@.tmp2,$@) x86_32.h: mkheader.py structs.py $(ROOT)/arch-x86/xen-x86_32.h $(ROOT)/arch-x86/xen.h $(ROOT)/xen.h - $(PYTHON) $< $* $@.tmp $(filter %.h,$^) + $(PYTHON) $< $(basename $@) $@.tmp $(filter %.h,$^) #Avoid mixing an alignment directive with a uint64_t cast or sizeof expression sed 's/(__align8__ \(uint64_t\))/(\1)/g' < $@.tmp > $@.tmp2 rm $@.tmp $(call move-if-changed,$@.tmp2,$@) x86_64.h: mkheader.py structs.py $(ROOT)/arch-x86/xen-x86_64.h $(ROOT)/arch-x86/xen.h $(ROOT)/xen.h - $(PYTHON) $< $* $@.tmp $(filter %.h,$^) + $(PYTHON) $< $(basename $@) $@.tmp $(filter %.h,$^) #Avoid mixing an alignment directive with a uint64_t cast or sizeof expression sed 's/(__align8__ \(uint64_t\))/(\1)/g' < $@.tmp > $@.tmp2 rm $@.tmp From patchwork Mon Dec 6 17:02:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12658983 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8DBA8C433F5 for ; Mon, 6 Dec 2021 17:07:10 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239442.415083 (Exim 4.92) (envelope-from ) id 1muHS2-0004aW-UU; Mon, 06 Dec 2021 17:06:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239442.415083; Mon, 06 Dec 2021 17:06:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHS2-0004aP-QZ; Mon, 06 Dec 2021 17:06:54 +0000 Received: by outflank-mailman (input) for mailman id 239442; Mon, 06 Dec 2021 17:06:54 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOx-0005ta-MS for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:43 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 756262cf-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:03:41 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 756262cf-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810221; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=u/6PZxBQJwWZ+PXJwgzjsbEo629MujlLZMLcLeCujlQ=; b=f9RFxzrPYYVtwxxYoVKLRk80zEB2lGWGAMAlbp4Sghbtw7UjqlsD8DAr 6jeBsH74tMt7mFB9sJWCq/+yOJwcm42p6dlE4vnLOQt+6EkvFXblX2C6N 9irAP6aopRBufxpnhMWVpi5sRsREw9mGcz7na5cOYSexeh5m6cDHj5cYm w=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: DCiuWfY2Y08sKGXPVqAJ6Ok9zf23qVIeQuhnPe0J7NtVc91nyTuJd5YHr4KcFzF5xHa+AhrV90 xZJVv7Q7ks3qK0NJ9tYEpF9CgUvaS6sJMeoykj1yn46NZ/P21U7dQY8UWFenKYe7XdaZQIxCbU EazkXoyPCGPn9d2eKlnHtMjUVFBeR13aO8XePePHADnBIrqdjdIjcY4mHRAyre+zDjva0EhTgf goJmQlNC0ShSaCI12gicMoJgJeWQBpAbjqOpnANGrijUa9lJ6nb/8oSy2uYW1kOwcLh2XLEED4 o4P9nGX9FuqDgbE3qlkDC046 X-SBRS: 5.1 X-MesageID: 59766443 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:3t1H3KAYHyA7+BVW/7Lkw5YqxClBgxIJ4kV8jS/XYbTApGx20jJUx 2UXX2/UO/+CNzehKY93YNvl9RxVuZbdnYc1QQY4rX1jcSlH+JHPbTi7wuYcHM8wwunrFh8PA xA2M4GYRCwMo/u1Si6FatANl1ElvU2zbue6WLGs1hxZH1c+EX570Uw7wYbVv6Yz6TSHK1LV0 T/Ni5W31G+Ng1aY5UpNtspvADs21BjDkGtwUm4WPJinj3eH/5UhN7oNJLnZEpfNatI88thW5 Qr05OrREmvxp3/BAz4++1rxWhVirrX6ZWBihpfKMkQLb9crSiEai84G2PQghUh/kQuXxsJy6 dZ25YGobykQOIj1iKMnTEwNe81+FfUuFL7vJHG+tYqYzlHccmuqyPJrZK00FdRGoKAtWzgIr KFGbmBWBvyAr7veLLaTQ+9whsMlPY/zMZkWoH1IxjDFF/c2B5vERs0m4PcFjWhu2JwSRp4yY eIVNTlmdCrySiQUAX4mAcIQ28KCglzgJmgwRFW9+vNsvjm7IBZK+LrwNNvYfPSaSMMTmVyXz krd5HjwCBweMN2ZyBKG/2iqi+uJmjn0MKoNEJWo+/gsh0ecrkQRAhALUVqwodGil1WzHdlYL iQ86ico6KQ/6kGvZt38RAGj5m6JuAYGXNhdGPF87xuCooLd5RqZAW4VCCZMctU8uOc5QDUr0 hmCmNaBLT1wspWFRHSF7LCWoDiufy8PIgc/iTQsFFVfpYO5+cdq00yJHo0L/LOJYsPdAw/um iKJjSsF16gLq+Ay0YCC7Rf9nGf5znTWdTId6gLSV2Ojywp2Yo+5eoClgWTmAeZ8wJWxFQfY4 iVd8ySKxKVXVMzWynTRKAkYNOjxv67tDdHKvbJ483DNHRyJ8mXrQ41f6SoWyKxBYpddIm+Bj KM+VGpsCH5v0JmCMPYfj2GZUZ1CIU3c+TLNDKq8gj1mOMcZSeN/1HsyDXN8Jki0+KTWrYkxO I2AbeGnBmsABKJswVKeHrlGgeBxl31knz2MFfgXKihLN5LEPhZ5rp9fbzOzgh0RtvvY8G05D f4BXyd19/mveLKnOXSGmWLiBVsLMWI6FfjLRz9/LYa+zv5dMDh5UZf5mOp5E6Q8xvg9vrqYr xmVBx4DoHKi1CKvFOl/Qi06AF8Zdc0k9ixT0O1FFQvA5kXPlq7ztvpCLMVuIuF8nAGhpNYtJ 8Q4lwy7KqwnYlz6F/41MfERdaRuK0amgxygJS2gbGRtdpJsXVWRqNTlYhHu5G8FCS/u7Zkyp Lip1wX6R5sfRls9UJaKOaz3l17h72IAnO9SXlfTJoUBckvb74U3eTf6ieU6Ip9QJEyblCeaz QufHTwRufLJ/90u6NDMiK3d99WpHuJyE1B0BW7e6brqZyDW8nD6md1LUfqSfCCbX2Txof3wa eJQxvD6EfsGgFcV7NYsT+c1lfozvoK9qaVbwwJoGGTwQ26qUr4wcGOb2cRvt7FWwuMLswWBR U/SqMJRPq+EOZ25HQdJdhYldOmKydodhiLWsaYuOEz/6SJ6oOiHXEFVM0XegSBRNuIoYoYsw ONns88K8Q2vzBEtN4/e3CxT8m2NKF0GUrkm6c5GUNO61FJzxwEQe4HYBw/3/IqLOodFPUQdK zOJgLbP2uZHzU3YfntvTXXA0IKxX3jVVMymGLPaG2m0pw== IronPort-HdrOrdr: A9a23:ewE0EqOXModhVMBcTsejsMiBIKoaSvp037Eqv3ofdfUzSL3+qy nOpoVj6faaslcssR0b9OxofZPwI080lqQFhbX5X43DYOCOggLBR+tfBMnZsljd8kXFh4hgPM xbHZSWZuedMbEDt7eY3DWF X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59766443" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Julien Grall , "Stefano Stabellini" , Wei Liu Subject: [XEN PATCH 22/57] tools/console: have one Makefile per program/directory Date: Mon, 6 Dec 2021 17:02:05 +0000 Message-ID: <20211206170241.13165-23-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Sources of both xenconsoled and xenconsole are already separated into different directory and don't share anything in common. Having two different Makefile means it's easier to deal with *FLAGS. Some common changes: Rename $(BIN) to $(TARGETS), this will be useful later. Stop removing *.so *.rpm *.a as they aren't created here. Use $(OBJS-y) to list objects. Update $(CFLAGS) for the directory rather than a single object. daemon: Remove the need for $(LDLIBS_xenconsoled), use $(LDLIBS) instead. Remove the need for $(CONSOLE_CFLAGS-y) and use $(CFLAGS-y) instead. client: Remove the unused $(LDLIBS_xenconsole) Signed-off-by: Anthony PERARD --- .gitignore | 4 +-- tools/console/Makefile | 49 +++------------------------------- tools/console/client/Makefile | 39 +++++++++++++++++++++++++++ tools/console/daemon/Makefile | 50 +++++++++++++++++++++++++++++++++++ 4 files changed, 94 insertions(+), 48 deletions(-) create mode 100644 tools/console/client/Makefile create mode 100644 tools/console/daemon/Makefile diff --git a/.gitignore b/.gitignore index b39b996718..c31fa9b841 100644 --- a/.gitignore +++ b/.gitignore @@ -159,8 +159,8 @@ tools/libs/util/libxenutil.map tools/libs/vchan/headers.chk tools/libs/vchan/libxenvchan.map tools/libs/vchan/xenvchan.pc -tools/console/xenconsole -tools/console/xenconsoled +tools/console/client/xenconsole +tools/console/daemon/xenconsoled tools/debugger/gdb/gdb-6.2.1-linux-i386-xen/* tools/debugger/gdb/gdb-6.2.1/* tools/debugger/gdb/gdb-6.2.1.tar.bz2 diff --git a/tools/console/Makefile b/tools/console/Makefile index 207c04c9cd..63bd2ac302 100644 --- a/tools/console/Makefile +++ b/tools/console/Makefile @@ -1,50 +1,7 @@ XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += -Werror +SUBDIRS-y := daemon client -CFLAGS += $(CFLAGS_libxenctrl) -CFLAGS += $(CFLAGS_libxenstore) -LDLIBS += $(LDLIBS_libxenctrl) -LDLIBS += $(LDLIBS_libxenstore) -LDLIBS += $(SOCKET_LIBS) - -LDLIBS_xenconsoled += $(UTIL_LIBS) -LDLIBS_xenconsoled += -lrt -CONSOLE_CFLAGS-$(CONFIG_ARM) = -DCONFIG_ARM - -BIN = xenconsoled xenconsole - -.PHONY: all -all: $(BIN) - -.PHONY: clean -clean: - $(RM) *.a *.so *.o *.rpm $(BIN) $(DEPS_RM) - $(RM) client/*.o daemon/*.o - -.PHONY: distclean -distclean: clean - -daemon/main.o: CFLAGS += -include $(XEN_ROOT)/tools/config.h -daemon/io.o: CFLAGS += $(CFLAGS_libxenevtchn) $(CFLAGS_libxengnttab) $(CFLAGS_libxenforeignmemory) $(CONSOLE_CFLAGS-y) -xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c)) - $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxenforeignmemory) $(LDLIBS_xenconsoled) $(APPEND_LDFLAGS) - -client/main.o: CFLAGS += -include $(XEN_ROOT)/tools/config.h -xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c)) - $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_xenconsole) $(APPEND_LDFLAGS) - -.PHONY: install -install: $(BIN) - $(INSTALL_DIR) $(DESTDIR)/$(sbindir) - $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(sbindir) - $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) xenconsole $(DESTDIR)$(LIBEXEC_BIN) - -.PHONY: uninstall -uninstall: - rm -f $(DESTDIR)$(LIBEXEC_BIN)/xenconsole - rm -f $(DESTDIR)$(sbindir)/xenconsoled - --include $(DEPS_INCLUDE) +.PHONY: all clean install distclean uninstall +all clean install distclean uninstall: %: subdirs-% diff --git a/tools/console/client/Makefile b/tools/console/client/Makefile new file mode 100644 index 0000000000..44176c6d93 --- /dev/null +++ b/tools/console/client/Makefile @@ -0,0 +1,39 @@ +XEN_ROOT=$(CURDIR)/../../.. +include $(XEN_ROOT)/tools/Rules.mk + +CFLAGS += -Werror +CFLAGS += $(CFLAGS_libxenctrl) +CFLAGS += $(CFLAGS_libxenstore) +CFLAGS += -include $(XEN_ROOT)/tools/config.h + +LDLIBS += $(LDLIBS_libxenctrl) +LDLIBS += $(LDLIBS_libxenstore) +LDLIBS += $(SOCKET_LIBS) + +OBJS-y := main.o + +TARGETS := xenconsole + +.PHONY: all +all: $(TARGETS) + +xenconsole: $(OBJS-y) + $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(APPEND_LDFLAGS) + +.PHONY: install +install: all + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PROG) xenconsole $(DESTDIR)$(LIBEXEC_BIN) + +.PHONY: uninstall +uninstall: + rm -f $(DESTDIR)$(LIBEXEC_BIN)/xenconsole + +.PHONY: clean +clean: + $(RM) *.o $(TARGETS) $(DEPS_RM) + +.PHONY: distclean +distclean: clean + +-include $(DEPS_INCLUDE) diff --git a/tools/console/daemon/Makefile b/tools/console/daemon/Makefile new file mode 100644 index 0000000000..0f004f0b14 --- /dev/null +++ b/tools/console/daemon/Makefile @@ -0,0 +1,50 @@ +XEN_ROOT=$(CURDIR)/../../.. +include $(XEN_ROOT)/tools/Rules.mk + +CFLAGS += -Werror +CFLAGS += $(CFLAGS_libxenctrl) +CFLAGS += $(CFLAGS_libxenstore) +CFLAGS += $(CFLAGS_libxenevtchn) +CFLAGS += $(CFLAGS_libxengnttab) +CFLAGS += $(CFLAGS_libxenforeignmemory) +CFLAGS-$(CONFIG_ARM) += -DCONFIG_ARM +CFLAGS += -include $(XEN_ROOT)/tools/config.h + +LDLIBS += $(LDLIBS_libxenctrl) +LDLIBS += $(LDLIBS_libxenstore) +LDLIBS += $(LDLIBS_libxenevtchn) +LDLIBS += $(LDLIBS_libxengnttab) +LDLIBS += $(LDLIBS_libxenforeignmemory) +LDLIBS += $(SOCKET_LIBS) +LDLIBS += $(UTIL_LIBS) +LDLIBS += -lrt + +OBJS-y := main.o +OBJS-y += io.o +OBJS-y += utils.o + +TARGETS := xenconsoled + +.PHONY: all +all: $(TARGETS) + +xenconsoled: $(OBJS-y) + $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(APPEND_LDFLAGS) + +.PHONY: install +install: all + $(INSTALL_DIR) $(DESTDIR)/$(sbindir) + $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(sbindir) + +.PHONY: uninstall +uninstall: + rm -f $(DESTDIR)$(sbindir)/xenconsoled + +.PHONY: clean +clean: + $(RM) *.o $(TARGETS) $(DEPS_RM) + +.PHONY: distclean +distclean: clean + +-include $(DEPS_INCLUDE) From patchwork Mon Dec 6 17:02:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659027 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 28877C433F5 for ; Mon, 6 Dec 2021 17:08:22 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239509.415325 (Exim 4.92) (envelope-from ) id 1muHTK-000855-69; Mon, 06 Dec 2021 17:08:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239509.415325; Mon, 06 Dec 2021 17:08:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHTK-00084c-12; Mon, 06 Dec 2021 17:08:14 +0000 Received: by outflank-mailman (input) for mailman id 239509; Mon, 06 Dec 2021 17:08:12 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOy-0005ti-Il for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:44 +0000 Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 76273470-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:03:42 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 76273470-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810222; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vquC9c6kCd5w0itVlwryUdZY6Xf5eopjc/5kMFiENpA=; b=MU2UQfzsAPQsdhcN+yQpZ6Z4cvIpsW9atwYSpz+pGTMwC4J8f1bT0OUz nj/Agmy3Pw1rePed29tMBMkUIjfb2rho6cNFnYrYLX7kVRHcpSamknOLw oSZd3EOkElWCjZLj5bi/JuXs+C04sbu3EDF8fa0Avt+N9rMadka8C9grB c=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: PjI0lSRzKGh+01Gm8V8MTKvNoepTO8v0kB3HtlU9u2c3s6NbxJsbdJiwRR0qBiwd2i3V0o12EI lcp36u0e7+ov2/gJx/NJjikO7dg7Hu+jdFtQDUDSS9X0m0UyLfC9c+j9qTizC2RlOhFhmzwlYl L1/1im/wLthpD+odbJ7DT+fZgRxl1NyUT9q8SUJkLja2gt4zIBGO9tMoCYVaoo0DEvGmUfaIxZ 6mn8QyZ0SeJ2SV0/LTbbh60zhmgJu2t7G8FxEdot6UsJVC6uP4cfmcDEmHFVEXxEitI5mooLeP BRiLBcFuiN0b9ZXO6sqXUsAd X-SBRS: 5.1 X-MesageID: 59370624 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:LRsjCamw/ODarrNOB8UXSeXo5gxnIURdPkR7XQ2eYbSJt1+Wr1Gzt xIeCD/Qb/beMDP8KYt/aoXnphwG6sSEyYUwHFA+qH1gHiMWpZLJC+rCIxarNUt+DCFioGGLT Sk6QoOdRCzhZiaE/n9BClVlxJVF/fngqoDUUYYoAQgsA187IMsdoUg7wbdg2NY22YLR7z6l4 rseneWOYDdJ5BYsWo4kw/rrRMRH5amaVJsw5zTSVNgT1LPsvyB94KE3fMldG0DQUIhMdtNWc s6YpF2PEsE1yD92Yj+tuu6TnkTn2dc+NyDW4pZdc/DKbhSvOkXee0v0XRYRQR4/ttmHozx+4 NBJp6K5GCsuB4Lvm/tMAxVKTjN1AqITrdcrIVDn2SCS50jPcn+qyPRyFkAme4Yf/46bA0kXq 6ZecmpUKEne2aTmm9pXScE17ignBMDtIIMYvGAm1TzDBOwqaZvCX7/L9ZlT2zJYasVmQKeFO JJHM2YHgBLocQxIAUgZDrIFxu6FlnvDfGZVk1WHqv9ii4TU5FMoi+W8WDbPQfSLWsd9jkuev njB/WnyHlcdLtP34SWB2mKhgKnIhyyTcJIfEvi0++BnhHWXx3cPE1sGWF2ju/67h0WiHdVFJ CQ88ywyra805QqzQ8P0RRGQr3uNvxpaUN1Ve9DW8ynUlPCSuVzAQDFZEHgRM7TKqfPaWxQv0 k23loLFAgVAk76KGCKR5OqGpgy9bH19wXA5WQcISg4M4t/GqY41jw7SQtsLLJNZnuEZChmrn WnU8XFWa6E7yJdSiv7lpQyvbyeE/8CRFmYIChPrsnVJB++TTKqsfMSW5FfS9p6sx67JHwDa7 BDodyVzhd3i7K1hdgTQGY3h/5nzvp5p1QEwZ3Y1RfHNEBz3pBaekXh4um0WGauQGp9slcXVS EHSoxhNw5RYIWGna6R6C6roVZ96kvKxSI6/CK+EBjarXnSXXFXdlM2JTRTPt10BbWB2yf1vU XtlWZjE4Ykm5VRPk2PtGrZ1PU4DzSEi32LDLa0XPDz8uYdykEW9EO9fWHPXN7hRxPrd/G39r oYOX+PXmk43eLCvPUHqHXs7cAliwY4TXsut9aS6t4erf2JbJY3WI6OLnO56JdU6x/89eyWh1 ijVZ3K0AWHX3RXvQThmoFg5AF82dZog/389IwI2OlOkhyoqbYq1tf9NfJorZ7g3sudkyKcsH fUCfsyBBNVJSyjGpGtBPcWs8tQ6eUT5nx+KMgqkfCM7I8xqSTvW94K2ZQDo7iQPUHa67JNsv 7262wrHapMfXAA+Xt3OYfeiwgrp73gQke5/RWXSJdxXdBm++YRmMXWp3PQ2P9sNOVPIwT7Dj 1SaBhIRpO/spY4p8YaW2fDY/tnxS+YnRxhUBWjW67qyJBL2xGv7zN8SSvuMcBDcSHjwpPeoa 9JKwqyuK/YAhltL7dZxSu450aIk6tLzjLZG1QA4Tm7TZlGmB748cHmL2c5D6v9EyrND4FbkX 0uO/p9ROKmTOdOjG1kUfVJ3YuOG3PASuz/T8fVqfxmquH4ppOKKARdIIh2BqC1BN78kYooqz NAotNMS9wHi2AEhNcyLj3wM+mmBRpDav37Lan3O7FfXtzcW IronPort-HdrOrdr: A9a23:rrlq2a86BdzPZfMURVluk+DeI+orL9Y04lQ7vn2YSXRuHfBw8P re+8jztCWE8Qr5N0tApTntAsS9qDbnhPxICOoqTNOftWvd2FdARbsKheCJ/9SjIVyaygc079 YHT0EUMrPN5DZB4foSmDPIcOod/A== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59370624" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu Subject: [XEN PATCH 23/57] tools/debugger: Allow make to recurse into debugger/ Date: Mon, 6 Dec 2021 17:02:06 +0000 Message-ID: <20211206170241.13165-24-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Avoid the need for explicite rules to recurse into debugger/* dirs by adding a Makefile in debugger/. Signed-off-by: Anthony PERARD --- tools/Makefile | 27 +-------------------------- tools/debugger/Makefile | 8 ++++++++ 2 files changed, 9 insertions(+), 26 deletions(-) create mode 100644 tools/debugger/Makefile diff --git a/tools/Makefile b/tools/Makefile index 8936b754c8..79b4c7e3de 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -32,8 +32,7 @@ SUBDIRS-$(CONFIG_GOLANG) += golang SUBDIRS-y += xl SUBDIRS-y += helpers SUBDIRS-$(CONFIG_X86) += xenpaging -SUBDIRS-$(CONFIG_X86) += debugger/gdbsx -SUBDIRS-$(CONFIG_X86) += debugger/kdd +SUBDIRS-$(CONFIG_X86) += debugger SUBDIRS-$(CONFIG_TESTS) += tests SUBDIRS-y += python @@ -272,30 +271,6 @@ subdir-clean-qemu-xen-dir: subdir-uninstall-qemu-xen-dir: ; -subdir-clean-debugger/gdbsx subdir-distclean-debugger/gdbsx: .phony - $(MAKE) -C debugger/gdbsx clean - -subdir-install-debugger/gdbsx: .phony - $(MAKE) -C debugger/gdbsx install - -subdir-all-debugger/gdbsx: .phony - $(MAKE) -C debugger/gdbsx all - -subdir-uninstall-debugger/gdbsx: .phony - $(MAKE) -C debugger/gdbsx uninstall - -subdir-clean-debugger/kdd subdir-distclean-debugger/kdd: .phony - $(MAKE) -C debugger/kdd clean - -subdir-install-debugger/kdd: .phony - $(MAKE) -C debugger/kdd install - -subdir-uninstall-debugger/kdd: .phony - $(MAKE) -C debugger/kdd uninstall - -subdir-all-debugger/kdd: .phony - $(MAKE) -C debugger/kdd all - subtree-force-update: ifeq ($(CONFIG_QEMU_XEN),y) $(MAKE) qemu-xen-dir-force-update diff --git a/tools/debugger/Makefile b/tools/debugger/Makefile new file mode 100644 index 0000000000..51efd3680b --- /dev/null +++ b/tools/debugger/Makefile @@ -0,0 +1,8 @@ +XEN_ROOT=$(CURDIR)/../.. +include $(XEN_ROOT)/tools/Rules.mk + +SUBDIRS-y := gdbsx +SUBDIRS-y += kdd + +.PHONY: all clean install distclean uninstall +all clean install distclean uninstall: %: subdirs-% From patchwork Mon Dec 6 17:02:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12658985 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CE5BEC4332F for ; Mon, 6 Dec 2021 17:07:11 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239444.415099 (Exim 4.92) (envelope-from ) id 1muHS4-0004uI-Ki; Mon, 06 Dec 2021 17:06:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239444.415099; Mon, 06 Dec 2021 17:06:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHS4-0004t5-G2; Mon, 06 Dec 2021 17:06:56 +0000 Received: by outflank-mailman (input) for mailman id 239444; Mon, 06 Dec 2021 17:06:55 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHOz-0005ti-Iy for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:45 +0000 Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 777aeaf9-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:03:43 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 777aeaf9-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810223; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7od1NQnHrZh8LHMHI1xfAIazt/3++YtpIBfjzwrGbJA=; b=T8m4sR9zUKBAtCIOe6QwybgT2k87mEfEvPWSj1B/bKn4UGSOWNQqGoGh NGYZRYV4oyS9Vxn/HxAf9+zoTq6bA9U17u7YQEXJm+t54ez2yjrwBKjUr tFVm+I7q7GWF14bLwPq1W8xSZacDdHQ940EhLJ/LLkOho2K6ikhKlfbOP 4=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: Xad40hXYlKAP97Y0XfEAJkxukn9MI3i9GzdkP5YZpw7m6Hd7+KDeJvSY8Q4EDsJH8ws+osXi+V Zg51uPCmAI8d+/gD71lpZ0iUAF6FV4l3XPLVVwyFr2ZtxXRdH2DMlSNI2SQBiS9APcy9llBLSB I0nn/zCaaqMS8JQE2WqYTsWv6bSu0wrFkQivD3cl3ggQJ2CgG5lcLNJPFYEyAONTzAVI+H9Xen aMbLx9G5GC5+YUUM5NaE7qzCw4DUdaQ5DaWFuZZVuxSbOPEYHCypWfdG6Y2mBkPvyWK6mdZ7PZ rLNFJZsdziTo7wfFIiR5cmOw X-SBRS: 5.1 X-MesageID: 59370631 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:/8Ey5q8RxsQcCVQEY+dQDrUDenmTJUtcMsCJ2f8bNWPcYEJGY0x3z 2pKWDuGbv/bYTf0eNgjbdix8E0PsZ6EzdAxQQdqrng8E34SpcT7XtnIdU2Y0wF+jyHgoOCLy +1EN7Es+ehtFie0Si9AttENlFEkvU2ybuOU5NXsZ2YhGmeIdA970Ug6wrRh3NYy6TSEK1jlV e3a8pW31GCNg1aYAkpMg05UgEoy1BhakGpwUm0WPZinjneH/5UmJMt3yZWKB2n5WuFp8tuSH I4v+l0bElTxpH/BAvv9+lryn9ZjrrT6ZWBigVIOM0Sub4QrSoXfHc/XOdJFAXq7hQllkPgt9 PQRn8G6DjsZFYzSt6MtfDheOTFhaPguFL/veRBTsOSWxkzCNXDt3+9vHAc9OohwFuRfWD8Us 6ZCcXZUM07F17neLLGTE4GAguwqKtXrO4UO/Glt1zjDAd4tQIzZQrWM7thdtNs1rp0fRqmGO ZFAAdZpREznIDJgHwg0M5InwsixqUvWfw958E3A8MLb5ECMlVcsgdABKuH9e8OIbdVYmF6Co WDL9Hi/BQsVXPSAzRKV/3TqgfXA9Qv2XI8UHful+P9vnEae2GU7DwcfXl+25/K+jyaWS99Zb kAZ5Ccqhawz71CwCMnwWQWip3yJtQJaXMBfe8Uz7h2NzazFpR6UHGEeQhZObdUnsIk9QjlC6 7OSt4q3X3o16uTTEC/DsOfPxd+vBcQLBTM+RHMuEAFC3+nIgZ8cySLgb9BJALHg27UZBgrM6 zyNqSE/gZAagsgKy7i38Dj7vt68mnTaZlVrv1uKBwpJ+is8Pdf4PNLwtTA3+N4ZdN7BJmRtq kTojCR3AAomKZiW3BKAT+wWdF1Cz6bUaWaM6bKD8nRIythMx5JBVd0JiN2dDB0wWirhRdMPS BWJ0e+2zMUMVEZGlYctP+qM5z0ClMAM7+jNWPHOdcZpaZNsbgKB9ywGTRfOhDCyyhlxy/thZ sfznSOQ4ZAyU/4PIN2eHbh17FPW7npmmTO7qW7TkXxLLoZylFbKEOxYYTNin8gy7b+eoRW9z jqsH5Di9vmra8WnOnO/2ddKdTgidCFnbbir+50/XrPSeWJORTB+Y8I9NJt8IuSJaYwOzbyWl px8M2cFoGfCaYrvdV/XNys9Mey3Bv6SbxsTZEQRALph4FB7Ca7H0UvVX8JfkWAP+LMxwPhqY eMCfsncUP1DRi6eo2YWbIXnrZwkfxOu3FrcMy2gaTk5XphhWw2WpYO0IlqxrHEDXnitqM8zg 7y8zQeHE5ANcBtvUZTNY/W1wlLv4XVEwLBuX1HFK8V4cVn39NQ4MDT4i/I6epleKRjKyjaA+ RyRBBMU+bvEr4MvqYGbjqGYtYa5VeB5GxMCTWXc6L+3Mwjc/3aintAcALrZI2iFWTqtqqu4Z OhTw/XtC9E9nQ5H49hmDrJm7aMi/N+z9bVU+RtpQSfQZFOxB7I+fnTfhZtTtrdAz6NysBetX h7d4cFTPLiENZ+3EFMVIwZ5PO2P2etNx2vX5PUxZk77+DV27PyMVkALZ0uAjylULb1UNoI5w Lh+5J5KulLn0hd6YMybii109niXKi1SWqoqgZgWHYv3h1d50VpFe5HdVnf77Zznhw+g6aX2z ut4XJb/uok= IronPort-HdrOrdr: A9a23:2Fi/C6FVbeipoVA7pLqE7seALOsnbusQ8zAXP0AYc3Nom6uj5q eTdZUgpGbJYVkqOU3I9ersBEDEewK/yXcX2/h0AV7BZmnbUQKTRekIh7cKgQeQfhEWntQts5 uIGJIRNDSfNzRHZL7BkWqFL+o= X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59370631" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Elena Ufimtseva , Ian Jackson , Wei Liu Subject: [XEN PATCH 24/57] tools/debugger/gdbsx: Fix and cleanup makefiles Date: Mon, 6 Dec 2021 17:02:07 +0000 Message-ID: <20211206170241.13165-25-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 gdbsx/: - Make use of subdir facility for the "clean" target. - No need to remove the *.a, they aren't in this dir. - Avoid calling "distclean" in subdirs as "distclean" targets do only call "clean", and the "clean" also runs "clean" in subdirs. - Avoid the need to make "gx_all.a" and "xg_all.a" in the "all" recipe by forcing make to check for update of "xg/xg_all.a" and "gx/gx_all.a" by having "FORCE" as prerequisite. Now, when making "gdbsx", make will recurse even when both *.a already exist. - List target in $(TARGETS). gdbsx/*/: - Fix dependency on *.h. - Remove some dead code. - List targets in $(TARGETS). - Remove "build" target. - Cleanup "clean" targets. - remove comments about the choice of "ar" instead of "ld" Signed-off-by: Anthony PERARD --- tools/debugger/gdbsx/Makefile | 20 ++++++++++---------- tools/debugger/gdbsx/gx/Makefile | 15 +++++++-------- tools/debugger/gdbsx/xg/Makefile | 25 +++++++------------------ 3 files changed, 24 insertions(+), 36 deletions(-) diff --git a/tools/debugger/gdbsx/Makefile b/tools/debugger/gdbsx/Makefile index 8d7cd94a31..4aaf427c45 100644 --- a/tools/debugger/gdbsx/Makefile +++ b/tools/debugger/gdbsx/Makefile @@ -1,20 +1,20 @@ XEN_ROOT = $(CURDIR)/../../.. include ./Rules.mk +SUBDIRS-y += gx +SUBDIRS-y += xg + +TARGETS := gdbsx + .PHONY: all -all: - $(MAKE) -C gx - $(MAKE) -C xg - $(MAKE) gdbsx +all: $(TARGETS) .PHONY: clean -clean: - rm -f xg_all.a gx_all.a gdbsx - set -e; for d in xg gx; do $(MAKE) -C $$d clean; done +clean: subdirs-clean + rm -f $(TARGETS) .PHONY: distclean distclean: clean - set -e; for d in xg gx; do $(MAKE) -c $$d distclean; done .PHONY: install install: all @@ -28,7 +28,7 @@ uninstall: gdbsx: gx/gx_all.a xg/xg_all.a $(CC) $(LDFLAGS) -o $@ $^ -xg/xg_all.a: +xg/xg_all.a: FORCE $(MAKE) -C xg -gx/gx_all.a: +gx/gx_all.a: FORCE $(MAKE) -C gx diff --git a/tools/debugger/gdbsx/gx/Makefile b/tools/debugger/gdbsx/gx/Makefile index 3b8467f799..ff5c8e9e6e 100644 --- a/tools/debugger/gdbsx/gx/Makefile +++ b/tools/debugger/gdbsx/gx/Makefile @@ -2,21 +2,20 @@ XEN_ROOT = $(CURDIR)/../../../.. include ../Rules.mk GX_OBJS := gx_comm.o gx_main.o gx_utils.o gx_local.o -GX_HDRS := $(wildcard *.h) + +TARGETS := gx_all.a .PHONY: all -all: gx_all.a +all: $(TARGETS) .PHONY: clean clean: - rm -rf gx_all.a *.o .*.d + rm -f *.o $(TARGETS) $(DEPS_RM) .PHONY: distclean distclean: clean -#%.o: %.c $(GX_HDRS) Makefile -# $(CC) -c $(CFLAGS) -o $@ $< - -gx_all.a: $(GX_OBJS) Makefile $(GX_HDRS) - ar cr $@ $(GX_OBJS) # problem with ld using -m32 +gx_all.a: $(GX_OBJS) Makefile + ar cr $@ $(GX_OBJS) +-include $(DEPS_INCLUDE) diff --git a/tools/debugger/gdbsx/xg/Makefile b/tools/debugger/gdbsx/xg/Makefile index acdcddf0d5..a02c7649cf 100644 --- a/tools/debugger/gdbsx/xg/Makefile +++ b/tools/debugger/gdbsx/xg/Makefile @@ -1,35 +1,24 @@ XEN_ROOT = $(CURDIR)/../../../.. include ../Rules.mk -XG_HDRS := xg_public.h XG_OBJS := xg_main.o CFLAGS += -D__XEN_TOOLS__ CFLAGS += $(CFLAGS_xeninclude) +TARGETS := xg_all.a .PHONY: all -all: build +all: $(TARGETS) -.PHONY: build -build: xg_all.a $(XG_HDRS) $(XG_OBJS) Makefile -# build: mk-symlinks xg_all.a $(XG_HDRS) $(XG_OBJS) Makefile -# build: mk-symlinks xg_all.a - -xg_all.a: $(XG_OBJS) Makefile $(XG_HDRS) - ar cr $@ $(XG_OBJS) # problems using -m32 in ld -# $(LD) -b elf32-i386 $(LDFLAGS) -r -o $@ $^ -# $(CC) -m32 -c -o $@ $^ - -# xg_main.o: xg_main.c Makefile $(XG_HDRS) -#$(CC) -c $(CFLAGS) -o $@ $< - -# %.o: %.c $(XG_HDRS) Makefile -- doesn't work as it won't overwrite Rules.mk -#%.o: %.c -- doesn't recompile when .c changed +xg_all.a: $(XG_OBJS) Makefile + ar cr $@ $(XG_OBJS) .PHONY: clean clean: - rm -rf xen xg_all.a $(XG_OBJS) .*.d + rm -f $(TARGETS) $(XG_OBJS) $(DEPS_RM) .PHONY: distclean distclean: clean + +-include $(DEPS_INCLUDE) From patchwork Mon Dec 6 17:02:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659059 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BE20BC433EF for ; Mon, 6 Dec 2021 17:09:06 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239533.415500 (Exim 4.92) (envelope-from ) id 1muHU1-00080l-EB; Mon, 06 Dec 2021 17:08:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239533.415500; Mon, 06 Dec 2021 17:08:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHU0-0007vE-E9; Mon, 06 Dec 2021 17:08:56 +0000 Received: by outflank-mailman (input) for mailman id 239533; Mon, 06 Dec 2021 17:08:53 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHP0-0005ti-J6 for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:46 +0000 Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 76fafa5b-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:03:44 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 76fafa5b-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810224; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ix7uXYCPxugAAtLthbMjrkXsWY6ZoE/GgEwLTETP25c=; b=HkuGhOiQBrLNYJa4UIkLEKTPPtJUsvjCuMKRN80MengjAkbJQP3vt0j0 6Bhd6+WI0qBTim5Z2LISx6bNS/9fYMLqQUAF9EeZM1Otxt0P8YJiqifFF wk7Bz8qLhTcNebpBRasxGqBs3DMMh2PtTSPXr8E4qEuY+Hnv/FolyhSdO Q=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: W+6FDTCdqCvWJA91+Gi73joeTWqDf7MYYkzAqMOaROaKbqtY4oGOrlJaoLwkdkhkjx9LCLRdY6 /yhNcqoBH5dyxVqiUkM8e/6ilOJv11Zk7h/U8Rj5S0gB6S5ogZuiert7E486DpnXZF0wG0Ep2g DIsjyLrXsjdd8ai2RPdYwnJ7bW5F25bnp6CoxhO1wAnz8PplF21Tl8aKPBWLQfXYwXzivpIzzf 8+8Nglt8SK8xnTXr8yVGKPh1jcAcw8OlzcFEJTGyXQipi/FWRo9hHgi3ABt9ht3RJOy+IbSrYe VG1CGlsFL9cOnNQcQFsTL/w6 X-SBRS: 5.1 X-MesageID: 59370634 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:sdDexa7J3WzLRb1HIZpuEQxRtN7AchMFZxGqfqrLsTDasY5as4F+v mROWm+CM/eDM2emc9l1PNzlpksH7JfUndNlGQA5qC5nHi5G8cbLO4+Ufxz6V8+wwmwvb67FA +E2MISowBUcFyeEzvuV3zyIQUBUjclkfJKlYAL/En03FVAMpBsJ00o5wrdj2tAw27BVPivW0 T/Mi5yHULOa82Yc3lI8s8pvfzs24ZweEBtB1rAPTagjUG32zhH5P7pGTU2FFFPqQ5E8IwKPb 72rIIdVXI/u10xF5tuNyt4Xe6CRK1LYFVDmZnF+A8BOjvXez8CbP2lS2Pc0MC9qZzu1c99Zy cgWk6bzcCwVLvPIvedMSiYIHhFFBPgTkFPHCSDXXc27ykTHdz3nwul0DVFwNoodkgp1KTgQr 7pCcmlLN03dwbLtqF64YrAEasALJc/3PIQZqzd4wCvQF/oOSpHfWaTao9Rf2V/cg+gTTK2BP 5RCNVKDajzwIEEeGlIHJK4Mjby6tlvkWRRSqlK88P9fD2/7k1UqjemF3MDuUt2VR+1Fk0CAv GXE8m/lRBYAO7S31j6t4n+qwOjVkkvTSI8UUbG16PNuqFmS3XAITg0bU0Ohpvu0gVL4XMhQQ 2Qd/DYuqq4jslSmVNDnUzW3pXeFulgXXN84LgEhwFjTkOyOuV/fXzVaCG4aADA7iCMobT03j Xmz3OrCOSwxtJiWGGuiprqklgrnbED5MlQ+TSMDSAIE5fzqr4cykg/DQ75fLUKlsjHmMWqum m7X9UDSk51W1JdWjPvjoTgrlhr1/sCRJjPZ8Dk7SY5MAulRQIe+L7Kl5lHAhRqrBNbIFwLR1 JTodiX30QzvMX1vvHHUKAnuNOvwjxpgDNE6qQQ1d3XG327yk0NPhagKvFlDyL5Ba67ogwPBb k7Joh9275ROJnasZqIfS9vvUJR1l/m9T467CaC8gj9yjn5ZLlXvEMZGPxH44owQuBJ0zfFX1 WmzL65A8kr2+Yw4lWHrFo/xIJcgxzwkxHO7eHwI50/P7FZqX1bMEe1tGALXNogRtfrYyC2Io 4c3H5bbkH13DbyhChQ7BKZOdDjm21BgXsuowyGWH8beSjdb9JYJV6WMnOh/ItM9xMy4VI7gp xmAZ6OR83Kn7VWvFOlAQikLhGrHUcktoHQlEzYrOFr0iXEvbZz2tPUUdoctfKlh/+tmlKYmQ /4AcsSGI/JOVjWYpGhNMcij9NRvJEaxmAaDHyu5ezxjLZRucBPEp43/dQz1+ShQUifu7Zkio 6et3x/wSIYYQ1gwF97fbf+ilgvjvXUUlO9ocVHPJ91fJBfl/IRwcnSjhf4rOcAcbx7Ew2LCh QqRBB4Zo8jLopM0r4aV1fzV8d/xHrInTERAHmTd4bKnDgXg/zKukd1aTeKFXTHBT2eoqq+sU vpYkqPnO/odkVcU74clS+R3zbgz7sfErqNBylg2B23CalmmB+8yInSC2sUT5KRByqUA5FmzU 0OLvNJbJa+IKIXuF1tIfFgpaeGK1Pc1nDjO7KtqfBWmtXEvpLfXA19POxSsiTBGKOonOYwo9 u4tpcoK5lHtkREtKNuH0nhZ+mnkwqbsiEn7WkX22LPWtzc= IronPort-HdrOrdr: A9a23:gyIN6KDA4wJph53lHemq55DYdb4zR+YMi2TC1yhKJiC9Ffbo8P xG/c5rrCMc5wxxZJhNo7290ey7MBHhHP1OkO0s1NWZPDUO0VHAROoJ0WKh+UyEJ8SXzJ866U 4KScZD4bPLYWSS9fyKgzWFLw== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59370634" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu Subject: [XEN PATCH 25/57] tools/examples: cleanup Makefile Date: Mon, 6 Dec 2021 17:02:08 +0000 Message-ID: <20211206170241.13165-26-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Don't check if a target exist before installing it. For directory, install doesn't complain, and for file it would prevent from updating them. Remove XEN_CONFIGS-y which isn't used. Remove "build" target. Add an empty line after the first comment. The comment isn't about $(XEN_READMES), it is about the makefile as a whole. Signed-off-by: Anthony PERARD --- tools/examples/Makefile | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/tools/examples/Makefile b/tools/examples/Makefile index 14e24f4cb3..48b520e133 100644 --- a/tools/examples/Makefile +++ b/tools/examples/Makefile @@ -2,6 +2,7 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk # Xen configuration dir and configs to go there. + XEN_READMES = README XEN_CONFIGS += xlexample.hvm @@ -10,14 +11,9 @@ XEN_CONFIGS += xlexample.pvhlinux XEN_CONFIGS += xl.conf XEN_CONFIGS += cpupool -XEN_CONFIGS += $(XEN_CONFIGS-y) - .PHONY: all all: -.PHONY: build -build: - .PHONY: install install: all install-readmes install-configs @@ -26,10 +22,8 @@ uninstall: uninstall-readmes uninstall-configs .PHONY: install-readmes install-readmes: - [ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \ - $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR) - set -e; for i in $(XEN_READMES); \ - do [ -e $(DESTDIR)$(XEN_CONFIG_DIR)/$$i ] || \ + $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR) + set -e; for i in $(XEN_READMES); do \ $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \ done @@ -39,12 +33,9 @@ uninstall-readmes: .PHONY: install-configs install-configs: $(XEN_CONFIGS) - [ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \ - $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR) - [ -d $(DESTDIR)$(XEN_CONFIG_DIR)/auto ] || \ - $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)/auto - set -e; for i in $(XEN_CONFIGS); \ - do [ -e $(DESTDIR)$(XEN_CONFIG_DIR)/$$i ] || \ + $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR) + $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)/auto + set -e; for i in $(XEN_CONFIGS); do \ $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \ done From patchwork Mon Dec 6 17:02:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12658993 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 487F2C4332F for ; Mon, 6 Dec 2021 17:07:19 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239449.415116 (Exim 4.92) (envelope-from ) id 1muHSI-0005of-1J; Mon, 06 Dec 2021 17:07:10 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239449.415116; Mon, 06 Dec 2021 17:07:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHSH-0005oW-TK; Mon, 06 Dec 2021 17:07:09 +0000 Received: by outflank-mailman (input) for mailman id 239449; Mon, 06 Dec 2021 17:07:09 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPL-0005ti-G6 for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:07 +0000 Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8461dcdc-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:04:06 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8461dcdc-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810246; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SYJTJIKxHEFQcMKNpvz4kHz4LT/E8ZyffBaU/35UM+o=; b=SZpZIlN/a17Ht6GaXvXX8/7SyBd3Pp2dTxLfhp7yRWDcgEMHZ9E4rZRi 7rTWRxC+oRNoPbUoDjMaJbXUz/Dd1Fw+EB2JyRBGsbAICc9S/ptJ609+o molDybIW1BCryY0UNuuxS50EkR4doQccRDH/wQyhfotnzr7biwB1Mfw+6 Y=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: VCdhQLflCCIZyRDomZsky6KSMXnle3oGtqd3o5o8N7VxYOorQ/qkUU4iNNAzQcdffkS21AIJlM gjy7VQ1ZNkfstePOqeQz9jCWEGCmsmIgPuQxysZk6bxRWtWiOC/eUdbHseV8hXQs6u+kM7oren PuEWLFXSw/BosuoSlvze/WY/Ghk4McC4ekghT9eaICt8yd2pKILl2RtEIr8+AJV6myEICKQOrl 7l+4ouN8vfjx09W+Ht9XEoR+i4Bjjf5XXCh9PH/Hrxs5ic4iTxyUC+YU2ioEU+Z6jsoEAbqPq3 AHXvs4FrJVgDM+kwDSDm51q8 X-SBRS: 5.1 X-MesageID: 59387870 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:otoXGKiBxFDXDfpOgfhSP/JAX161khcKZh0ujC45NGQN5FlHY01je htvXGDSOanZN2qme4xyYI+z8UpSvMLczYc3QQVsryA8E38b9cadCdqndUqhZCn6wu8v7a5EA 2fyTvGacajYm1eF/k/F3oAMKRCQ7InQLlbGILes1htZGEk0F0/NtTo5w7Rg29Qw34Dja++wk YiaT/P3aQfNNwFcagr424rbwP+4lK2v0N+wlgVWicFj5DcypVFMZH4sDfjZw0/DaptVBoaHq 9Prl9lVyI97EyAFUbtJmp6jGqEDryW70QKm0hK6UID66vROS7BbPg/W+5PwZG8O4whlkeydx /136cCxYg0DM5HDhbw6dTgbThByIY9/reqvzXiX6aR/zmXDenrohf5vEFs3LcsT/eMf7WNmr KJCbmpXN1ba2rzwkOnTpupE36zPKOHiOp8fvXdxiynUF/88TbjIQrnQ5M8e1zA17ixLNauPP JpGOWU3BPjGSxIICGg0N6gFpc6HljrQcjNGrnCL9INitgA/yyQuieOwYbI5YOeiWsF9jkue4 GXc8AzRAw4YHMySzyKf9XChjfOJmjn0MKoQHrCl8v9hgHWI23ceThYRUDOTsfS/z0KzRd9bA 0gV4TY167g/8lSxSdvwVAH+p2SL1jYVXcZQFOsrrhmA0KPO7y6WA2EFSnhKb9lOiSMtbWV0j BnTxYqvXGEx9u3OIZ6AyluKhQnuZSk+J0UPWSAZFSwjwpq+kY0vrCuaG76PD5WJptHyHDjxx RWDoy4/m6gfgKY36kmrwbzUq2ny/8aUF2bZ8i2SBzv4tV0hOOZJcqTxsQCDhcusOrp1WbVoU JIsv8GFpN4DApiW/MBmaLVcRer5jxpp3dC1vLKOI3XD32n0k5JAVdoJiN2bGKuPGpxeEdMOS BWM0T69HLcJYBOXgVZfOupd8fgCw6n6DsjCXfvJdNdIaZUZXFbZp3ExPx/NhTqzzxhEfUQD1 XGzK5zE4ZEyU/sP8dZLb71Fje9DKt4Wmws/uqwXPzz4iOHDNRZ5uJ8OMUeUb/BR0U93iF69z jqrDOPTk083eLSnOkH/qNdPRXhXfSlTLc2n8KR/K7/cSjeK7Ul8Upc9N5t6INc790mU/8+Vl kyAtrhwlACi2CaZcFrSMRiOqtrHBP5CkJ7yBgR0VX7A5pTpSdv0hEvGX5doL7Qh6sJ5yvt4E 6sMd8maW6wdQTXb4TUNK5L6qdU6JhisgAuPOQujYSQ+IME8F1CYpIe8c1u97jQKAwq2qdA6/ ++q2DTETMdRXA9lFsvXNq6ilgvjoXgHletudELUOd0PKl70+Y1nJnWp3P86Ks0BMzvZwT6e2 1rECBsUv7CV8YQ07MPIleaPqILwS7lyGU9THm/667eqNHaFojr/kNEYCOvRJGLTTmL5/qmmd N559fCkPa1VhktOvqp9D61vkfA06ezwquII1Q9jBnjKMQimU+syPnmc0MBTnaRR3bsF6xCuU 0eC99QGa7WEPMTpTAwYKAY/N7nR0PgVnn/Z7OgvIVW87yhypeLVXUJXNhiKqSpcMLoqb991n bZ/4JYbu16llx4nEtealSQFpW2DI0sJX7gjqpxHUpTgjRAmyw0abJHRYsMsDEpjtzmY3pEWH wKp IronPort-HdrOrdr: A9a23:2jT6tqsanajhhILcCJNg4BUy7skDfNV00zEX/kB9WHVpmszxra +TdZMgpHrJYVcqKRYdcL+7WZVoLUmwyXcX2/hyAV7BZmnbUQKTRekIh7cKqweQfxEWndQy6U 4PScRD4aXLfDtHsfo= X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59387870" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Wei Liu , Ian Jackson Subject: [XEN PATCH 26/57] tools/firmware/hvmloader: rework Makefile Date: Mon, 6 Dec 2021 17:02:09 +0000 Message-ID: <20211206170241.13165-27-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Setup proper dependencies with libacpi so we don't need to run "make hvmloader" in the "all" target. ("build.o" new prerequisite isn't exactly proper but a side effect of building the $(DSDT_FILES) is to generate the "ssdt_*.h" needed by "build.o".) Make use if "-iquote" instead of a plain "-I". For "roms.inc" target, use "$(SHELL)" instead of plain "sh". And use full path to "mkhex" instead of a relative one. Lastly, add "-f" flag to "mv", in case the target already exist. Signed-off-by: Anthony PERARD --- tools/firmware/hvmloader/Makefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index b754220839..fc20932110 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -60,8 +60,7 @@ ROMS += $(ROMBIOS_ROM) $(STDVGA_ROM) $(CIRRUSVGA_ROM) endif .PHONY: all -all: acpi - $(MAKE) hvmloader +all: hvmloader .PHONY: acpi acpi: @@ -73,12 +72,15 @@ smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(SMBIOS_REL_DATE)\"" ACPI_PATH = ../../libacpi DSDT_FILES = dsdt_anycpu.c dsdt_15cpu.c dsdt_anycpu_qemu_xen.c ACPI_OBJS = $(patsubst %.c,%.o,$(DSDT_FILES)) build.o static_tables.o -$(ACPI_OBJS): CFLAGS += -I. -DLIBACPI_STDUTILS=\"$(CURDIR)/util.h\" +$(ACPI_OBJS): CFLAGS += -iquote . -DLIBACPI_STDUTILS=\"$(CURDIR)/util.h\" CFLAGS += -I$(ACPI_PATH) vpath build.c $(ACPI_PATH) vpath static_tables.c $(ACPI_PATH) OBJS += $(ACPI_OBJS) +$(DSDT_FILES): acpi +build.o: $(DSDT_FILES) + hvmloader: $(OBJS) hvmloader.lds $(LD) $(LDFLAGS_DIRECT) -N -T hvmloader.lds -o $@ $(OBJS) @@ -87,21 +89,21 @@ roms.inc: $(ROMS) ifneq ($(ROMBIOS_ROM),) echo "#ifdef ROM_INCLUDE_ROMBIOS" >> $@.new - sh ../../misc/mkhex rombios $(ROMBIOS_ROM) >> $@.new + $(SHELL) $(XEN_ROOT)/tools/misc/mkhex rombios $(ROMBIOS_ROM) >> $@.new echo "#endif" >> $@.new endif ifneq ($(STDVGA_ROM),) echo "#ifdef ROM_INCLUDE_VGABIOS" >> $@.new - sh ../../misc/mkhex vgabios_stdvga $(STDVGA_ROM) >> $@.new + $(SHELL) $(XEN_ROOT)/tools/misc/mkhex vgabios_stdvga $(STDVGA_ROM) >> $@.new echo "#endif" >> $@.new endif ifneq ($(CIRRUSVGA_ROM),) echo "#ifdef ROM_INCLUDE_VGABIOS" >> $@.new - sh ../../misc/mkhex vgabios_cirrusvga $(CIRRUSVGA_ROM) >> $@.new + $(SHELL) $(XEN_ROOT)/tools/misc/mkhex vgabios_cirrusvga $(CIRRUSVGA_ROM) >> $@.new echo "#endif" >> $@.new endif - mv $@.new $@ + mv -f $@.new $@ .PHONY: clean clean: From patchwork Mon Dec 6 17:02:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659021 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 80B0CC433EF for ; Mon, 6 Dec 2021 17:08:17 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239502.415298 (Exim 4.92) (envelope-from ) id 1muHTA-0006TS-Jt; Mon, 06 Dec 2021 17:08:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239502.415298; Mon, 06 Dec 2021 17:08:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHTA-0006SP-B8; Mon, 06 Dec 2021 17:08:04 +0000 Received: by outflank-mailman (input) for mailman id 239502; Mon, 06 Dec 2021 17:08:02 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHP5-0005ta-6k for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:51 +0000 Received: from esa6.hc3370-68.iphmx.com (esa6.hc3370-68.iphmx.com [216.71.155.175]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 7a879e1f-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:03:49 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 7a879e1f-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810229; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BHKgdcCFIcw2aiewzH6pZ1uVlVigf4URrqTZQIJcZwI=; b=aWAlpeRPquChvIDdxnpX6wHzzAIuOAEFMGyzOUu1kshr98uix1niOO02 55uxkwsBg3xRDiVDXqp2nIIKi2U76ClZ4lWm0xk44Ejxdsa5104jU/pNJ aalJ27VffPoTTKSKKCGfT4i4vU8i4IhyQ3jmmfwWpS8x2eZLOPfuYkvJ9 Q=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: awMe2UEYGgJ6YVSNJTcx4uOQBPZtcMozEo6Gb0XSc5/gjJpI/J1x5WSIwh5RKy0Sst6+qLRvHY +kvYfuB/0MtGUz2UzWeeoaJSPcFPAM6+dV82njyVa/NqTe0mV2aiTfMhqadskkpyaY6mSgk2VB qsXkg38jpOkufAuoZeWpSIJh9IYqG1RIsol4Db+vogdA9jzn2r5aqrglEFYLgcLcOH1HccN5x6 BF5SsHhzI6K9Yh3I5cXWZ7XQ0PT2n9/Oilfr1yT4gl7EArt4aoZPK0LYMuB44+tE6dUIgptUGn 25SxMsOVel72n0dmof0BCmui X-SBRS: 5.1 X-MesageID: 59324094 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:o7nY7azFhEaYtWPCfgh6t+eswSrEfRIJ4+MujC+fZmUNrF6WrkVSy WYeDD+BO6mNNzHwe95yPN+y/RhX6JfWm9FmGlNrpCAxQypGp/SeCIXCJC8cHc8zwu4v7q5Dx 59DAjUVBJlsFhcwnvopW1TYhSEUOZugH9IQM8aZfHAuLeNYYH1500s6wbZn2tQAbeWRWGthh /uj+6UzB3f9s9JEGjp8B3Wr8U4HUFza4Vv0j3RmDRx5lAa2e0o9VfrzEZqZPXrgKrS4K8bhL wr1IBNVyUuCl/slIovNfr8W6STmSJaKVeSFoiI+t6RPHnGuD8H9u0o2HKN0VKtZt9mGt4Eo+ e1ui4eecgwKFIqLnu88bDBUFRgraMWq+JefSZS+mcmazkmAeHrw2fR+SkoxOOX0+M4uXzsIr 6ZBbmlQMFbT3Ipaw5riIgVors0lMMnsOpJZonx6xCvVJf0nXYrCU+PB4towMDIY25EVR6qGN pZxhTxHSBXyXw1kKkksBbUejOjr33PdfRYCtwfAzUYwyzeKl1EguFT3C/LXZ9iLSMN9jkue4 GXc8AzRGQoGPdaSzT6E9HOEheLVmy7/HoUIG9WQ6fpCkFCVgGsJB3U+V1G2vP24gU6WQM9EJ gof/S9Ghbg/8gmnQ8fwWzW8oWWYpVgMVtxICeo45QqRjK3O7G6xD24YTjlHeZo+udU/XzAC2 VqAntevDjtq2JWUVnC15rqStSm1OyUeMSkFfyBscOcey4C9+sdp1EuJF4s9Vv7u5jHoJd3u6 2HTnRAdua49tsUo/YL8+1vmvBugoKGcG2bZ+T7rdm6i6wp4YqusaIqp9UXX4J58EWqJcrWSl CNawpbDtYjiGbnIzXXQG7tVQNlF8t7caGWE6WODCaXN4NhEF5SLWYlLqA9zK05yWirvUW+4O RSD0e+9CXI6AZdLUUOVS9/oYyjJ5fK5fTgAahwyRoAUCnSWXFXYlByCnWbKgwjQfLEEyMnTw 6uzf8e2Fmo9Aq961jewTOp1+eZ1nXBhnzKOH8qlkETPPV+iiJi9E+1t3LymNL9R0U95iF+Nr 4Y32zWilX2zr9ESkgGIqNVOfDjm3FAwBIzsqtw/SwJwClEOJY3VMNeImelJU9U8x8x9z76Ul lngCh4w4Aeu3hXvdFTVAk2PnZuyBP6TW1pgZndyVbtpslB+CbuSAFA3K8FqIOJ5rbM7lpaZj ZAtIq29PxiGcRyfkxx1UHU3hNAKmM2DiV3cMiy7TiI4epI8FQXF9sW9Jlnk9TUUDzrxvsw7+ uXy2gTeSJsFZgJjEMeJN67/kwLv5SAQyLBoQk/FAthPY0GwooJkHDP8060sKMYWJBSdmjbDj 1SKAQ0VrPXmqpMu9IWbnriNqoqkSrMsHkdTE2TBw6yxMC3WojiqzYNaCb7adjHBTmLkvq6lY LwNnf37NfQGmndMspZ9TOk3nf5vuYO3quYDnAp+HXjNY1C6MZ9aIyGLjZtVq6lA5r5Fog/qC EiBzcZXZOeSM8T/HV9PeAd8Nraf1esZkyX55OguJBmo/zd++beKXBkAPxSIjyABfrJ5PJl8n LUksc8SrQe+lgArIpCNiSUNrzaAKXkJUqMGsJAGAdC01lp3mw8aOZGMWDXr5JyvaslXNhh4K zCZs6POmrBAyxeQaHE0D3XMgbJQiJlmVMqmF7Pey4BlQub4u8I= IronPort-HdrOrdr: A9a23:N+xA662ldZKWd4fSpzOQyQqjBLQkLtp133Aq2lEZdPRUGvb2qy nIpoV96faUskdpZJhOo7G90cW7LE80sKQFg7X5Xo3SODUO2lHJEGgK1+KLqFfd8m/Fh4tgPM 9bAs5D4bbLY2SS4/yX3ODBKadC/OW6 X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59324094" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Julien Grall , "Stefano Stabellini" , Wei Liu Subject: [XEN PATCH 27/57] tools/fuzz/libelf: rework makefile Date: Mon, 6 Dec 2021 17:02:10 +0000 Message-ID: <20211206170241.13165-28-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Rename ELF_LIB_OBJS to LIBELF_OBJS as to have the same name as in libs/guest/. Replace "-I" by "-iquote". Remove the use of "vpath". It will not works when we will convert this makefile to subdirmk. Instead, we create symlinks to the source files. Signed-off-by: Anthony PERARD --- .gitignore | 1 + tools/fuzz/libelf/Makefile | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index c31fa9b841..4267bb4dee 100644 --- a/.gitignore +++ b/.gitignore @@ -197,6 +197,7 @@ tools/flask/utils/flask-setenforce tools/flask/utils/flask-set-bool tools/flask/utils/flask-label-pci tools/fuzz/libelf/afl-libelf-fuzzer +tools/fuzz/libelf/libelf-*.c tools/fuzz/x86_instruction_emulator/asm tools/fuzz/x86_instruction_emulator/afl-harness tools/fuzz/x86_instruction_emulator/afl-harness-cov diff --git a/tools/fuzz/libelf/Makefile b/tools/fuzz/libelf/Makefile index 9eb30ee40c..9211f75951 100644 --- a/tools/fuzz/libelf/Makefile +++ b/tools/fuzz/libelf/Makefile @@ -1,25 +1,24 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk -# libelf fuzz target -vpath %.c ../../../xen/common/libelf -CFLAGS += -I../../../xen/common/libelf -ELF_SRCS-y += libelf-tools.c libelf-loader.c libelf-dominfo.c -ELF_LIB_OBJS := $(patsubst %.c,%.o,$(ELF_SRCS-y)) +LIBELF_OBJS := libelf-tools.o libelf-loader.o libelf-dominfo.o -$(patsubst %.c,%.o,$(ELF_SRCS-y)): CFLAGS += -Wno-pointer-sign - -$(ELF_LIB_OBJS): CFLAGS += -DFUZZ_NO_LIBXC $(CFLAGS_xeninclude) +CFLAGS += -iquote ../../../xen/common/libelf +$(LIBELF_OBJS): CFLAGS += -Wno-pointer-sign +$(LIBELF_OBJS): CFLAGS += -DFUZZ_NO_LIBXC $(CFLAGS_xeninclude) libelf-fuzzer.o: CFLAGS += $(CFLAGS_xeninclude) -libelf.a: libelf-fuzzer.o $(ELF_LIB_OBJS) +$(LIBELF_OBJS:.o=.c): libelf-%.c: ../../../xen/common/libelf/libelf-%.c FORCE + ln -nsf $< $@ + +libelf.a: libelf-fuzzer.o $(LIBELF_OBJS) $(AR) rc $@ $^ .PHONY: libelf-fuzzer-all libelf-fuzzer-all: libelf.a libelf-fuzzer.o -afl-libelf-fuzzer: afl-libelf-fuzzer.o libelf-fuzzer.o $(ELF_LIB_OBJS) +afl-libelf-fuzzer: afl-libelf-fuzzer.o libelf-fuzzer.o $(LIBELF_OBJS) $(CC) $(CFLAGS) $^ -o $@ # Common targets @@ -31,7 +30,7 @@ distclean: clean .PHONY: clean clean: - rm -f *.o .*.d *.a *-libelf-fuzzer + rm -f *.o .*.d *.a *-libelf-fuzzer $(LIBELF_OBJS:.o=.c) .PHONY: install install: all From patchwork Mon Dec 6 17:02:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659113 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3BF5AC433EF for ; Mon, 6 Dec 2021 17:09:40 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239553.415600 (Exim 4.92) (envelope-from ) id 1muHUa-0006Fo-Oq; Mon, 06 Dec 2021 17:09:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239553.415600; Mon, 06 Dec 2021 17:09:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHUa-0006FE-Gu; Mon, 06 Dec 2021 17:09:32 +0000 Received: by outflank-mailman (input) for mailman id 239553; Mon, 06 Dec 2021 17:09:30 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHP8-0005ti-TQ for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:55 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 7d14dfc1-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:03:53 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 7d14dfc1-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810233; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fz7iB4/hMl48cBu22uue0tUZKrebFs2DyNDqcnDK2Iw=; b=ROxuHnGSlcrATfWsflv6fhHKkdpgAY4sXEMp0yo9UfA6xPu762IPO69V wE2nas5k2pr2q5tFe7gyHIb6xQkeuKTm8XQ96CW/bz5gc4BqDM4/DbHiK dbNHm6U8Yo4xjfmYUw5UQhOyAXZbEQnuwUBL/esgHGpu81zvwzaxV12Y9 g=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: rirpVZty3j+bOOjV58EewuXvHGh72oMfFIzE1grCdfzyyFYMI0I0jfwqx1uVIrPgNyZsu4/GBn bDPg8yO86RRGlotZjf08VliKBcOa8+0ykg+tp0tPpW5mvcZ2Udcgm4lzilnDDs9HKtelc9dkvT +9qg5Rfg3/FrbE3IUd5rNnqx+bELznVHN/LEiIBRslWLovavcfRAIrTXYd/FfKMLqcpP3zPwez Yzjilyz6uyCODfBOSniUCc5In7jNYbDPIEY5Mmr3ijRckKuDS3l1//xTG77Ji9vk0C4MGyx4Fa Oj9cfJTMT1h7HwhIgB8pLFjn X-SBRS: 5.1 X-MesageID: 59766481 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:1pHFnKmo4M32J74P2aZkctfo5gwaIURdPkR7XQ2eYbSJt1+Wr1Gzt xIeC23UbPaJYDD9L9gkOYXl9h8Av8fTytYyTVBtriEwRCMWpZLJC+rCIxarNUt+DCFioGGLT Sk6QoOdRCzhZiaE/n9BClVlxJVF/fngqoDUUYYoAQgsA187IMsdoUg7wbdg2NY22YLR7z6l4 rseneWOYDdJ5BYsWo4kw/rrRMRH5amaVJsw5zTSVNgT1LPsvyB94KE3fMldG0DQUIhMdtNWc s6YpF2PEsE1yD92Yj+tuu6TnkTn2dc+NyDW4pZdc/DKbhSvOkXee0v0XRYRQR4/ttmHozx+4 NtmnJKfVA0mBZ3dqMoMVkllOhhlEKITrdcrIVDn2SCS50jPcn+qyPRyFkAme4Yf/46bA0kXq 6ZecmpUKEne2aTmm9pXScE17ignBMDtIIMYvGAm1TzDBOwqaZvCX7/L9ZlT2zJYasVmQKeBO ZRFOWMHgBLoZydXBXEpVLwEo+7xgkb2axMb9kzOqv9ii4TU5FMoi+W8WDbPQfSIWMFUk0Cwt m/AuWPjDXkyL8eDwDCI9natgO7nni7hXo8WUrqi+ZZCn1m71mEVThoMWjOTo/O0l0q/UNJ3M FEP92wlqq1a3FymSJzxUgO1pFaAvwUAQJxAHusi8gaPx6HIpQGDCQAsRzhdaNsgpYkuSCYjz FOhkNbgBDgpu7qQIVqc6bW8vT60ITISL2IJeWkDVwRt3jX4iNht1FSVFI8lSfPryI2ucd3t/ 9yUhCYVrrs8kMQE7JWqzX7WhmKRj6HSYwFgs207QVmZxg9+YYekYamh5l7a8etMIe6lc7WRg JQXs5PAtb5TVPlhgATIGbxQR+/xu55pJRWF2QY3d6TN4QhB7JJKkWp4xDhlbHlkPc8fEdMCS B+C4FgBjHO/0ZbDUEOWX25TI5lzpUQDPY68PhwxUjaoSsIrHONg1HsxDXN8J0i3zCARfVgXY P93i/qEA3cAErhAxzGrXeob2rJD7nlgnjOMH8GmlU75jur2iJuppVEtagHmggcRtvzsneko2 4wHa5viJ+t3DoUSnRU7AaZMdAtXfBDX9Lj9qtBNd/7rH+aVMDpJNhMl+pt4I9YNt/0Mzo/gp yjhMmcFmAuXrSCWcm2iNyE8AI4DqL4i9BrXywR3Zg32s5XiCK7yhJoim2wfIeN6qbc9lKEsF JHouayoW5xyd9gOwBxFBbGVkWCoXE3DadumM3X3bT4hUYRnQgCVqNbochG2rHsFDzattNt4q Lqlj1uJTZ0GTgVkLcDXdPPwkA/h4SlDwLp/DxnSP91eWETw64w2eSb/ueA6fpMXIhLZyzrEi wvPWUUEpfPAqpMe+cXSgfzWtJ+gFuZzRxIIH2TS4busGzPd+26vnd1JXOqSJGiPX2Lo4qSyI +5SyqikYvEAmV9Ltat6Eqpqkv1it4e++ecCw109TnvRblmtBrdxGVW83JFC5v9X27tUmQqqQ UbTqNNUDqqEZZH+G1kLKQt7MunajaMImiPf5OgeKVnh4HMl56KOVEhfMkXeiCFZK7cpYoopz f145ZwT4g27zBErLsyHnmZf8GHVdi4MVKAut5c7Bo73i1V0lgEeMMKEUiKmsouSb9hsM1UxJ m7GjaXPsL1Q207efidhDnPKx+dc2cwDtR0iIIXu/LhVdg4pXsMK4SA= IronPort-HdrOrdr: A9a23:tpesOqnjWiLHPUrUxexJ662u7cbpDfIq3DAbv31ZSRFFG/Fxl6 iV88jzsiWE7wr5OUtQ4OxoV5PgfZqxz/NICMwqTNWftWrdyQ+VxeNZjbcKqgeIc0aVygce79 YET0EXMqyXMbEQt6jHCWeDf+rIuOP3k5yVuQ== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59766481" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Julien Grall , "Stefano Stabellini" , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Subject: [XEN PATCH 28/57] tools/fuzz/x86_instruction_emulator: rework makefile Date: Mon, 6 Dec 2021 17:02:11 +0000 Message-ID: <20211206170241.13165-29-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Rework dependencies of all objects. We don't need to add dependencies for headers that $(CC) is capable of generating, we only need to include $(DEPS_INCLUDE). Some dependencies are still needed so make knows to generate symlinks for them. We remove the use of "vpath" for cpuid.c. While it works fine for now, when we will convert this makefile to subdirmk, vpath will not be usable. Also, "-iquote" is now needed to build "cpuid.o". Replace "-I." by "-iquote .", so it applies to double-quote includes only. Rather than checking if a symlink exist, always regenerate the symlink. So if the source tree changed location, the symlink is updated. Signed-off-by: Anthony PERARD --- .gitignore | 1 + tools/fuzz/x86_instruction_emulator/Makefile | 32 +++++++++----------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 4267bb4dee..8fb74a4c94 100644 --- a/.gitignore +++ b/.gitignore @@ -201,6 +201,7 @@ tools/fuzz/libelf/libelf-*.c tools/fuzz/x86_instruction_emulator/asm tools/fuzz/x86_instruction_emulator/afl-harness tools/fuzz/x86_instruction_emulator/afl-harness-cov +tools/fuzz/x86_instruction_emulator/cpuid.c tools/fuzz/x86_instruction_emulator/wrappers.c tools/fuzz/x86_instruction_emulator/x86_emulate tools/fuzz/x86_instruction_emulator/x86-emulate.[ch] diff --git a/tools/fuzz/x86_instruction_emulator/Makefile b/tools/fuzz/x86_instruction_emulator/Makefile index 1a6dbf94e1..f11437e6a2 100644 --- a/tools/fuzz/x86_instruction_emulator/Makefile +++ b/tools/fuzz/x86_instruction_emulator/Makefile @@ -8,33 +8,27 @@ else x86-insn-fuzz-all: endif -# Add libx86 to the build -vpath %.c $(XEN_ROOT)/xen/lib/x86 +cpuid.c: %: $(XEN_ROOT)/xen/lib/x86/% FORCE + ln -nsf $< $@ -x86_emulate: - [ -L $@ ] || ln -sf $(XEN_ROOT)/xen/arch/x86/$@ +x86_emulate: FORCE + ln -nsf $(XEN_ROOT)/xen/arch/x86/$@ x86_emulate/%: x86_emulate ; -x86-emulate.c x86-emulate.h wrappers.c: %: - [ -L $* ] || ln -sf $(XEN_ROOT)/tools/tests/x86_emulator/$* +x86-emulate.c x86-emulate.h wrappers.c: %: $(XEN_ROOT)/tools/tests/x86_emulator/% FORCE + ln -nsf $< $@ -CFLAGS += $(CFLAGS_xeninclude) -D__XEN_TOOLS__ -I. +CFLAGS += $(CFLAGS_xeninclude) -D__XEN_TOOLS__ -iquote . +cpuid.o: CFLAGS += -iquote $(XEN_ROOT)/xen/lib/x86 GCOV_FLAGS := --coverage %-cov.o: %.c $(CC) -c $(CFLAGS) $(GCOV_FLAGS) $< -o $@ -x86.h := $(addprefix $(XEN_ROOT)/tools/include/xen/asm/,\ - x86-vendors.h x86-defns.h msr-index.h) \ - $(addprefix $(XEN_ROOT)/tools/include/xen/lib/x86/, \ - cpuid.h cpuid-autogen.h) -x86_emulate.h := x86-emulate.h x86_emulate/x86_emulate.h $(x86.h) - -# x86-emulate.c will be implicit for both -x86-emulate.o x86-emulate-cov.o: x86_emulate/x86_emulate.c $(x86_emulate.h) - -fuzz-emul.o fuzz-emulate-cov.o cpuid.o wrappers.o: $(x86_emulate.h) +x86-emulate.h: x86_emulate/x86_emulate.h +x86-emulate.o x86-emulate-cov.o: x86-emulate.h x86_emulate/x86_emulate.c +fuzz-emul.o fuzz-emul-cov.o wrappers.o: x86-emulate.h x86-insn-fuzzer.a: fuzz-emul.o x86-emulate.o cpuid.o $(AR) rc $@ $^ @@ -51,7 +45,7 @@ all: x86-insn-fuzz-all .PHONY: distclean distclean: clean - rm -f x86_emulate x86-emulate.c x86-emulate.h + rm -f x86_emulate x86-emulate.c x86-emulate.h wrappers.c cpuid.c .PHONY: clean clean: @@ -67,3 +61,5 @@ afl: afl-harness .PHONY: afl-cov afl-cov: afl-harness-cov + +-include $(DEPS_INCLUDE) From patchwork Mon Dec 6 17:02:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659031 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E9471C433FE for ; Mon, 6 Dec 2021 17:08:27 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239512.415347 (Exim 4.92) (envelope-from ) id 1muHTP-0000WU-HB; Mon, 06 Dec 2021 17:08:19 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239512.415347; Mon, 06 Dec 2021 17:08:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHTP-0000Vt-8D; Mon, 06 Dec 2021 17:08:19 +0000 Received: by outflank-mailman (input) for mailman id 239512; Mon, 06 Dec 2021 17:08:17 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHP8-0005ta-Jl for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:54 +0000 Received: from esa6.hc3370-68.iphmx.com (esa6.hc3370-68.iphmx.com [216.71.155.175]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 7d822592-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:03:53 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 7d822592-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810233; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=g6V0HqnXbYzHAD7EivABin1e8USUEILeVoIQJoAVubg=; b=iHzwURRIaMCdc37MJlnwpAC5z9q1fIivjlKiZqF8rrr8+v+cFTSQnX/F 9A64/b1Ina9TSQvCjgNwKSAAvenKtRycXQg+Hs5xhWZGy3Udh3krm/UtM f7MAv6wWdJBQnUeJm4Pv0006Nn92ZxuppqTJbm1MIlR3URPJ9aU7oENYv c=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: 7/1qdosxqVBF3zM5qtTebA3u2rnoSw5LAZGhE+j1lAyqMYdI0LUXajeAEhx5B7gUJgQ0OlJjr/ kUNYk8djWIPBtaXfQGRv2A8lJmTN4gnkjDvOvnpnx0orc0+Ro0NkjbjMmfViS6oZNfZEgNXSTO n77YSzVIFmGRkaDQasK3w2DE1XdPuRQmVw7P4dp1NqP7q+zqDQWeVkgJOA2CcQhCXLT5WuSbJD jdH3MyTxPqO5fLhBcx20jwPdcr/1N087hnT3L0BiVYIa3ZD2MZMkB/Sd+SqGpL35y2++ghjsjg PMFsjhpDZn+qBSofm7ADzWw5 X-SBRS: 5.1 X-MesageID: 59324106 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:X1KEoaklooZlzp+vnSEM0Tbo5gxnIURdPkR7XQ2eYbSJt1+Wr1Gzt xIcW2HTOazeZmqhfNBzbo6y9UlSu5/TzocxGVBv/H01ESMWpZLJC+rCIxarNUt+DCFioGGLT Sk6QoOdRCzhZiaE/n9BClVlxJVF/fngqoDUUYYoAQgsA187IMsdoUg7wbdg2NY22YLR7z6l4 rseneWOYDdJ5BYsWo4kw/rrRMRH5amaVJsw5zTSVNgT1LPsvyB94KE3fMldG0DQUIhMdtNWc s6YpF2PEsE1yD92Yj+tuu6TnkTn2dc+NyDW4pZdc/DKbhSvOkXee0v0XRYRQR4/ttmHozx+4 Nlisb+JdhktB+rJxrQcawBzDgdeeoQTrdcrIVDn2SCS50jPcn+qyPRyFkAme4Yf/46bA0kXq 6ZecmpUKEne2aTmm9pXScE17ignBMDtIIMYvGAm1TzDBOwqaZvCX7/L9ZlT2zJYasVmQKeFP ZZAMWQHgBLoTC9UJEwyOJACvf64ln/HYzQEug2Fqv9ii4TU5FMoi+W8WDbPQfSLWsd9jkuev njB/WnyHlcdLtP34SWB2mKhgKnIhyyTcJIfEvi0++BnhHWXx3cPE1sGWF2ju/67h0WiHdVFJ CQ88ywyra805QqzQ8P0RRGQr3uNvxpaUN1Ve9DW8ynUlPCSuVzAQDFZEHgRM7TKqfPaWxQm+ Vuqpuz3AQUotePFSEqE3aqyjXSbbH19wXA5WQcISg4M4t/GqY41jw7SQtsLLJNZnuEZChmrn WnU8XFWa6E7yJdSiv7lpQyvbyeE/8CRFmYIChPrsnVJB++TTKqsfMSW5FfS9p6sx67JHwDa7 BDodyVzhd3i7K1hdgTQGY3h/5nzvp5p1QEwZ3Y1RfHNEBz3pBaekXh4um0WGauQGp9slcXVS EHSoxhNw5RYIWGna6R6C6roVZ96kvKxSI6/CK+EBjarXnSXXFXdlM2JTRTPt10BbWB2yf1vU XtlWZjE4Ykm5VRPk2PtGrZ1PU4DzSEi32LDLa0XPDz8uYdykEW9EO9fWHPXN7hRxPrd/G39r oYOX+PXmk43eLCvPUHqHXs7cAliwY4TXsut9aS6t4erf2JbJY3WI6OLnO56JdU6x/89eyWh1 ijVZ3K0AWHX3RXvQThmoFg6AF82dZog/389IwI2OlOkhyoqbYq1tf9NfJorZ7g3sudkyKcsH fUCfsyBBNVJSyjGpGtBPcWs8tQ6eUT5nx+KMgqkfCM7I8xqSTvW94K2ZQDo7iQPUHa67JNsv 7262wrHapMfXAA+Xt3OYfeiwgrp73gQke5/RWXSJdxXdBm++YRmMXWp3PQ2P9sNOVPIwT7Dj 1SaBhIRpO/spY4p8YaW2fDY/tnxS+YnRxhUBWjW67qyJBL2xGv7zN8SSvuMcBDcSHjwpPeoa 9JKwqyuK/YAhltL7dZxSu450aIk6tLzjLZG1QA4Tm7TZlGmB748cHmL2c5D6v9EyrND4FbkX 0uO/p9ROKmTOdOjG1kUfVJ3YuOG3PASuz/T8fVqfxmquH4ppOKKARdIIh2BqC1BN78kYooqz NAotNMS9wHi2AEhNcyLj3wM+mmBRpDav37Lan3O7FfXtzcW IronPort-HdrOrdr: A9a23:TzVd8qmjgezrFwhV4p28pDhCKLrpDfIq3DAbv31ZSRFFG/Fxl6 iV88jzsiWE7wr5OUtQ4OxoV5PgfZqxz/NICMwqTNWftWrdyQ+VxeNZjbcKqgeIc0aVygce79 YET0EXMqyXMbEQt6jHCWeDf+rIuOP3k5yVuQ== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59324106" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu Subject: [XEN PATCH 29/57] tools/helper: Cleanup Makefile Date: Mon, 6 Dec 2021 17:02:12 +0000 Message-ID: <20211206170241.13165-30-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Use $(TARGETS) to collect targets. Collect library to link against in $(LDLIBS). Remove extra "-f" flags that is already part of $(RM). Signed-off-by: Anthony PERARD --- tools/helpers/Makefile | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/tools/helpers/Makefile b/tools/helpers/Makefile index 7f6c422440..2fe3be2f89 100644 --- a/tools/helpers/Makefile +++ b/tools/helpers/Makefile @@ -5,10 +5,10 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -PROGS += xen-init-dom0 +TARGETS += xen-init-dom0 ifeq ($(CONFIG_Linux),y) ifeq ($(CONFIG_X86),y) -PROGS += init-xenstore-domain +TARGETS += init-xenstore-domain endif endif @@ -17,6 +17,10 @@ $(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxentoollog) $(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxenstore) $(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxenlight) $(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxenctrl) +xen-init-dom0: LDLIBS += $(LDLIBS_libxenctrl) +xen-init-dom0: LDLIBS += $(LDLIBS_libxentoollog) +xen-init-dom0: LDLIBS += $(LDLIBS_libxenstore) +xen-init-dom0: LDLIBS += $(LDLIBS_libxenlight) INIT_XENSTORE_DOMAIN_OBJS = init-xenstore-domain.o init-dom-json.o $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxentoollog) @@ -25,27 +29,32 @@ $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenstore) $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += $(CFLAGS_libxenlight) $(INIT_XENSTORE_DOMAIN_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h +init-xenstore-domain: LDLIBS += $(LDLIBS_libxentoollog) +init-xenstore-domain: LDLIBS += $(LDLIBS_libxenstore) +init-xenstore-domain: LDLIBS += $(LDLIBS_libxenctrl) +init-xenstore-domain: LDLIBS += $(LDLIBS_libxenguest) +init-xenstore-domain: LDLIBS += $(LDLIBS_libxenlight) .PHONY: all -all: $(PROGS) +all: $(TARGETS) xen-init-dom0: $(XEN_INIT_DOM0_OBJS) - $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS) $(LDLIBS_libxenctrl) $(LDLIBS_libxentoollog) $(LDLIBS_libxenstore) $(LDLIBS_libxenlight) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS) $(LDLIBS) $(APPEND_LDFLAGS) init-xenstore-domain: $(INIT_XENSTORE_DOMAIN_OBJS) - $(CC) $(LDFLAGS) -o $@ $(INIT_XENSTORE_DOMAIN_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenlight) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $(INIT_XENSTORE_DOMAIN_OBJS) $(LDLIBS) $(APPEND_LDFLAGS) .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - for i in $(PROGS); do $(INSTALL_PROG) $$i $(DESTDIR)$(LIBEXEC_BIN); done + for i in $(TARGETS); do $(INSTALL_PROG) $$i $(DESTDIR)$(LIBEXEC_BIN); done .PHONY: uninstall uninstall: - for i in $(PROGS); do rm -f $(DESTDIR)$(LIBEXEC_BIN)/$$i; done + for i in $(TARGETS); do rm -f $(DESTDIR)$(LIBEXEC_BIN)/$$i; done .PHONY: clean clean: - $(RM) -f *.o $(PROGS) $(DEPS_RM) + $(RM) *.o $(TARGETS) $(DEPS_RM) distclean: clean From patchwork Mon Dec 6 17:02:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659037 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C7CC0C433FE for ; Mon, 6 Dec 2021 17:08:36 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239515.415368 (Exim 4.92) (envelope-from ) id 1muHTY-0001lN-7N; Mon, 06 Dec 2021 17:08:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239515.415368; Mon, 06 Dec 2021 17:08:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHTY-0001ko-0Q; Mon, 06 Dec 2021 17:08:28 +0000 Received: by outflank-mailman (input) for mailman id 239515; Mon, 06 Dec 2021 17:08:26 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPC-0005ti-Hf for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:58 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 7ec7773b-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:03:57 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 7ec7773b-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810236; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+tvgdAnTgDFIQbMFRm+czYIkxCdj45NAL3MUbvPerCo=; b=iGzNgPAll4NXo4QGfBMALzALgTVoahZZ81DO/YR72M/+8A2ZMGYMIhop ukiNI44csFvm3vjUa8aRZCdYzKDXMekZLtV+j3HPAj0lVG7ZbkkU8aKSZ ngYacN/feHaMKwVFTtBGG6Y7Wt3QKCTDACpYUQzMnXkUvfmK2Nt2o0t8C g=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: iloVjZmQX9y2crvLCIwpl57pl72O/tj1fGFcXIMnyxNR5L62S4fLq2TAUErUIG26ZvmQom57Wr evCFk/pXmCpBYi6uYfz6td4S78HrBxmsKd9jy6tfVpAP6GEnF1zLXD+Del7xwWJs3Ln4Vg8HDZ IQPLvYfP9V3y26GpQ/MWl8WUFIjvdlWVVss3VU996osWDOzF5TIwJFGW80rRiF86wOe/TR/osj qlmeqmrudTtI6uD1rqM/wdXNymlPnpM3jVv+mI9qx70JkSykByTwBPVc9v7wm+iRz9iHuKrXTs 1sG0QKqmDvwqAqqn5361BuoL X-SBRS: 5.1 X-MesageID: 58884430 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:80ta/6/Ph8jNt+z5v5zZDrUDZnmTJUtcMsCJ2f8bNWPcYEJGY0x3y 2MWDGnUb/qJazegeNonb9yxp0oOupbWx9c3TFNkrSk8E34SpcT7XtnIdU2Y0wF+jyHgoOCLy +1EN7Es+ehtFie0Si9AttENlFEkvU2ybuOU5NXsZ2YhGmeIdA970Ug6wrRh3NYy6TSEK1jlV e3a8pW31GCNg1aYAkpMg05UgEoy1BhakGpwUm0WPZinjneH/5UmJMt3yZWKB2n5WuFp8tuSH I4v+l0bElTxpH/BAvv9+lryn9ZjrrT6ZWBigVIOM0Sub4QrSoXfHc/XOdJFAXq7hQllkPh+l udJibWqdjxuI+rQs9g+aTtBNHtxaPguFL/veRBTsOSWxkzCNXDt3+9vHAc9OohwFuRfWD8Us 6ZCcXZUM07F17neLLGTE4GAguwqKtXrO4UO/Glt1zjDAd4tQIzZQrWM7thdtNs1rp0eTaaCO 5FBAdZpRDX5fBJpCg86Motkw+aP1nLFbx9S803A8MLb5ECMlVcsgdABKuH9e8OIbdVYmF6Co WDL9Hi/BQsVXPSAzRKV/3TqgfXA9QvrVYRXGLCm+/pChFyI2ndVGBAQTUG8o/Sylgi5Qd03A 0US5iopq7l07EGxR8PxdxK9qX+A+BUbXrJt//YSsV/XjPCOukDAWzZCHmUphMEaWNEeSmIY0 mOghezSQiEorJapaki/75DOombnUcQKFlMqaSgBRAoDxtDspoAvkx7CJupe/L6JYs7dQm+pn W3TxMQqr/BK1JNQif3nlbzSq2v0/sChc+Ij2unAsotJBCtdbZXtWYGn4EOzAR1ofNfAFQnpU JTpdqGjAAEy4XOlyXXlrAYlRujBCxO53Nv02wQH834JrWvFxpJbVdoMiAyS3W8wWir+RRfnY VXIpSRa74JJMX2hYMdfOtzqW5twnPW6T4q6Bpg4i+aihLArLmdrGwk0OiatM53FyhBwwcnTx 7/FGSpTMZrqIfs+l2fnLwvs+bQq2jo/1QvuqWPTlHyaPU6lTCfNE98taQLWBshgtf/siFiFo r53aprRoz0CAbKWX8Ui2dNKRbz8BSNgXs6eRg0+XrPrHzeK70l9UaKMmu14JNQ+90mX/8+Rl kyAtoZj4AKXrRX6xc+iNhiPsZvjAsRyq2wVJyspMQr60nQve9/3vqwea4E2bf8s8+k6lax4S PwMesOhBPVTS2uYp2RBPMel9IEyJg62gQ+uPja+ZGRtdZBXWAGUqMTveRHi9XdSA3Pv59c+u bCpyijSXYEHG1Z5FM/TZf/2lwGxsHERlfhcRUzNJtUPKkzg/JIzc376j+MtItFKIhLGn2PI2 wGTCBYehO/Mv45qr4WZ2fHa99+kSrIsEFBbEm/X6aeNGRPbpmfzk5VdVOuofCzGUD+m8quVe ugIner3N+cKnQgWvtMkQapr1683+/Dmu6ReklZ/BHzOYlmmVuFgL32B0ZUdv6FB3OYE6w6/W 0bJ8dhGI7SZfsjiFQdJdgYia+2C09ASmyXTsqtpcBmruncv8erVS1hWMjmNlDdZfel8P44Sy Os8vNIbtl6kgR0wP9fa1i1Z+gxg9JDbv3nLYn3CPLLWtw== IronPort-HdrOrdr: A9a23:7ULPX6/n17Smibw22ZZuk+DeI+orL9Y04lQ7vn2YSXRuHfBw8P re+8jztCWE8Qr5N0tApTntAsS9qDbnhPxICOoqTNOftWvd2FdARbsKheCJ/9SjIVyaygc079 YHT0EUMrPN5DZB4foSmDPIcOod/A== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="58884430" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu Subject: [XEN PATCH 30/57] tools/hotplug: cleanup Makefiles Date: Mon, 6 Dec 2021 17:02:13 +0000 Message-ID: <20211206170241.13165-31-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Remove "build" targets. Use simply expanded variables when recursively expanded variable aren't needed. (Use ":=" instead of "=".) Don't check if a directory already exist when installing, just create it. Fix $(HOTPLUGPATH), it shouldn't have any double-quote. Some reindentation. FreeBSD, "hotplugpath.sh" is already installed by common/. Signed-off-by: Anthony PERARD --- tools/hotplug/FreeBSD/Makefile | 11 +++-------- tools/hotplug/Linux/Makefile | 16 ++++++---------- tools/hotplug/Linux/systemd/Makefile | 16 +++++++--------- tools/hotplug/NetBSD/Makefile | 9 +++------ tools/hotplug/common/Makefile | 16 ++++++---------- 5 files changed, 25 insertions(+), 43 deletions(-) diff --git a/tools/hotplug/FreeBSD/Makefile b/tools/hotplug/FreeBSD/Makefile index de9928cd86..a6552c9884 100644 --- a/tools/hotplug/FreeBSD/Makefile +++ b/tools/hotplug/FreeBSD/Makefile @@ -2,18 +2,15 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk # Xen script dir and scripts to go there. -XEN_SCRIPTS = vif-bridge block +XEN_SCRIPTS := vif-bridge block -XEN_SCRIPT_DATA = +XEN_SCRIPT_DATA := -XEN_RCD_PROG = rc.d/xencommons rc.d/xendriverdomain +XEN_RCD_PROG := rc.d/xencommons rc.d/xendriverdomain .PHONY: all all: -.PHONY: build -build: - .PHONY: install install: install-scripts install-rcd @@ -44,12 +41,10 @@ install-rcd: do \ $(INSTALL_PROG) $$i $(DESTDIR)$(INITD_DIR); \ done - $(INSTALL_DATA) ../common/hotplugpath.sh $(DESTDIR)$(XEN_SCRIPT_DIR) .PHONY: uninstall-rcd uninstall-rcd: rm -f $(addprefix $(DESTDIR)$(INITD_DIR)/, $(XEN_RCD_PROG)) - rm -f $(DESTDIR)$(XEN_SCRIPT_DIR)/hotplugpath.sh .PHONY: clean clean: diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile index 0b1d111d7e..9a7b3a3515 100644 --- a/tools/hotplug/Linux/Makefile +++ b/tools/hotplug/Linux/Makefile @@ -2,7 +2,7 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk # Xen script dir and scripts to go there. -XEN_SCRIPTS = vif-bridge +XEN_SCRIPTS := vif-bridge XEN_SCRIPTS += vif-route XEN_SCRIPTS += vif-nat XEN_SCRIPTS += vif-openvswitch @@ -22,16 +22,13 @@ XEN_SCRIPTS += launch-xenstore SUBDIRS-$(CONFIG_SYSTEMD) += systemd -XEN_SCRIPT_DATA = xen-script-common.sh locking.sh logging.sh +XEN_SCRIPT_DATA := xen-script-common.sh locking.sh logging.sh XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh XEN_SCRIPT_DATA += block-common.sh .PHONY: all all: subdirs-all -.PHONY: build -build: - .PHONY: install install: install-initd install-scripts subdirs-install @@ -41,9 +38,9 @@ uninstall: uninstall-initd uninstall-scripts subdirs-uninstall # See docs/misc/distro_mapping.txt for INITD_DIR location .PHONY: install-initd install-initd: - [ -d $(DESTDIR)$(INITD_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) - [ -d $(DESTDIR)$(SYSCONFIG_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR) - [ -d $(DESTDIR)$(LIBEXEC_BIN) ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR) + $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR) + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DATA) init.d/sysconfig.xendomains $(DESTDIR)$(SYSCONFIG_DIR)/xendomains $(INSTALL_DATA) init.d/sysconfig.xencommons $(DESTDIR)$(SYSCONFIG_DIR)/xencommons $(INSTALL_PROG) xendomains $(DESTDIR)$(LIBEXEC_BIN) @@ -64,8 +61,7 @@ uninstall-initd: .PHONY: install-scripts install-scripts: - [ -d $(DESTDIR)$(XEN_SCRIPT_DIR) ] || \ - $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR) + $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR) set -e; for i in $(XEN_SCRIPTS); \ do \ $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \ diff --git a/tools/hotplug/Linux/systemd/Makefile b/tools/hotplug/Linux/systemd/Makefile index a5d41d86ef..26df2a43b1 100644 --- a/tools/hotplug/Linux/systemd/Makefile +++ b/tools/hotplug/Linux/systemd/Makefile @@ -1,12 +1,12 @@ XEN_ROOT = $(CURDIR)/../../../.. include $(XEN_ROOT)/tools/Rules.mk -XEN_SYSTEMD_MODULES = xen.conf +XEN_SYSTEMD_MODULES := xen.conf -XEN_SYSTEMD_MOUNT = proc-xen.mount +XEN_SYSTEMD_MOUNT := proc-xen.mount XEN_SYSTEMD_MOUNT += var-lib-xenstored.mount -XEN_SYSTEMD_SERVICE = xenstored.service +XEN_SYSTEMD_SERVICE := xenstored.service XEN_SYSTEMD_SERVICE += xenconsoled.service XEN_SYSTEMD_SERVICE += xen-qemu-dom0-disk-backend.service XEN_SYSTEMD_SERVICE += xendomains.service @@ -14,7 +14,7 @@ XEN_SYSTEMD_SERVICE += xen-watchdog.service XEN_SYSTEMD_SERVICE += xen-init-dom0.service XEN_SYSTEMD_SERVICE += xendriverdomain.service -ALL_XEN_SYSTEMD = $(XEN_SYSTEMD_MODULES) \ +ALL_XEN_SYSTEMD := $(XEN_SYSTEMD_MODULES) \ $(XEN_SYSTEMD_MOUNT) \ $(XEN_SYSTEMD_SERVICE) @@ -30,10 +30,8 @@ distclean: clean .PHONY: install install: $(ALL_XEN_SYSTEMD) - [ -d $(DESTDIR)$(XEN_SYSTEMD_DIR) ] || \ - $(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_DIR) - [ -d $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD) ] || \ - $(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD) + $(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_DIR) + $(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD) $(INSTALL_DATA) *.service $(DESTDIR)$(XEN_SYSTEMD_DIR) $(INSTALL_DATA) *.mount $(DESTDIR)$(XEN_SYSTEMD_DIR) $(INSTALL_DATA) *.conf $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD) @@ -48,5 +46,5 @@ $(XEN_SYSTEMD_MODULES): rm -f $@.tmp for mod in $(LINUX_BACKEND_MODULES) ; do \ echo $$mod ; \ - done > $@.tmp + done > $@.tmp $(call move-if-changed,$@.tmp,$@) diff --git a/tools/hotplug/NetBSD/Makefile b/tools/hotplug/NetBSD/Makefile index f909ffa367..1cd3db2ccb 100644 --- a/tools/hotplug/NetBSD/Makefile +++ b/tools/hotplug/NetBSD/Makefile @@ -2,22 +2,19 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk # Xen script dir and scripts to go there. -XEN_SCRIPTS = +XEN_SCRIPTS := XEN_SCRIPTS += locking.sh XEN_SCRIPTS += block XEN_SCRIPTS += vif-bridge XEN_SCRIPTS += vif-ip XEN_SCRIPTS += qemu-ifup -XEN_SCRIPT_DATA = -XEN_RCD_PROG = rc.d/xencommons rc.d/xendomains rc.d/xen-watchdog rc.d/xendriverdomain +XEN_SCRIPT_DATA := +XEN_RCD_PROG := rc.d/xencommons rc.d/xendomains rc.d/xen-watchdog rc.d/xendriverdomain .PHONY: all all: -.PHONY: build -build: - .PHONY: install install: install-scripts install-rcd diff --git a/tools/hotplug/common/Makefile b/tools/hotplug/common/Makefile index ef48bfacc9..e8a8dbea6c 100644 --- a/tools/hotplug/common/Makefile +++ b/tools/hotplug/common/Makefile @@ -1,22 +1,19 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk -HOTPLUGPATH="hotplugpath.sh" +HOTPLUGPATH := hotplugpath.sh # OS-independent hotplug scripts go in this directory # Xen scripts to go there. -XEN_SCRIPTS = -XEN_SCRIPT_DATA = $(HOTPLUGPATH) +XEN_SCRIPTS := +XEN_SCRIPT_DATA := $(HOTPLUGPATH) genpath-target = $(call buildmakevars2file,$(HOTPLUGPATH)) $(eval $(genpath-target)) .PHONY: all -all: build - -.PHONY: build -build: $(HOTPLUGPATH) +all: $(HOTPLUGPATH) .PHONY: install install: install-scripts @@ -25,9 +22,8 @@ install: install-scripts uninstall: uninstall-scripts .PHONY: install-scripts -install-scripts: build - [ -d $(DESTDIR)$(XEN_SCRIPT_DIR) ] || \ - $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR) +install-scripts: all + $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR) set -e; for i in $(XEN_SCRIPTS); \ do \ $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \ From patchwork Mon Dec 6 17:02:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12658991 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 11EBEC433FE for ; Mon, 6 Dec 2021 17:07:19 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239451.415125 (Exim 4.92) (envelope-from ) id 1muHSI-0005yj-R0; Mon, 06 Dec 2021 17:07:10 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239451.415125; Mon, 06 Dec 2021 17:07:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHSI-0005xV-Iy; Mon, 06 Dec 2021 17:07:10 +0000 Received: by outflank-mailman (input) for mailman id 239451; Mon, 06 Dec 2021 17:07:09 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPD-0005ti-Ht for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:03:59 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8036e85b-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:03:58 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8036e85b-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810237; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dj/c4lZoChrbctTMjaQaIy2bS8KFSLyGQmK8KBYSLbU=; b=K4NhiaaUXXvl7nDrfbjCeTpp+X3PcqLQRUXFF78E765mDlFSpGMqhWwq HkdMvNf0MOg8I3FDO4rOt1mlhXlJypuRO+2Y5qAAMMrfjaX/nLf7tikBR 8rb8ift+mUXCQlw+Sd7fvJItE0/w8LwOzaHindzUZi2mgZGAC9GF2dOxp 0=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: KaZPQnglizzoDd4Bpo4yhDDtljZTC28JsQTJSgHbvz6kwXgzGRWLJ0SP51Tjm4WvvtE+Ww9n3X bdwmUISl7ck8k8cbPgeWcvyqZvZLebj7Z0v3oOpHD2zNoCSJr75Ar25J1bm1ushuqRb940YkFA MRqKfypBtaUWWbZA1NP0BQzEnKkR92Rv/lH2u2VY8LAozY7jyFYZnFYthXEmY0fFvNBD168iuK 2AqKlaE6peajvgagSUYMyXkYJNuLaonR9Xg4oC+G4olt3Y2mYOEKhxyrGzuTUt2QAw/OcJrRcb c8rK3IXkvM76s2MOrUBIQpgG X-SBRS: 5.1 X-MesageID: 59766494 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:LkCESKgMl2n5C3b+KNANPQmGX161iRcKZh0ujC45NGQN5FlHY01je htvXWjSPKnYYzenfNxyPo21/UlQvMLdyIBiHgdsriw1QSIb9cadCdqndUqhZCn6wu8v7a5EA 2fyTvGacajYm1eF/k/F3oAMKRCQ7InQLlbGILes1htZGEk0F0/NtTo5w7Rg29Qw34Dja++wk YiaT/P3aQfNNwFcagr424rbwP+4lK2v0N+wlgVWicFj5DcypVFMZH4sDfjZw0/DaptVBoaHq 9Prl9lVyI97EyAFUbtJmp6jGqEDryW70QKm0hK6UID66vROS7BbPg/W+5PwZG8O4whlkeydx /1ts7uzTT5yNZfcs+pGWRNmEhsmBfZ/reqvzXiX6aR/zmXDenrohf5vEFs3LcsT/eMf7WNmr KJCbmpXN1ba2rzwkOnTpupE36zPKOHiOp8fvXdxiynUF/88TbjIQrnQ5M8e1zA17ixLNauPO JRHNWszBPjGSx5EHAYaOJAYoMaXoCTebDJ/rAiNipNitgA/yyQuieOwYbI5YOeiRNpXtlaVo Hrc+Gb0CQ1cM8aQoRKa9lq8i+mJmjn0MKoCGbv9+vN0jVm7wm0IFAZQRVa9ueO+iEO1R5RYM UN80iMosag18l3tVtTnVge0iHGBtx8YHdFXFoUHBBqlk/SOpVzDXy5dE2AHOIdOWNIKqSIC9 lmunNfQXjdVoJabEniXyLau9QvpAH1ARYMdXhMsQQwA6tjlhYg8iBPTU9pueJKIYs3J9SLYm G7T8nVn71kHpYtSjvjgowib6965jsGRFlZd2+nBYo6yAuqVjqaBbpfg11XU5O0owG2xHgjY5 yhsdyRzAYkz4XCxeM6lHbxl8FKBva/t3NjgbbhHRcNJG9OFoSHLQGyoyGsiTHqFyPosdz7ze 1P0sghM/pJVN3bCRfYpONLuUZV3l/K+SoSNuhXogjxmOMIZmOivpn4GWKJt9zq1zBhEfV8XZ /93jvpA/V5FUP86nVJats8W0KMxxzBW+I8gbcuT8vhT6pLHPCT9Ye5caDOmN7llhIvZ8FS92 4sObKOilkQAONASlwGKqOY7N04RF3EnCPje8ooPHgJ1ClE9Qz9J5j646e5JRrGJaIwJzLqVp S/kBRcDoLc97FWeQTi3hrlYQOuHdf5CQbgTZ0TA5H6khCouZ5iB9qAae8dldLUr7rU7n/V1U +MEa4OLBfEWEmbL/DEUbJ/cqo1+dUv02VLSbnT9ODVvLYR9QwHp+8P/ele9/ic5ESfq59A1p Ket112HTMNbFRhiFsvfdNmm00i14SoGgOt3UkaReotTdUzg/ZJEMSv0ivNrccgAJQ+anmmR1 hqMAAderu7I+tdn/N7MjKGCjoGoD+ohQRYKQziFte67bHCI8HCizIlMVPezUQrcDG6kqr+/Y eh1zu3nNKFVllh9rIchQa1gyrgz5oWzquYCnBhkBnjCc3+iFqhkfiudxcBKu6BAmu1ZtA+xV h7d89VWI+zUasbsEVpXLws5dOWTk/oTn2CKv/gyJUz74g5x/aaGDhoOb0Xd1nQFIesnKp4hz McgpNUSul62hRcdO9qbijxZqjaXJXsaXqR77pwXDecHUObwJo2utXAENhLL3Q== IronPort-HdrOrdr: A9a23:Kwg196mntGwb9VibjlMtLfNmkObpDfIm3DAbv31ZSRFFG/Fxl6 iV88jzsiWE7Qr5OUtQ/uxoV5PgfZqxz/NICOoqTNWftWvd2FdARbsKheCJ/9SJIVybygc378 ldmsZFZOEYdWIK7vrH3A== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59766494" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu Subject: [XEN PATCH 31/57] tools/libfsimage: Cleanup makefiles Date: Mon, 6 Dec 2021 17:02:14 +0000 Message-ID: <20211206170241.13165-32-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Remove the need for "fs-*" targets by creating a "common.mk" which have flags that are common to libfsimage/common/ and the other libfsimages/*/ directories. In common.mk, make $(PIC_OBJS) a recursively expanded variable so it doesn't matter where $(LIB_SRCS-y) is defined, and remove the extra $(PIC_OBJS) from libfsimage/common/Makefile. Use a $(TARGETS) variable to list things to be built. And $(TARGETS) can be use in the clean target in common.mk. iso9660/: Remove the explicit dependency between fsys_iso9660.c and iso9660.h, this is handled automaticaly by the .*.d dependency files, and iso9660.h already exist. Signed-off-by: Anthony PERARD --- tools/libfsimage/Rules.mk | 26 ++++++++------------------ tools/libfsimage/common.mk | 11 +++++++++++ tools/libfsimage/common/Makefile | 11 +++-------- tools/libfsimage/ext2fs-lib/Makefile | 9 --------- tools/libfsimage/ext2fs/Makefile | 9 --------- tools/libfsimage/fat/Makefile | 9 --------- tools/libfsimage/iso9660/Makefile | 11 ----------- tools/libfsimage/reiserfs/Makefile | 9 --------- tools/libfsimage/ufs/Makefile | 9 --------- tools/libfsimage/xfs/Makefile | 9 --------- tools/libfsimage/zfs/Makefile | 9 --------- 11 files changed, 22 insertions(+), 100 deletions(-) create mode 100644 tools/libfsimage/common.mk diff --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk index bb6d42abb4..cf37d6cb0d 100644 --- a/tools/libfsimage/Rules.mk +++ b/tools/libfsimage/Rules.mk @@ -1,25 +1,18 @@ -include $(XEN_ROOT)/tools/Rules.mk - -CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\" -CFLAGS += -Werror -D_GNU_SOURCE -LDFLAGS += -L../common/ - -PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y)) - -FSDIR = $(libdir)/xenfsimage +include $(XEN_ROOT)/tools/libfsimage/common.mk FSLIB = fsimage.so +TARGETS += $(FSLIB) -.PHONY: fs-all -fs-all: $(FSLIB) +.PHONY: all +all: $(TARGETS) -.PHONY: fs-install -fs-install: fs-all +.PHONY: install +install: all $(INSTALL_DIR) $(DESTDIR)$(FSDIR)/$(FS) $(INSTALL_PROG) $(FSLIB) $(DESTDIR)$(FSDIR)/$(FS) -.PHONY: fs-uninstall -fs-uninstall: +.PHONY: uninstall +uninstall: rm -f $(addprefix $(DESTDIR)$(FSDIR)/$(FS)/, $(FSLIB)) if [ -d $(DESTDIR)$(FSDIR)/$(FS) ]; then \ rmdir $(DESTDIR)$(FSDIR)/$(FS); \ @@ -28,7 +21,4 @@ fs-uninstall: $(FSLIB): $(PIC_OBJS) $(CC) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^ -lxenfsimage $(FS_LIBDEPS) $(APPEND_LDFLAGS) -clean distclean:: - rm -f $(PIC_OBJS) $(FSLIB) $(DEPS_RM) - -include $(DEPS_INCLUDE) diff --git a/tools/libfsimage/common.mk b/tools/libfsimage/common.mk new file mode 100644 index 0000000000..77bc957f27 --- /dev/null +++ b/tools/libfsimage/common.mk @@ -0,0 +1,11 @@ +include $(XEN_ROOT)/tools/Rules.mk + +FSDIR := $(libdir)/xenfsimage +CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\" +CFLAGS += -Werror -D_GNU_SOURCE +LDFLAGS += -L../common/ + +PIC_OBJS = $(patsubst %.c,%.opic,$(LIB_SRCS-y)) + +clean distclean:: + rm -f $(PIC_OBJS) $(TARGETS) $(DEPS_RM) diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile index 24bc90e73e..bcda86d754 100644 --- a/tools/libfsimage/common/Makefile +++ b/tools/libfsimage/common/Makefile @@ -1,5 +1,5 @@ XEN_ROOT = $(CURDIR)/../../.. -include $(XEN_ROOT)/tools/libfsimage/Rules.mk +include $(XEN_ROOT)/tools/libfsimage/common.mk MAJOR = 4.16 MINOR = 0 @@ -13,12 +13,10 @@ LDFLAGS += $(PTHREAD_LDFLAGS) LIB_SRCS-y = fsimage.c fsimage_plugin.c fsimage_grub.c -PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y)) - -LIB = libxenfsimage.so libxenfsimage.so.$(MAJOR) libxenfsimage.so.$(MAJOR).$(MINOR) +TARGETS = libxenfsimage.so libxenfsimage.so.$(MAJOR) libxenfsimage.so.$(MAJOR).$(MINOR) .PHONY: all -all: $(LIB) +all: $(TARGETS) .PHONY: install install: all @@ -40,9 +38,6 @@ uninstall: rm -f $(DESTDIR)$(libdir)/libxenfsimage.so.$(MAJOR) rm -f $(DESTDIR)$(libdir)/libxenfsimage.so.$(MAJOR).$(MINOR) -clean distclean:: - rm -f $(LIB) - libxenfsimage.so: libxenfsimage.so.$(MAJOR) ln -sf $< $@ libxenfsimage.so.$(MAJOR): libxenfsimage.so.$(MAJOR).$(MINOR) diff --git a/tools/libfsimage/ext2fs-lib/Makefile b/tools/libfsimage/ext2fs-lib/Makefile index 431a79068e..b9b560df75 100644 --- a/tools/libfsimage/ext2fs-lib/Makefile +++ b/tools/libfsimage/ext2fs-lib/Makefile @@ -9,13 +9,4 @@ FS_LIBDEPS = $(EXTFS_LIBS) # Include configure output (config.h) CFLAGS += -include $(XEN_ROOT)/tools/config.h -.PHONY: all -all: fs-all - -.PHONY: install -install: fs-install - -.PHONY: uninstall -uninstall: fs-uninstall - include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/ext2fs/Makefile b/tools/libfsimage/ext2fs/Makefile index c62ae359ac..fe01f98148 100644 --- a/tools/libfsimage/ext2fs/Makefile +++ b/tools/libfsimage/ext2fs/Makefile @@ -4,13 +4,4 @@ LIB_SRCS-y = fsys_ext2fs.c FS = ext2fs -.PHONY: all -all: fs-all - -.PHONY: install -install: fs-install - -.PHONY: uninstall -uninstall: fs-uninstall - include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/fat/Makefile b/tools/libfsimage/fat/Makefile index 7ee5e7588d..58bcc0751d 100644 --- a/tools/libfsimage/fat/Makefile +++ b/tools/libfsimage/fat/Makefile @@ -4,13 +4,4 @@ LIB_SRCS-y = fsys_fat.c FS = fat -.PHONY: all -all: fs-all - -.PHONY: install -install: fs-install - -.PHONY: uninstall -uninstall: fs-uninstall - include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/iso9660/Makefile b/tools/libfsimage/iso9660/Makefile index bc86baf2c0..acf3164046 100644 --- a/tools/libfsimage/iso9660/Makefile +++ b/tools/libfsimage/iso9660/Makefile @@ -4,15 +4,4 @@ LIB_SRCS-y = fsys_iso9660.c FS = iso9660 -.PHONY: all -all: fs-all - -.PHONY: install -install: fs-install - -.PHONY: uninstall -uninstall: fs-uninstall - -fsys_iso9660.c: iso9660.h - include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/reiserfs/Makefile b/tools/libfsimage/reiserfs/Makefile index 5acfedf25e..42b751e007 100644 --- a/tools/libfsimage/reiserfs/Makefile +++ b/tools/libfsimage/reiserfs/Makefile @@ -4,13 +4,4 @@ LIB_SRCS-y = fsys_reiserfs.c FS = reiserfs -.PHONY: all -all: fs-all - -.PHONY: install -install: fs-install - -.PHONY: uninstall -uninstall: fs-uninstall - include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/ufs/Makefile b/tools/libfsimage/ufs/Makefile index f32b9178bd..cca4f0a588 100644 --- a/tools/libfsimage/ufs/Makefile +++ b/tools/libfsimage/ufs/Makefile @@ -4,13 +4,4 @@ LIB_SRCS-y = fsys_ufs.c FS = ufs -.PHONY: all -all: fs-all - -.PHONY: install -install: fs-install - -.PHONY: uninstall -uninstall: fs-uninstall - include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/xfs/Makefile b/tools/libfsimage/xfs/Makefile index 54eeb6e35e..ebac7baf14 100644 --- a/tools/libfsimage/xfs/Makefile +++ b/tools/libfsimage/xfs/Makefile @@ -4,13 +4,4 @@ LIB_SRCS-y = fsys_xfs.c FS = xfs -.PHONY: all -all: fs-all - -.PHONY: install -install: fs-install - -.PHONY: uninstall -uninstall: fs-uninstall - include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/zfs/Makefile b/tools/libfsimage/zfs/Makefile index 084e5ec08d..434a9c3580 100644 --- a/tools/libfsimage/zfs/Makefile +++ b/tools/libfsimage/zfs/Makefile @@ -28,13 +28,4 @@ LIB_SRCS-y = zfs_lzjb.c zfs_sha256.c zfs_fletcher.c fsi_zfs.c fsys_zfs.c FS = zfs -.PHONY: all -all: fs-all - -.PHONY: install -install: fs-install - -.PHONY: uninstall -uninstall: fs-uninstall - include $(XEN_ROOT)/tools/libfsimage/Rules.mk From patchwork Mon Dec 6 17:02:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659039 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 65835C433F5 for ; Mon, 6 Dec 2021 17:08:41 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239517.415391 (Exim 4.92) (envelope-from ) id 1muHTd-0002nd-AC; Mon, 06 Dec 2021 17:08:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239517.415391; Mon, 06 Dec 2021 17:08:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHTd-0002mz-5M; Mon, 06 Dec 2021 17:08:33 +0000 Received: by outflank-mailman (input) for mailman id 239517; Mon, 06 Dec 2021 17:08:32 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPE-0005ti-Hk for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:00 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 80ea4f3f-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:03:59 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 80ea4f3f-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810238; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Kq8ZIrj5FFoEo4CvpADkcXU/4kPXXPzk2tAot7bbAmY=; b=bqO4YQQVfm561ukIXF2wMxutim7aL5jLqhISLCzsu3iSrmWKlwfjjuIR 8B3ptw5+WnD8tym+VQuQeZLJv9bP4+83OyluATcBGTVq5PNtATgnvJIfI s+ciEVFWVCipfUYal3Nu/VWSP66XMrBP2vDhxKZMwd1XHTEyEGKSyGLu8 E=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: 94Kj7Yjpo0IxUHdVCkmhcFS401UUiFTEzSFb9kzcVxi9CGB4Zn+w43Ax6XbQMHxeJm8WePzlK+ y6nsB8Z4jag/WihSwHLTKPl25voTydchBjDTVqE6i+C5xLDEV+AeRlPDxpYS9y/8uyzlFuZFt/ 7QhqgjvwfDPCtojE6DtjMeSuzBmQ9jc9ji3DyQdBbNAnGL94nXNXq8t7g/gB90RddF7Tlglw5E +fjdHuGY38qInhWHgxwHYv901Vf2DYjZrjNG/lr9X5oWbwDzhGPu0O0OSTq+1zIPG17f0YTFUA AUz7p2mRon0kZxbmiT3n5fFO X-SBRS: 5.1 X-MesageID: 58884443 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:gF3/66OSt4JW4zrvrR1DkMFynXyQoLVcMsEvi/4bfWQNrUog1DAOz TYdWT+BbKqPYTCned4jbI3l/R8EuZKAyIRiTgto+SlhQUwRpJueD7x1DKtR0wB+jCHnZBg6h ynLQoCYdKjYdpJYz/uUGuCJQUNUjMlkfZKhTr6bUsxNbVU8En5400o9w7RRbrNA2rBVPSvc4 bsenOWHULOV82Yc3rU8sv/rRLtH5ZweiRtA1rAMTakjUGz2zhH5OKk3N6CpR0YUd6EPdgKMq 0Qv+5nilo/R109F5tpICd8XeGVSKlLZFVDmZna7x8FOK/WNz8A/+v9TCRYSVatYoxqkgfB04 Y1uj82LFz53AKHWoLQteRYNRkmSPYUekFPGCX22sMjVxEzaaXr8hf5pCSnaP6VBpLwxWzsXs 6VFdnZdNXhvhMrvqF6/YuBqmsQkKtitJI4Fs2ts5TrYEewnUdbIRKCiCdpwgWdg1pwSQa22i 8wxeBF2ZhL4UjR0JHgMML8QreizqUbtWmgNwL6SjfVuuDWCpOBr65DsL9j9atGMXd9SnEuTu iTB5WuRKg4eHMySz3yC6H3Erv/Cm2b3VZwfEJW89+V2mxuDy2oLEhoUWFCn5/6jhSaWUtRDK 0sS62w2oLI77kCDQdz0Xhn+q3mB1iPwQPIJTbd8slvUjPOJvUDJXQDoUwKtdvQJmdEWQBVy9 WXYpI3QWwJjqoXFeViSo+L8QSyJBQAZKmoLZCkhRAQD4sX+rIxbsi8jXuqPA4bu0ISrRGiYL ySi6XFn2u5N1ZJjO7CTpAif21qRSo71ohnZD+k9dkas9UtHaYGsfOREAnCLvK8bfO51orRs1 UXoevRyDshTVPlhdwTXGY3h+Y1FAd7falUwZnY1QPEcG8yFoSLLQGypyGgWyL1VGsgFYyT1R 0TYpBlc4pReVFPzM/QnPNjgVp5wk/ewfTgAahwyRoAUCnSWXFXYlByCmGbKhzy9+KTSuf9X1 WinnTaEUi9BVPUPIMueTOYBy747rh3SNkuILa0XOy+PiOLEDFbMEO9tGALXMogRsfPVyC2Io o03H5bblH1ivBjWP3C/HXg7dgtRcxDWxPne9qRqSwJ0ClY8RTx6VaaOmehJlk4Mt/09q9okN 0qVAidwoGcTT1WcQelTQnw8Or7pQ7hlqnc3YX4lMVqygiBxaoez9qYPMZAweOB/puBkyPd1S dgDetmBXasTGmiWpWxFYMmvtpFmeTSqmRmKY3ivbg8gcsMyXAfO4NLlIFfirXFcEiqtuMIii LS8zQeHE4EbTgFvAZ+OOvKixl+8p1YHn+d2UxeaK9VfYhy0ooNrNzbwnrk8JMRVcUfPwT6T1 gC3BxYEpLaS/99poYeR3a3d9tWnCepzGEZeDlL317fuOHmI5HenzK9BTP2MIWLXWlTr9fjwf u5S1fz9bqEKxQ4Yr4pmHr935qsi/N+z9aRCxwFpEXiXPVSmDrRsfiuP0cVV7/Afw7ZYvU29W 16V+8kcMrKMYZu3HFkULQsjT+KCyfBLxWWCsaVreB33tH1t4b6KcUROJB3d2iVSIYx8PJ4h3 ep86tUd7Bayi0ZyP9uL5syOG79g8pDUv30bi6wn IronPort-HdrOrdr: A9a23:m2APWK+YaiSY8Il1+uBuk+DeI+orL9Y04lQ7vn2YSXRuHfBw8P re+8jztCWE8Qr5N0tApTntAsS9qDbnhPxICOoqTNOftWvd2FdARbsKheCJ/9SjIVyaygc079 YHT0EUMrPN5DZB4foSmDPIcOod/A== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="58884443" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu Subject: [XEN PATCH 32/57] tools/misc: rework Makefile Date: Mon, 6 Dec 2021 17:02:15 +0000 Message-ID: <20211206170241.13165-33-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Add missing "xen-detect" rule. It only works without it because we still have make's built-ins rules and variables, but fix this to not have to rely on them. Rename $(TARGETS_BUILD) to $(TARGETS). Remove the unused "build" target. Also, they are no more "build-only" targets, remove the extra code. Signed-off-by: Anthony PERARD --- tools/misc/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 8b9558b93f..5e7787e501 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -50,16 +50,13 @@ TARGETS_COPY += xencov_split TARGETS_COPY += xenpvnetboot # Everything which needs to be built -TARGETS_BUILD := $(filter-out $(TARGETS_COPY),$(TARGETS_ALL)) +TARGETS := $(filter-out $(TARGETS_COPY),$(TARGETS_ALL)) -# ... including build-only targets -TARGETS_BUILD += $(TARGETS_BUILD-y) - -.PHONY: all build -all build: $(TARGETS_BUILD) +.PHONY: all +all: $(TARGETS) .PHONY: install -install: build +install: all $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) @@ -75,7 +72,7 @@ uninstall: .PHONY: clean clean: - $(RM) *.o $(TARGETS_BUILD) *~ $(DEPS_RM) + $(RM) *.o $(TARGETS) *~ $(DEPS_RM) .PHONY: distclean distclean: clean @@ -86,6 +83,9 @@ xen-access: xen-access.o xen-cpuid: xen-cpuid.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) +xen-detect: xen-detect.o + $(CC) $(LDFLAGS) -o $@ $< $(APPEND_LDFLAGS) + xen-hvmctx: xen-hvmctx.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) From patchwork Mon Dec 6 17:02:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659111 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 293D4C433F5 for ; Mon, 6 Dec 2021 17:09:38 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239546.415584 (Exim 4.92) (envelope-from ) id 1muHUR-0004yz-U9; Mon, 06 Dec 2021 17:09:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239546.415584; Mon, 06 Dec 2021 17:09:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHUR-0004xI-K8; Mon, 06 Dec 2021 17:09:23 +0000 Received: by outflank-mailman (input) for mailman id 239546; Mon, 06 Dec 2021 17:09:21 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPI-0005ta-2K for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:04 +0000 Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 81e9c64e-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:04:02 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 81e9c64e-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810242; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lpc84js2a7j5ldQO1A3ja4tbuLNhFUTRDx1cJp21TZ8=; b=eOPBwlimQoYdiwIenV0vriJLN4D6h/+/KeJjTn8CqHBc2gELjOyNRi8R JKIP83lSSNK8IG0bmzCqKmcQ96+Romg8x+JerCfvDi+jstMCPAu7VpeOt oMcKMt0fY2dqLeZ2EiHez3cLvI15Hjk3oXqWZdnQF17U2gCLVKd3V6ebH k=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: j0KG2gvRPE/D7iuQvUkz21OplqOlk31EUGpuyIOfhrP17do5sM7CQ/I8VUgf8lL8oRL/Xw1Nl2 FwopbUsdB6ioUrMph607yshOEgEiMRkNNvbvF+gcH1Q7Jgqb2CMBuqgHEX75V9BdC2RYEDnUTD KZ55tUQ+QxjG9J6Sky3VCBp4kxzF6yBQ5H24KvpubIWuWkv8ZZfh6x8npSb6b8Ob55fREwXPDS GazovbgsOKuhilHVXC4O9uz5UY1JR8gK6zqy+Tb03ekiz9J6qG8vonl/da9La4UXM8ijNgWJ8j kM0TG6xeOo1RXX5kWAuZb5J5 X-SBRS: 5.1 X-MesageID: 59370662 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:eLD++6DMLgMZFRVW/8/kw5YqxClBgxIJ4kV8jS/XYbTApGwlgmBVy GdJUGDSOaqLZmSne4onb4u+oUIOsMeHzt9qQQY4rX1jcSlH+JHPbTi7wuYcHM8wwunrFh8PA xA2M4GYRCwMo/u1Si6FatANl1ElvU2zbue6WLGs1hxZH1c+EX570Uw7wYbVv6Yz6TSHK1LV0 T/Ni5W31G+Ng1aY5UpNtspvADs21BjDkGtwUm4WPJinj3eH/5UhN7oNJLnZEpfNatI88thW5 Qr05OrREmvxp3/BAz4++1rxWhVirrX6ZWBihpfKMkQLb9crSiEai84G2PQghUh/0BmquPN7k vR0qbu7RSdwAIeUp8EtekwNe81+FfUuFL7vJHG+tYqYzlHccmuqyPJrZK00FdRGoKAtWzgIr KFGbmBWBvyAr7veLLaTQ+9whsMlPY/zMZkWoH1IxjDFF/c2B5vERs0m4PcFjWxv3p4QR54yY eIEajZpMkjnTCF3AQ83A455gsuugljWJmgwRFW9+vNsvjm7IBZK+LnyMvLFd9qSX8JXk02E4 GXc8AzRHRUyJNGZjz2f/RqEluLJ2C/2Ro8WPLm57eJxxk2ewHQJDx8bXkf9puO24ma3Xc5fL EoFvDIjt6Eo+GSkS9D8W1uzp3vsg/IHc4MOSatgsljLk/eKpVbCboQZctJfQIcKl+gVT2YL7 0OulN/JXAJF6IKweVvIo994sgiOESQSKGYDYwoNQg0E/8TvrekPs/7fcjpwOPXr14OoQFkc1 xjP9XFj3OtL0abnwo3ipQif6w9AsKQlWeLcCu//emu+pj10a4e+D2BDwQiKtK0QRGp1o7Tog ZTlpyR8xL1XZX1uvHbUKAnoIF1Pz6zfWNE7qQQwd6TNDxz3pxaekXl4uVmS3ntBPMceYiPOa 0TOow5X75I7FCL0Nv8oOdPsUZ50kviI+THZuhb8NIAmjn9ZLlDvwc2TTRTIgzCFfLYEz8nTx qt3ge7zVC1HWMyLPRK9RvsH0K9D+8zN7Ti7eHwP9Dz+ieD2TCfMEd8taQLSBshkvPLsiFiEq L53aprVoyizpcWjO0E7B6ZIdgtURZX6bLirw/FqmhmrflA7RTp/UqCJmtvMueVNxsxoqwsBx VnlMmcw9bY1rSavxdyiZi8xZbXxc4x4qH5nbyUgMUzxgyooYJq17bdZfJwyJOF1+OtmxP9yb v8EZ8TfXagfFmWZo2wQPcvnsYhvVBW3ngbSbSCrVycyIsx7TAvT9966Iga2rHsSDjC6vNcVq qG70l+JWoIKQglvVZ6EaP+mw16rk2IaneZ+AxnBLtVJIR2++4l2MS3hyPQwJphUexnEwzKb0 SeQAAsZ+raR89NkroGRiPnd/YmzEuZ4Ek5LJEXh7O67ZXvA426u4Y5cS+LULzrTY3z5pfe5b uJPwvCibPBexARWs5BxGqpAxL4l44e9vKdTywlpESmZb1mvDb88cHCK0dMW6/9Iz75d/wC3R liO6p9RPrDQYJHpF1sYJQwEaOWf1K5LxmmOvKpteEiqtjVq+LenUFlJO0jegSNQG7J5LYc5z Lpzo8UR8QG+1kInP9vuYvq4LIhQwqjsi5kai6w= IronPort-HdrOrdr: A9a23:0n9VZ676BiLXgfkzbAPXwPDXdLJyesId70hD6qhwISY6TiX+rb HJoB17726NtN9/YhEdcLy7VJVoBEmskKKdgrNhWotKPjOW21dARbsKheCJrgEIWReOktK1vZ 0QCpSWY+eQMbEVt6nHCXGDYrQd/OU= X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59370662" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu Subject: [XEN PATCH 33/57] tools/vchan: Collect targets in TARGETS Date: Mon, 6 Dec 2021 17:02:16 +0000 Message-ID: <20211206170241.13165-34-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 And use the new TARGETS to clean them. Now "clean" will remove "vchan-socket-proxy". $(RM) already have the "-f" flags, so remove the second one. Signed-off-by: Anthony PERARD --- tools/vchan/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/vchan/Makefile b/tools/vchan/Makefile index a731e0e073..c886c22e12 100644 --- a/tools/vchan/Makefile +++ b/tools/vchan/Makefile @@ -11,8 +11,10 @@ NODE2_OBJS = node-select.o $(NODE_OBJS) $(NODE2_OBJS): CFLAGS += $(CFLAGS_libxenvchan) $(CFLAGS_libxengnttab) $(CFLAGS_libxenevtchn) vchan-socket-proxy.o: CFLAGS += $(CFLAGS_libxenvchan) $(CFLAGS_libxenstore) $(CFLAGS_libxenctrl) $(CFLAGS_libxengnttab) $(CFLAGS_libxenevtchn) +TARGETS := vchan-node1 vchan-node2 vchan-socket-proxy + .PHONY: all -all: vchan-node1 vchan-node2 vchan-socket-proxy +all: $(TARGETS) vchan-node1: $(NODE_OBJS) $(CC) $(LDFLAGS) -o $@ $(NODE_OBJS) $(LDLIBS_libxenvchan) $(APPEND_LDFLAGS) @@ -30,7 +32,7 @@ install: all .PHONY: clean clean: - $(RM) -f *.o vchan-node1 vchan-node2 $(DEPS_RM) + $(RM) *.o $(TARGETS) $(DEPS_RM) distclean: clean From patchwork Mon Dec 6 17:02:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659005 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5774AC43219 for ; Mon, 6 Dec 2021 17:07:47 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239480.415206 (Exim 4.92) (envelope-from ) id 1muHSl-0001Ox-GX; Mon, 06 Dec 2021 17:07:39 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239480.415206; Mon, 06 Dec 2021 17:07:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHSl-0001ME-1v; Mon, 06 Dec 2021 17:07:39 +0000 Received: by outflank-mailman (input) for mailman id 239480; Mon, 06 Dec 2021 17:07:36 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPJ-0005ta-2M for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:05 +0000 Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 83437ede-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:04:03 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 83437ede-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810243; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=K4Dj/rVFjE9NpLbUJO3gjrHpVBFNDjlJe0A8PqFvnrE=; b=cS4FK9s+UNI/2wIWZhIPFfiiUOHcJuNu/llEuqmFKBxZywzc8G9cp0Cv FE9C+cBv5QoMVOOnuEP1FiSEQqsNuoc1Y8koj/BK7sW9Y12CJuC6mRHfv Bx5F4eeMV5sJ11EYMRkxFk/RZR9P1GP+UkJHvQDHcWXusikPisCV7Ui4N k=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: iabrFiwKvGkQrp4HCnq03XzGhA4+0DmWE3LQWanf1QciZdWcmxY3j1yvT03bZU5uyYRXr3SY+D Hex5fJbqJPan8kqZK3eJ7MQ/mHQ/s9Qx5ffrt0Zxqw+X17X/6Vkc12U5/GLdoDBbWrXznktVQ5 tqOc9yiG2Haek+LibX+tQNNO652oFRFJ4hKWYwiusUVfBBoKM9xTfUMjRJBsnergzZIhfdsoDE GZ67+5zo6eRv/IJ/arCW7BM/JtzTshJVFAWDoFkWohEgPG0lsG5LvnzQXgraUwAnmbxnhBciu0 rL6Ry2qh8Swzjd2Eo/lpG1iJ X-SBRS: 5.1 X-MesageID: 59370667 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:naf2Oa/6aCwNHzb+Ud8ZDrUDZnmTJUtcMsCJ2f8bNWPcYEJGY0x3n WFOXDuHP/bZY2GjKYx0bt63pEkBsJKBz4c3HQc/rXg8E34SpcT7XtnIdU2Y0wF+jyHgoOCLy +1EN7Es+ehtFie0Si9AttENlFEkvU2ybuOU5NXsZ2YhGmeIdA970Ug6wrRh3NYy6TSEK1jlV e3a8pW31GCNg1aYAkpMg05UgEoy1BhakGpwUm0WPZinjneH/5UmJMt3yZWKB2n5WuFp8tuSH I4v+l0bElTxpH/BAvv9+lryn9ZjrrT6ZWBigVIOM0Sub4QrSoXfHc/XOdJFAXq7hQllkPgrw +xUvqPhQz0FN4zvpacTSDJXAgNxaPguFL/veRBTsOSWxkzCNXDt3+9vHAc9OohwFuRfWD8Us 6ZCcXZUM07F17neLLGTE4GAguwqKtXrO4UO/Glt1zjDAd4tQIzZQrWM7thdtNs1rp0fRqmGO ZRGAdZpREidRRRWIg0mNIsBwf+DpFrDSyBXomvA8MLb5ECMlVcsgdABKuH9e8OIbdVYmF6Co WDL9Hi/BQsVXPSAzRKV/3TqgfXA9QvrVYRXGLCm+/pChFyI2ndVGBAQTUG8o/Sylgi5Qd03A 0US5iopq7l07EGxR8PxdxK9qX+A+BUbXrJt//YSsV/XjPCOukDAWzZCHmUphMEaWNEeHzcTz 1S2ztnTKTVOk4DWR2m2+aa2ombnUcQKFlMqaSgBRAoDxtDspoAvkx7CJupe/L6JYs7dQm+pn W3TxMQqr/BK1JNQif3nlbzSq2v0/sChc+Ij2unAsotJBCtdbZXtWYGn4EOzAR1ofNfAFQnpU JTpdqGjAAEy4XOlyXXlrAYlRujBCxO53Nv02wQH834JrWvFxpJbVdoMiAyS3W8wWir+RRfnY VXIpSRa74JJMX2hYMdfOtzqW5twnPW6T4q6Bpg4i+aihLArLmdrGwk0OiatM53FyhBwwcnTx 7/FGSpTMZrqIfs+l2fnLwvs+bQq2jo/1QvuqWPTlHyaPU6lTCfNE98taQLWBshgtf/siFiFo r53aprRoz0CAbKWX8Ui2dNKRbz8BSNgXs6eRg0+XrPrHzeK70l9UaKMmu14JNQ+90mX/8+Rl kyAtoZj4AKXrRX6xc+iMBiPsZvjAsRyq2wVJyspMQr60nQve9/3vqwea4E2bf8s8+k6lax4S PwMesOhBPVTS2uYp2RBPMel9IEyJg62gQ+uPja+ZGRtdZBXWAGUqMTveRHi9XdSA3Pv59c+u bCpyijSXYEHG1Z5FM/TZf/2lwGxsHERlfhcRUzNJtUPKkzg/JIzc376j+MtItFKIhLGn2PI2 wGTCBYehO/Mv45qr4WZ2fHa99+kSrIsEFBbEm/X6aeNGRPbpmfzk5VdVOuofCzGUD+m8quVe ugIner3N+cKnQgWvtMkQapr1683+/Dmu6ReklZ/BHzOYlmmVuFgL32B0ZUdv6FB3OYE6w6/W 0bJ8dhGI7SZfsjiFQdJdgYia+2C09ASmyXTsqtpcBmruncv8erVS1hWMjmNlDdZfel8P44Sy Os8vNIbtl6kgR0wP9fa1i1Z+gxg9JDbv3nLYn3CPLLWtw== IronPort-HdrOrdr: A9a23:jMc7gKOE7fDIqsBcTsejsMiBIKoaSvp037Eqv3ofdfUzSL3+qy nOpoVj6faaslcssR0b9OxofZPwI080lqQFhbX5X43DYOCOggLBR+tfBMnZsljd8kXFh4hgPM xbHZSWZuedMbEDt7eY3DWF X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59370667" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu Subject: [XEN PATCH 34/57] tools/xcutils: rework Makefile Date: Mon, 6 Dec 2021 17:02:17 +0000 Message-ID: <20211206170241.13165-35-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Use TARGETS to collect targets to build Remove "build" target. Signed-off-by: Anthony PERARD --- tools/xcutils/Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile index 82d42624c8..198be22a5a 100644 --- a/tools/xcutils/Makefile +++ b/tools/xcutils/Makefile @@ -11,7 +11,7 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -PROGRAMS = readnotes lsevtchn +TARGETS := readnotes lsevtchn CFLAGS += -Werror @@ -19,10 +19,7 @@ CFLAGS_readnotes.o := $(CFLAGS_libxenevtchn) $(CFLAGS_libxenctrl) $(CFLAGS_libx CFLAGS_lsevtchn.o := $(CFLAGS_libxenevtchn) $(CFLAGS_libxenctrl) .PHONY: all -all: build - -.PHONY: build -build: $(PROGRAMS) +all: $(TARGETS) readnotes: readnotes.o $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) @@ -31,17 +28,17 @@ lsevtchn: lsevtchn.o $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) .PHONY: install -install: build +install: all $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) $(PROGRAMS) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PROG) $(TARGETS) $(DESTDIR)$(LIBEXEC_BIN) .PHONY: uninstall uninstall: - rm -f $(addprefix $(DESTDIR)$(LIBEXECDIR)/, $(PROGRAMS)) + rm -f $(addprefix $(DESTDIR)$(LIBEXECDIR)/, $(TARGETS)) .PHONY: clean clean: - $(RM) *.o $(PROGRAMS) + $(RM) *.o $(TARGETS) $(RM) $(DEPS_RM) .PHONY: distclean From patchwork Mon Dec 6 17:02:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659003 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3C403C433EF for ; Mon, 6 Dec 2021 17:07:46 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239477.415193 (Exim 4.92) (envelope-from ) id 1muHSk-0000zd-3t; Mon, 06 Dec 2021 17:07:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239477.415193; Mon, 06 Dec 2021 17:07:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHSj-0000ws-I2; Mon, 06 Dec 2021 17:07:37 +0000 Received: by outflank-mailman (input) for mailman id 239477; Mon, 06 Dec 2021 17:07:35 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPN-0005ti-8r for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:09 +0000 Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 863b6834-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:04:08 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 863b6834-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810247; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Qi8ktRfGxKz6TVNBfNc+szyw4+rNfchyhf2q4Nw7GMs=; b=bfXvX2kvt3XeFh/G1829Dt/y4fs8KMMlPWqYYhQnz5g4fvKUT5FCJs0b vaJQ7OSZiZ3IDf5CeQDVMRLRC/WnVpNae+prvQlB+A7VOjYuRzUOehcej QEExhX26tpHWBdGfvE+JP7JnlCCWUGCwhxZR/kAjRSg7xhj+UK4YjOMsn g=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: qpV4d4+1FPX+nHxG7J9nJXYwjDyegjkOgLVYA1UFwoOXpRRtyx1G+7iEWpMl33LJiMrqZ6/g6m gjqr/1HkC77E1Ma0jS766dfiGeSzrzXiS1ODIpN5+h8pOllVk77qFtnl0QIyeD/ksPX9Bteea4 vN0rzMrHGSQM7xfny9VE7n1XEWUY2Zbl4fmIvogBKAMHjL0A5N24xc5EZlYUew2I+jlRVJb4Cl kg+7XkvHTVgQpaLTCP2exdSnZUo61IH+X1vzcgl+QxvZkrcDN5fFQnQSGv7yMPtlHTZ5XI70b8 JRk2bRZcs4o54cWIqJ4Kc1mh X-SBRS: 5.1 X-MesageID: 59387915 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:0tYB5K1oaEDJErUU//bD5TJ2kn2cJEfYwER7XKvMYLTBsI5bpzFWz WRMCmuOOviMN2aje9l2PoW08ksCvJLTmoJlGVBspC1hF35El5HIVI+TRqvS04J+DSFhoGZPt Zh2hgzodZhsJpPkS5PE3oHJ9RGQ74nRLlbHILOCan8ZqTNMEn970Es5w7Bh2OaEvPDia++zk YKqyyHgEAfNNw5cagr4PIra9XuDFNyr0N8plgRWicJj5TcypFFMZH4rHomjLmOQf2VhNrXSq 9Avbl2O1jixEx8FUrtJm1tgG6EAaua60QOm0hK6V0U+6/TrS+NbPqsTbZIhhUlrZzqhuvE2y sRdt9uLaTw5fYL0x8U9CitEOnQrVUFG0OevzXmXtMWSywvNcmf2wuUoB0YzVWEa0r8pWycUr 6VecW1TKEDY7w616OvTpu1Ej8I/LM7tLcUHt2tp1z3xBvc6W5HTBa7N4Le02R9t15seQqeHO qL1bxIwXBXQJDZgP2sVVrUblduvhHXwTm1x/Qf9Sa0fvDGIkV0ZPKLWGNvKePSaSMNNhEGaq 2nauWPjDXkyK9i32TeDtHW2iYfnjS79HY4fCrC83vprm0GIgHweDgUMUlm2quX/jVSxM/pWL VAU/Sw/67A/7kWxQvHyWhS5pDiPuRt0ZjZLO7RkskfXkPOSulvHQDhfJtJcVDA4nOoXAj47x l3OpPPSFX9AiOK0aSuv6p7B+FteJhMpBWMFYCYFSy4M7N/ivJw/g3rzczpzLEKmpoarQG+tm lhmuAB73uxO1pBTi81X6Hie22r0zqUlWDLZ8ek+soiNygpiLLCoaIWzgbQwxaYRdd3JJrVtU ZVtpiR/0AzsJczU/MBuaL9UdF1M2xpjGGeG6bKIN8N+nwlBA1b5IehtDMhWfS+FyPosdz7ze 1P0sghM/pJVN3bCRfYpONLuUZV3l/K+SoSNuhXogjxmOMIZmOivpn4GWKJt9zq1zBhEfV8XZ /93jvpA/V5FUP86nVJats8W0KMxxzBW+I8gbcuT8vhT6pLHPCT9Ye5caDOmN7llhIvZ8FS92 4sObKOilkQAONASlwGKqOb/23hRdiNlbX03wuQKHtO+zv1ORDt8VqSPmOx5IOSIXc19z4/1w 510YWcAoHKXuJENAVzbApy6QL+wD5t5s1whOikgYQSh13Q5ON7956YDbZonO7Ig8bU7n/JzS vAEfeSGA+hOFWubq2hMM8GlodwwbgmviCKPIzGhPGo1cal/SlGb4dTjZAbuqnUDV3Llqcskr rS8/QrHWp5fFR96BcPbZav3nVO8tHQQgsxoWE7MLoUBcUng6tEyeSfwkuU2M4cHLhCanmmW0 AOfABE5o+jRotBqrImV1P7c94rwSrlwBEtXGWXf/I2aDyiC8zrx25JEXcaJYSvZCDH+9pK9a LgH1Pr7KvAGwgpH6tIuD7ZxwKsizNLzvLsGnB98FXDGYln3WLNtJn6KgZtGuqFXn+ILvAK3X gSE+8VAOKXPM8TgSQZDKA0gZ+WF9PcVhjiNsqhlfBSkvHd6rOidTEFfHxiQkygMfrJ6PbQsz folpMNLuRe0jQAnM4regy1Zn4hWwqfsj0nzWkkmPbLW IronPort-HdrOrdr: A9a23:Vg+O/aDxGI9vsczlHemq55DYdb4zR+YMi2TC1yhKJiC9Ffbo8P xG/c5rrCMc5wxxZJhNo7290ey7MBHhHP1OkO0s1NWZPDUO0VHAROoJ0WKh+UyEJ8SXzJ866U 4KScZD4bPLYWSS9fyKgzWFLw== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59387915" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu Subject: [XEN PATCH 35/57] tools/xenpaging: Rework makefile Date: Mon, 6 Dec 2021 17:02:18 +0000 Message-ID: <20211206170241.13165-36-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 - Rename $(SRCS) to $(OBJS-y), we don't need to collect sources. - Rename $(IBINS) to $(TARGETS) - Stop cleaning "xen" and non-set variable $(LIB). Signed-off-by: Anthony PERARD --- tools/xenpaging/Makefile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile index 04743b335c..e2ed9eaa3f 100644 --- a/tools/xenpaging/Makefile +++ b/tools/xenpaging/Makefile @@ -5,33 +5,33 @@ CFLAGS += $(CFLAGS_libxentoollog) $(CFLAGS_libxenevtchn) $(CFLAGS_libxenctrl) $( LDLIBS += $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) $(PTHREAD_LIBS) LDFLAGS += $(PTHREAD_LDFLAGS) -POLICY = default +POLICY := default -SRC := -SRCS += file_ops.c xenpaging.c policy_$(POLICY).c -SRCS += pagein.c +OBJS-y := file_ops.o +OBJS-y += xenpaging.o +OBJS-y += policy_$(POLICY).o +OBJS-y += pagein.o CFLAGS += -Werror CFLAGS += -Wno-unused -OBJS = $(SRCS:.c=.o) -IBINS = xenpaging +TARGETS := xenpaging -all: $(IBINS) +all: $(TARGETS) -xenpaging: $(OBJS) +xenpaging: $(OBJS-y) $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(APPEND_LDFLAGS) install: all $(INSTALL_DIR) -m 0700 $(DESTDIR)$(XEN_PAGING_DIR) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) $(IBINS) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PROG) $(TARGETS) $(DESTDIR)$(LIBEXEC_BIN) uninstall: - rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(IBINS)) + rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(TARGETS)) clean: - rm -f *.o *~ $(DEPS_RM) xen TAGS $(IBINS) $(LIB) + rm -f *.o *~ $(DEPS_RM) TAGS $(TARGETS) distclean: clean @@ -39,6 +39,6 @@ distclean: clean .PHONY: TAGS TAGS: - etags -t $(SRCS) *.h + etags -t *.c *.h -include $(DEPS_INCLUDE) From patchwork Mon Dec 6 17:02:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659063 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D9387C433FE for ; Mon, 6 Dec 2021 17:09:09 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239534.415509 (Exim 4.92) (envelope-from ) id 1muHU3-0008H1-3l; Mon, 06 Dec 2021 17:08:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239534.415509; Mon, 06 Dec 2021 17:08:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHU1-0008Bn-Ux; Mon, 06 Dec 2021 17:08:57 +0000 Received: by outflank-mailman (input) for mailman id 239534; Mon, 06 Dec 2021 17:08:55 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPO-0005ti-Fh for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:10 +0000 Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 870083b8-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:04:09 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 870083b8-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810249; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0MivWbgo/dLtJel8lLkqzy+izVyO5ow6ugdRMsmNQz0=; b=EOySLkNTKVERhcqzMXigBnfPDtTn5pAR8B6Ypw68AYeQfFYORdRc7mhh N+yM0E36fha1MAm5a21u2VQyk9fjr9pPweDs+KHAojSHDzy3uksIyPCH9 kLe7q0C3WZw8HGT7O1bnzY0ydItym3U3ndDhcY69AV8xuSgHA+hPEPKp5 0=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: rveRkO69cS5gYtM8H32HobqBjT2KVOUK5TVZeI+5UwQqioiB+OXKu5w7jiSiiCfFnAEKNDq5rJ g0lz0xDT/NW4GnU6DRrHx0fjMwYA40k2Nf1LMHVLA1o5xxhshiRkmZoI3KdTvIfoY213EoNyhx pBaKM57RKF/Vl404T+3Wiuhf8Ak/l2ZcuZS93NNT9Pw0ndw8E8zZxOYilJc98R5e/MN6Pggtkh dshOn3RjUwMrxzvmv8CMoEyEjg7ZzLclaC6Wa3MpmcN5Iamsx/sD5W07Khx5fPWEdvun7X8rB0 e/hWg+j3Wi5eYf6QFmI2Rs2W X-SBRS: 5.1 X-MesageID: 59387924 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:unO4M62HfnKd/mC98PbD5Vh2kn2cJEfYwER7XKvMYLTBsI5bpzZTn 2ZNDTiBaamOMzDzKNl1PIi0p01T6sPXnIJgGQZqpC1hF35El5HIVI+TRqvS04J+DSFhoGZPt Zh2hgzodZhsJpPkS5PE3oHJ9RGQ74nRLlbHILOCan8ZqTNMEn970Es5w7Bh2OaEvPDia++zk YKqyyHgEAfNNw5cagr4PIra9XuDFNyr0N8plgRWicJj5TcypFFMZH4rHomjLmOQf2VhNrXSq 9Avbl2O1jixEx8FUrtJm1tgG6EAaua60QOm0hK6V0U+6/TrS+NbPqsTbZIhhUlrZzqhu/R65 OcR5JaJRVk7bo7lobsFWR0GHHQrVUFG0OevzXmXtMWSywvNcmf2wuUoB0YzVWEa0r8pWycUr 6VecW1TKEDY7w616OvTpu1Ej8I/LM7tLcUHt2tp1z3xBvc6W5HTBa7N4Le02R9t15seQqeEO 6L1bxJWZUTwMzIQFm0dVtE7mbyHiWTeQixh/Qf9Sa0fvDGIkV0ZPKLWGMXRUsyHQ4NShEnwj mDJ5WPiGTkBKceSjzGC9xqEhPLLnC79cJIfEvu/7PECqE2ewCkfBQMbUXO/oOKlkQiuVtRHM UsW9yEy668o+ySDR9/hXxq+sTicswQVQdZ4HOgz6QXLwa3Riy6YGWosXjNHcMYhtsI9WXotz FDhoj/yLWUx6vvPEyvbr+rK62PpUcQIEYMcTQsgRic3v4jpmY1tnELsZ+88CKSx0NKgTFkc3 Au2hCQ5grwSi+sC2KO64U3LjlqQm3TZcuImzl6JBzz4t2uVcKbgPtX1sgaDsZ6sOa7AFgHZ1 EXojfRy+wzn4XulsCWWCNsAE7iyjxpuGG2N2AU/d3XNGtnExpJCQWyyyGwnTKuKGpxdEdMMX KM1kVkLjHO0FCH1BZKbm6rrV6wXIVLcPdrkTOvISdFFf4J8cgSKlAk3OxXAgDq8zRJ2z/5vU Xt+TSpKJSxAYUiA5GDpL9rxLJdxnnxurY8tbc6TI+ubPUq2OyfOFOZt3KqmZeEl9qKUyDg5A P4EX/ZmPy53CbWkCgGOqNZ7BQlTcRATWMCnw+QKJ7XrClc3Rwkc5wr5nOpJU5Z7hJ5ciuqg1 ij7Aie0PnKk3iaZQehLA1g+AI7SsWFX8ShmYHdyZAnwgBDOo++Htc8iSnf+RpF/nMQL8BK+Z 6NdEylZKvgQGDnB5RoHapzx8N5reBix3FrcNCu5ejkvOZVnQlWRqNPjewLu8ggIDza26pRi8 +HxiFuDTMpRXRlmAebXdOmrkwG7s08Clb8gREDPONRSJhnhqdA4Nyzrg/YrCMgQMhGflCCC3 gObDE5A9+nAqoM46vfTgqWAo9v7GudyBBMCTWLa8ay3JW/R+W/6md1MV+OBfDb8UmLo+fr9O bUJnq+kaPBexQREqYtxFbpv3JkS3dq3qu8I1BlgEVXKc0+vVuFqLE6Z0JQdraZK3LJY51e7A xrd5tlANLyVE8r5C1pNdhE9Z+GO2PxIyDnf6fM5fBfz6CNtpefVVExTO1+HiTBHLaszO4Qgm L9ztMkT4g25qxwrLtfZ0XwEqzXSdiQNA/c9q5UXII73kQ56mFhNbKvVBjLy/JzSOc5HNVMnI 2PMiafP71iGKpEur5bn+aDx4Ndg IronPort-HdrOrdr: A9a23:HShvlaqm77F9uaY9dR+79q0aV5oteYIsimQD101hICG8cqSj+P xG+85rsiMc6QxhIU3I9urgBEDtex7hHNtOkOss1NSZLW3bUQmTTL2KhLGKq1aLJ8S9zJ856U 4JSdkZNDSaNzZHZKjBjDVQa+xQo+W6zA== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59387924" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Juergen Gross , Julien Grall Subject: [XEN PATCH 36/57] tools/xenstore: Cleanup makefile Date: Mon, 6 Dec 2021 17:02:19 +0000 Message-ID: <20211206170241.13165-37-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Regroup *FLAGS together, use $(LDLIBS). Remove $(LDLIBS_xenstored) which was the wrong name name as it doesn't decribe how to link to a potential libxenstored.so, instead add the value to $(LDLIBS) of xenstored. Add SYSTEMD_LIBS into $(LDLIBS) instead of $(LDFLAGS). Remove the "-I." from $(CFLAGS), it shouldn't be needed. Removed $(CFLAGS-y) and $(LDFLAGS-y). $(CFLAGS-y) is already included in $(CFLAGS) and both aren't used anyway. Rename ALL_TARGETS to TARGETS. Only add programmes we want to build in $(TARGETS), not phony-targets (replace "clients"). Store all `xenstored` objs into $(XENSTORED_OBJS-y). Replace one $< by $^ even if there's only one dependency, (xenstore-control). clean: "init-xenstore-domain" isn't built here, so stop trying to remove it, remove $(TARGETS). Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/xenstore/Makefile | 81 ++++++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 37 deletions(-) diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 292b478fa1..7fe1d9c1e2 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -5,7 +5,6 @@ MAJOR = 3.0 MINOR = 3 CFLAGS += -Werror -CFLAGS += -I. # Include configure output (config.h) CFLAGS += -include $(XEN_ROOT)/tools/config.h CFLAGS += -I./include @@ -16,36 +15,53 @@ CFLAGS += $(CFLAGS_libxentoolcore) CFLAGS += -DXEN_LIB_STORED="\"$(XEN_LIB_STORED)\"" CFLAGS += -DXEN_RUN_STORED="\"$(XEN_RUN_STORED)\"" -CFLAGS += $(CFLAGS-y) -LDFLAGS += $(LDFLAGS-y) +ifdef CONFIG_STUBDOM +CFLAGS += -DNO_SOCKETS=1 +endif -CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod -CLIENTS += xenstore-write xenstore-ls xenstore-watch +XENSTORED_OBJS-y := xenstored_core.o xenstored_watch.o xenstored_domain.o +XENSTORED_OBJS-y += xenstored_transaction.o xenstored_control.o +XENSTORED_OBJS-y += xs_lib.o talloc.o utils.o tdb.o hashtable.o -XENSTORED_OBJS = xenstored_core.o xenstored_watch.o xenstored_domain.o -XENSTORED_OBJS += xenstored_transaction.o xenstored_control.o -XENSTORED_OBJS += xs_lib.o talloc.o utils.o tdb.o hashtable.o +XENSTORED_OBJS-$(CONFIG_Linux) += xenstored_posix.o +XENSTORED_OBJS-$(CONFIG_SunOS) += xenstored_solaris.o xenstored_posix.o xenstored_probes.o +XENSTORED_OBJS-$(CONFIG_NetBSD) += xenstored_posix.o +XENSTORED_OBJS-$(CONFIG_FreeBSD) += xenstored_posix.o +XENSTORED_OBJS-$(CONFIG_MiniOS) += xenstored_minios.o -XENSTORED_OBJS_$(CONFIG_Linux) = xenstored_posix.o -XENSTORED_OBJS_$(CONFIG_SunOS) = xenstored_solaris.o xenstored_posix.o xenstored_probes.o -XENSTORED_OBJS_$(CONFIG_NetBSD) = xenstored_posix.o -XENSTORED_OBJS_$(CONFIG_FreeBSD) = xenstored_posix.o -XENSTORED_OBJS_$(CONFIG_MiniOS) = xenstored_minios.o +$(XENSTORED_OBJS-y): CFLAGS += $(CFLAGS_libxengnttab) -XENSTORED_OBJS += $(XENSTORED_OBJS_y) -LDLIBS_xenstored += -lrt +xenstored: LDLIBS += $(LDLIBS_libxenevtchn) +xenstored: LDLIBS += $(LDLIBS_libxengnttab) +xenstored: LDLIBS += $(LDLIBS_libxenctrl) +xenstored: LDLIBS += -lrt +xenstored: LDLIBS += $(SOCKET_LIBS) -ALL_TARGETS = clients -ifeq ($(XENSTORE_XENSTORED),y) -ALL_TARGETS += xs_tdb_dump xenstored +ifeq ($(CONFIG_SYSTEMD),y) +$(XENSTORED_OBJS-y): CFLAGS += $(SYSTEMD_CFLAGS) +xenstored: LDLIBS += $(SYSTEMD_LIBS) endif -ifdef CONFIG_STUBDOM -CFLAGS += -DNO_SOCKETS=1 +xenstore: LDLIBS += $(LDLIBS_libxenstore) +xenstore: LDLIBS += $(LDLIBS_libxentoolcore) +xenstore: LDLIBS += $(SOCKET_LIBS) + +xenstore-control: LDLIBS += $(LDLIBS_libxenstore) +xenstore-control: LDLIBS += $(LDLIBS_libxenctrl) +xenstore-control: LDLIBS += $(LDLIBS_libxenguest) +xenstore-control: LDLIBS += $(LDLIBS_libxentoolcore) +xenstore-control: LDLIBS += $(SOCKET_LIBS) + +CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod +CLIENTS += xenstore-write xenstore-ls xenstore-watch + +TARGETS := xenstore $(CLIENTS) xenstore-control +ifeq ($(XENSTORE_XENSTORED),y) +TARGETS += xs_tdb_dump xenstored endif .PHONY: all -all: $(ALL_TARGETS) +all: $(TARGETS) .PHONY: clients clients: xenstore $(CLIENTS) xenstore-control @@ -62,37 +78,28 @@ xenstored_probes.o: xenstored_solaris.o CFLAGS += -DHAVE_DTRACE=1 endif -ifeq ($(CONFIG_SYSTEMD),y) -$(XENSTORED_OBJS): CFLAGS += $(SYSTEMD_CFLAGS) -xenstored: LDFLAGS += $(SYSTEMD_LIBS) -endif - -$(XENSTORED_OBJS): CFLAGS += $(CFLAGS_libxengnttab) - -xenstored: $(XENSTORED_OBJS) - $(CC) $^ $(LDFLAGS) $(LDLIBS_libxenevtchn) $(LDLIBS_libxengnttab) $(LDLIBS_libxenctrl) $(LDLIBS_xenstored) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS) +xenstored: $(XENSTORED_OBJS-y) + $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ $(APPEND_LDFLAGS) -xenstored.a: $(XENSTORED_OBJS) +xenstored.a: $(XENSTORED_OBJS-y) $(AR) cr $@ $^ $(CLIENTS): xenstore ln -f xenstore $@ xenstore: xenstore_client.o xs_lib.o - $(CC) $^ $(LDFLAGS) $(LDLIBS_libxenstore) $(LDLIBS_libxentoolcore) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ $(APPEND_LDFLAGS) xenstore-control: xenstore_control.o - $(CC) $< $(LDFLAGS) $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxentoolcore) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ $(APPEND_LDFLAGS) xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o - $(CC) $^ $(LDFLAGS) -o $@ $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) $^ -o $@ $(APPEND_LDFLAGS) .PHONY: clean clean: rm -f *.a *.o xenstored_probes.h - rm -f xenstored - rm -f xs_tdb_dump xenstore-control init-xenstore-domain - rm -f xenstore $(CLIENTS) + rm -f $(TARGETS) $(RM) $(DEPS_RM) .PHONY: distclean From patchwork Mon Dec 6 17:02:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659017 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 91933C433EF for ; Mon, 6 Dec 2021 17:07:54 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239493.415259 (Exim 4.92) (envelope-from ) id 1muHSs-00037f-UR; Mon, 06 Dec 2021 17:07:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239493.415259; Mon, 06 Dec 2021 17:07:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHSr-00034S-QU; Mon, 06 Dec 2021 17:07:45 +0000 Received: by outflank-mailman (input) for mailman id 239493; Mon, 06 Dec 2021 17:07:44 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPP-0005ti-0k for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:11 +0000 Received: from esa4.hc3370-68.iphmx.com (esa4.hc3370-68.iphmx.com [216.71.155.144]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8684aff7-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:04:09 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8684aff7-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810249; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HYzxa9IJ0gs1g2ZQBPATfpRkikT39MPJWLs4P8HFYcY=; b=RaWmFIHpTc4H59/E6Q1dMIU1PaQZmh1v41GwfSd1VaIK4BmzwInlVtot eNSDNeaoY8jFW/bvdELpxoOnBY5ZIDbHavizOWf5S5lHuz5e26phP7jna Aaz+ncRTQBiDBLLoLi9Gs7UtHoPAOvkxNA9b1M55KOVgax7jjeqDh1nY5 c=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: PMFEPc+L8bkSjMM1BsImfIQ/8HRwMqQdH5O+591xy3I2KyxaSv59Y3B/fEAZqVJOsHufkVvtZo 9IxObt2WtsY2qFYZ6TZYMhI5sHUZzuX+S3Zy3CIE03FdM6MPUIsoPDEgDSWLqeg/f5Mh3yArCm qKe67eEpZ9DvkE4VMU8RvC+vDdSUQ6p2byrW/k7qUAvRHrA++PPfN3y5tNMGVwQanE0iAQdnAA UH7sL84CMfG9fASDgSrsyrB22fLgkPh750njAnvHRlpewf7hb+9bbjQdIObYEiv4s1SXvAnOt1 6ZHC1rebJ9FUWTJF6Ahiod54 X-SBRS: 5.1 X-MesageID: 61420789 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:+sF+Z6Oe3UH/4cnvrR1DkMFynXyQoLVcMsEvi/4bfWQNrUon0jEGn WQXXT2BOPnbYzH8ed1xPoXj9UtXuMPdnN9rGgto+SlhQUwRpJueD7x1DKtR0wB+jCHnZBg6h ynLQoCYdKjYdpJYz/uUGuCJQUNUjMlkfZKhTr6bUsxNbVU8En5400o9w7RRbrNA2rBVPSvc4 bsenOWHULOV82Yc3rU8sv/rRLtH5ZweiRtA1rAMTakjUGz2zhH5OKk3N6CpR0YUd6EPdgKMq 0Qv+5nilo/R109F5tpICd8XeGVSKlLZFVDmZna7x8FOK/WNz8A/+v9TCRYSVatYo2Wrg9l7w ttzjrjucAEkb/KPkbVaSgYNRkmSPYUekFPGCX22sMjVxEzaaXr8hf5pCSnaP6VBpLwxWzsXs 6VFdnZdNXhvhMrvqF6/YuBqmsQkKtitJI4Fs2ts5TrYEewnUdbIRKCiCdpwgm5s3JgRTae2i 8wxYCFyVSjmXQV0H3wuKo4inb6ln2X2bGgNwL6SjfVuuDWCpOBr65DsL9j9atGMXd9SnEuTu iTB5WuRKg4eHMySz3yC6H3Erv/Cm2b3VZwfEJW89+V2mxuDy2oLEhoUWFCn5/6jhSaWUtRDK 0sS62w2oLI77kCDQdz0Xhn+q3mB1iPwQPIJTbd8slvUjPOJvUDJXQDoUwKtdvR2ltM/TzYk6 GStwervCG0w87TEDmuCo+L8QSyJBQAZKmoLZCkhRAQD4sX+rIxbsi8jXuqPA4bu0ISrRGiYL ySi6XFn2u5N1ZJjO7CTpAif21qRSo71ohnZD+k9dkas9UtHaYGsfOREAnCLvK8bfO51orRs1 UXoevRyDshTVPlhdwTXGY3h+Y1FAd7falUwZnY1QPEcG8yFoSLLQGypyGgWyL1VGsgFYyT1R 0TYpBlc4pReVFPzM/QnPNjgVp5wk/ewfTgAahwyRoAUCnSWXFXYlByCmGbKhzy9+KTSuf9X1 WinnTaEUi9BVPUPIMueTOYBy747rh3SNkuILa0XOy+PiOLEDFbMEO9tGALXMogRsfPVyC2Io o03H5bblH1ivBjWP3C/HXg7dgtRcxDWxPne9qRqSwJ0ClY8RTx6VaaOmehJlk4Mt/09q9okN 0qVAidwoGcTT1WdQelTQnw8Or7pQ7hlqnc3YX4lMVqygiBxaoez9qYPMZAweOB/puBkyPd1S dgDetmBXasTGmiWpWxFYMmvtpFmeTSqmRmKY3ivbg8gcsMyXAfO4NLlIFfirXFcEiqtuMIii LS8zQeHE4EbTgFvAZ+OOvKixl+8p1YHn+d2UxeaK9VfYhy0ooNrNzbwnrk8JMRVcUfPwT6T1 gC3BxYEpLaS/99poYeR3a3d9tWnCepzGEZeDlL317fuOHmI5HenzK9BTP2MIWLXWlTr9fjwf u5S1fz9bqEKxQ4Yr4pmHr935qsi/N+z9aRCxwFpEXiXPVSmDrRsfiuP0cVV7/Afw7ZYvU29W 16V+8kcMrKMYZu3HFkULQsjT+KCyfBLxWWCsaVreB33tH1t4b6KcUROJB3d2iVSIYx8PJ4h3 ep86tUd7Bayi0ZyP9uL5syOG79g8pDUv30bi6wn IronPort-HdrOrdr: A9a23:Od3UPKqI97AP6oVSHMwMHv8aV5oteYIsimQD101hICG8cqSj+P xG+85rsiMc6QxhIU3I9urgBEDtex7hHNtOkOss1NSZLW3bUQmTTL2KhLGKq1aLJ8S9zJ856U 4JSdkZNDSaNzZHZKjBjDVQa+xQo+W6zA== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="61420789" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu Subject: [XEN PATCH 37/57] tools/xentop: rework makefile Date: Mon, 6 Dec 2021 17:02:20 +0000 Message-ID: <20211206170241.13165-38-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Add "xentop" to "TARGETS" because this variable will be useful later. Always define all the targets, even when configured with --disable-monitor, instead don't visit the subdirectory. This mean xentop/ isn't visited anymore during "make clean" that's how most other subdirs in the tools/ works. Also add missing "xentop" rules. It only works without it because we still have make's built-ins rules and variables, but fix this to not have to rely on them. Signed-off-by: Anthony PERARD --- tools/Makefile | 2 +- tools/xentop/Makefile | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 79b4c7e3de..0c1d8b64a4 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -17,7 +17,7 @@ SUBDIRS-$(CONFIG_XCUTILS) += xcutils SUBDIRS-$(CONFIG_X86) += firmware SUBDIRS-y += console SUBDIRS-y += xenmon -SUBDIRS-y += xentop +SUBDIRS-$(XENSTAT_XENTOP) += xentop SUBDIRS-y += libfsimage SUBDIRS-$(CONFIG_Linux) += vchan diff --git a/tools/xentop/Makefile b/tools/xentop/Makefile index 0034114684..1e52b29b37 100644 --- a/tools/xentop/Makefile +++ b/tools/xentop/Makefile @@ -13,24 +13,23 @@ XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -ifneq ($(XENSTAT_XENTOP),y) -.PHONY: all install xentop uninstall -all install xentop uninstall: -else - CFLAGS += -DGCC_PRINTF -Werror $(CFLAGS_libxenstat) LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(TINFO_LIBS) $(SOCKET_LIBS) -lm CFLAGS += -DHOST_$(XEN_OS) # Include configure output (config.h) CFLAGS += -include $(XEN_ROOT)/tools/config.h -LDFLAGS += $(APPEND_LDFLAGS) + +TARGETS := xentop .PHONY: all -all: xentop +all: $(TARGETS) + +xentop: xentop.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS) $(APPEND_LDFLAGS) .PHONY: install -install: xentop +install: all $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop @@ -38,11 +37,9 @@ install: xentop uninstall: rm -f $(DESTDIR)$(sbindir)/xentop -endif - .PHONY: clean clean: - rm -f xentop xentop.o $(DEPS_RM) + rm -f $(TARGETS) xentop.o $(DEPS_RM) .PHONY: distclean distclean: clean From patchwork Mon Dec 6 17:02:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659023 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DB91DC433F5 for ; Mon, 6 Dec 2021 17:08:17 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239499.415292 (Exim 4.92) (envelope-from ) id 1muHTA-0006NZ-4J; Mon, 06 Dec 2021 17:08:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239499.415292; Mon, 06 Dec 2021 17:08:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHT9-0006MS-TV; Mon, 06 Dec 2021 17:08:03 +0000 Received: by outflank-mailman (input) for mailman id 239499; Mon, 06 Dec 2021 17:08:02 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPP-0005ti-Vf for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:12 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 874d5a64-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:04:11 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 874d5a64-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810250; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=e7pmrxgtWsIGIZ5tVVe5aoQ7uLgeznvSpyvXPWFCwoA=; b=U8iOup8OIC6OdKMBp2RdqRnQUHMgPH0UsTrO6XUIgCy7qzJuUzx8E8vU hACVIrLzgxnWL1YBD4hMeaSmW4PzWrt3YUwT7Cdu/vteYLQzHc1dQ5ibG J0AvWQV79FYterrX7Z/LbdQtIAZRrtnn7x30fTE2rWpXiizEIH/moqpIz o=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: TPSJXAen5poGq0NHSgj7d/Jrn9ofLRQWYiFXY8kBD3h9KB36fb4n+zT5yrt9qb1SDA0/ErZYzw PAU/Npr2QWPPwApgVzC2LxL8GI2q3AtgKgAb584tjQPndOJAB+sMKYpIk7KwdksB7To0LApOQr kfx8Uq9NJCt81RUrxkfInf1/j9Y9E02Kr5mh8CrMMEz+WHKpfQTPLPgv0VTNTIUpP75nM70CQO WhqqE5e9KQXCC3rWbMBvlgJSo8PjYLSoteH5iozCCqn4m4h0Ck6Y2OIiVQ9aQyCluNlnbBaMWy KIESkAOsddjuH5SIg80wvc1J X-SBRS: 5.1 X-MesageID: 59766522 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:AdWoLq5ARxueqiCzJq8cogxRtN7AchMFZxGqfqrLsTDasY5as4F+v mMZXGiHPP6NNGKnctt2bojn80sOsJ+Ay9dnHQVpqSo1Hi5G8cbLO4+Ufxz6V8+wwmwvb67FA +E2MISowBUcFyeEzvuV3zyIQUBUjclkfJKlYAL/En03FVAMpBsJ00o5wrdj2tAw27BVPivW0 T/Mi5yHULOa82Yc3lI8s8pvfzs24ZweEBtB1rAPTagjUG32zhH5P7pGTU2FFFPqQ5E8IwKPb 72rIIdVXI/u10xF5tuNyt4Xe6CRK1LYFVDmZnF+A8BOjvXez8CbP2lS2Pc0MC9qZzu1c99Z7 MdikZCoQh8SJ6TBluISTl5FCCdyFPgTkFPHCSDXXc27ykTHdz3nwul0DVFwNoodkgp1KTgQr 7pCcmlLN03dwbLtqF64YrAEasALJc/3PIQZqzd4wCvQF/oOSpHfWaTao9Rf2V/cg+gTTKmAO ZdDM1KDajznTS0VB2spEK45v+2xp1WvUydJp0m88P9fD2/7k1UqjemF3MDuUt2VR+1Fk0CAv GXE8m/lRBYAO7S31j6t4n+qwOjVkkvTSI8UUbG16PNuqFmS3XAITg0bU0Ohpvu0gVL4XMhQQ 2Qd/DYuqq4jslSmVNDnUzW3pXeFulgXXN84LgEhwFjTkOyOuV/fXzVaCG4aADA7iCMobRg4+ XuFh9jxPiVmvbOTRm/a66ySoRrnbED5MlQ+TSMDSAIE5fzqr4cykg/DQ75fLUKlsjHmMWqum m7X9UDSk51W1JdWjPvjoTgrlhr1/sCRJjPZ8Dk7SY5MAulRQIe+L7Kl5lHAhRqrBNbIFwLR1 JTodiX30QzvMX1vvHHUKAnuNOvwjxpgDNE6qQQ1d3XG327yk0NPhagKvFlDyL5Ba67ogwPBb k7Joh9275ROJnasZqIfS9vvUJR1l/m9T467CaC8gj9yjn5ZLlXvEMZGPxH44owQuBJ0zfFX1 WmzL65A8kr2+Yw4lWHrFo/xIJcgxzwkxHO7eHwI50/P7FZqX1bMEe1tGALXNogRtfrYyC2Io 4c3H5bbkH13DbyhChQ7BKZOdDjm21BgXsuowyGWH8beSjdb9JYJV6WMnOh/ItM9xMy4VI7gp xmAZ6OR83Kn7VWvFOlAQioLhGrHUcktoHQlEzYrOFr0iXEvbZz2tPUUdoctfKlh/+tmlKYmQ /4AcsSGI/JOVjWYpGhNMcij9NRvJEaxmAaDHyu5ezxjLZRucBPEp43/dQz1+ShQUifu7Zkio 6et3x/wSIYYQ1gwF97fbf+ilgvjvXUUlO9ocVHPJ91fJBfl/IRwcnSjhf4rOcAcbx7Ew2LCh QqRBB4Zo8jLopM0r4aV1fzV8d/xHrInTERAHmTd4bKnDgXg/zKukd1aTeKFXTHBT2eoqq+sU vpYkqPnO/odkVcU74clS+R3zbgz7sfErqNBylg2B23CalmmB+8yInSC2sUT5KRByqUA5FmzU 0OLvNJbJa+IKIXuF1tIfFgpaeGK1Pc1nDjO7KtqfBWmtXEvpLfXA19POxSsiTBGKOonOYwo9 u4tpcoK5lHtkREtKNuH0nhZ+mnkwqbsiEn7WkX22LPWtzc= IronPort-HdrOrdr: A9a23:R5wqNKyIjKo/IKHM+wwgKrPwKr1zdoMgy1knxilNoRw8SKOlfq eV7ZMmPH7P+U8ssR4b+OxoVJPsfZqYz+8W3WBzB8bHYOCFgguVxehZhOOIqQEIWReOk9K1vZ 0QFZSWY+efMbEVt6rHCXGDYrUd/OU= X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59766522" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , George Dunlap , "Ian Jackson" , Wei Liu Subject: [XEN PATCH 38/57] tools/xenstrace: rework Makefile Date: Mon, 6 Dec 2021 17:02:21 +0000 Message-ID: <20211206170241.13165-39-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Remove "build" targets. Use "$(TARGETS)" to list binary to be built. Cleanup "clean" rule. Signed-off-by: Anthony PERARD --- tools/xentrace/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 9fb7fc96e7..2b166335dc 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -14,14 +14,13 @@ SBIN = xentrace xentrace_setsize LIBBIN = xenctx SCRIPTS = xentrace_format -.PHONY: all -all: build +TARGETS := $(BIN) $(SBIN) $(LIBBIN) -.PHONY: build -build: $(BIN) $(SBIN) $(LIBBIN) +.PHONY: all +all: $(TARGETS) .PHONY: install -install: build +install: all $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(sbindir) [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) @@ -43,7 +42,7 @@ endif .PHONY: clean clean: - $(RM) *.a *.so *.o *.rpm $(BIN) $(SBIN) $(LIBBIN) $(DEPS_RM) + $(RM) *.o $(TARGETS) $(DEPS_RM) .PHONY: distclean distclean: clean From patchwork Mon Dec 6 17:02:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659051 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3C0B4C433F5 for ; Mon, 6 Dec 2021 17:08:56 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239526.415453 (Exim 4.92) (envelope-from ) id 1muHTr-0005lb-Ek; Mon, 06 Dec 2021 17:08:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239526.415453; Mon, 06 Dec 2021 17:08:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHTq-0005jP-Vz; Mon, 06 Dec 2021 17:08:46 +0000 Received: by outflank-mailman (input) for mailman id 239526; Mon, 06 Dec 2021 17:08:45 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPR-0005ti-UY for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:14 +0000 Received: from esa4.hc3370-68.iphmx.com (esa4.hc3370-68.iphmx.com [216.71.155.144]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 89180612-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:04:12 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 89180612-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810252; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PaRpznZsW3QhyTgpNv/aUOxfOv+4R+mSSEyH1lNtJQI=; b=SBZBSIKGVRDPx6CFF3/ef9ANDdOGrVSmsAXDxOwcfJqUeuEmhGn8CUw7 OeRX0AQgNewZMuWdeGb60ikOoXokholMfVLtznyQnohegyM7yMXNVoQcy RcYYi1epG6Ao+MHISWoY5/1k0EySeDc6A8SKZT79X0bnfFY7m/55PCvDI w=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: d9acAcAOzi3U71V7z8h/8EuIXSErJ2b8x8dW0cCN7EUtusQeiXA6t/bTKIrDD55MOoVxAJN3CF Ml0gjjQWsWFHpRFYv4F3gc+5nBhO+UHulabfemub3AFf1XnVyx1hAJfi4c2fZ+e6Jphwts/tj1 /U1ldUSuYUvKegC9AnW6OCFv3FY4fId5ftFG5tVIJx+qCQqZRkz/vBQoPVBrYD47eVMUaLQMrb 8Irf8fhrnXBPlBu92NkltPNLof+32pcMFhL7VNZZ+FN3LojrWfeaqUaSiPlnDIjLISWxOJf+Ll csJl/p8j/chk4exi5uXC5LrM X-SBRS: 5.1 X-MesageID: 61420800 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:XyWYf658CpoDonqek1zseQxRtMnAchMFZxGqfqrLsTDasY5as4F+v jZOCGHXOqzYZWL0f41wPY/g/EMB65eGxtdjHlRs+H0yHi5G8cbLO4+Ufxz6V8+wwmwvb67FA +E2MISowBUcFyeEzvuV3zyIQUBUjclkfJKlYAL/En03FVAMpBsJ00o5wrdj2tAw27BVPivW0 T/Mi5yHULOa82Yc3lI8s8pvfzs24ZweEBtB1rAPTagjUG32zhH5P7pGTU2FFFPqQ5E8IwKPb 72rIIdVXI/u10xF5tuNyt4Xe6CRK1LYFVDmZnF+A8BOjvXez8CbP2lS2Pc0MC9qZzu1c99Zl IgchaWJaQATGqjnl74aAxhkHgx6IvgTkFPHCSDXXc27ykTHdz3nwul0DVFwNoodkgp1KTgQr 7pCcmlLN03dwbLtqF64YrAEasALJc/3PIQZqzd4wCvQF/oOSpHfWaTao9Rf2V/cg+gQRKqEP 5pBMVKDajzmOxx3GgoeMKlno7i4j3LzSWBZtGia8P9fD2/7k1UqjemF3MDuUsOObdVYmACfv G2u12b2GBYBL/SE1CGItHmrg4fnnDz5cJIfEqWi8fxni0HVwXYcYDUGWF3+rfSnh0qWX9NEN 1dS6icotbI19kGgUp/6RRLQiHeCoh4bXcsWC+Ag4RuB4qXR6gedQGMDS1Z8hMcO7ZFsA2Zwj xnQwo2vVWcHXKCppWy1qurFnQqLGS8vCWopanUDHQo57vTnv9Rm5v7QdepLHKmwh9zzPDj/x TGWsSQz74kuYd43O7aTpg6e3W/1znTdZktsv1iMADr5hu9sTNf9P9TA1LTN0RpXwG91pHGlt WNMpcWR5ftm4XqlxH3UG7Vl8F1ECp+43NzgbbxHQsBJG9eFoSfLkWVsDNdWfh0B3iEsI2CBX aMrkVkNjKK/xVPzBUONX6q/Ct4x0Y/rHsn/W/bfY7JmO8YqJFDdrXw0PxDPjwgBdXTAd4llY /93lu72Uh4n5VlPlmLqF4/xL5d1rszB+Y8jbc+ilEn2uVZvTHWUVa0EIDOzghMRt8u5TPHu2 48HbaOikkwHOMWnO3W/2dNDfDgicClgbbir+pM/SwJ2Clc/cI3XI6SKmu1Jlk0Mt/k9q9okC VnhABIFkwSm2iWcQehIA1g6AI7SsV9EhSpTFUQR0ZyAghDPuK6js/UScYUZZ74i+LAxxPJ4V aBdKc6BHu5OWnLM/DFENcvxq4lrdRKKgwOSPnX6PGhjLsA4HwGZqMX5egbP9TUVCnblv8UJv LD9hBjQRoAORlo+AZ+OOu6v1V64oVMUhPl2AxnTOtBWdUi1qNpqJiX9g+UZOcYJLRmflDKW2 xzPWUUTpPXXop9z+97M3PjWo4CsGup4P0xbA2iEsurmaXiEpjKumNYSXvyJcDbRUHLP1J+jP egFnevhNPAnnUpRt9YuGbhc0q9jtcDkoKVXz1o4ESyTPUirEL5pPlKPwdJL6v9W3rZctAa7B hCP991dNenbMc/pCgdMdg8sb+DF3vAIgDjCq/8yJRyitiNw+bOGV2RUPgWN13MBfOckbtt9z LdzotMS5iy+lgEuY4SPgS1j/miRKmANDvc8vZYADY630gcmxzmuu3AH5vMaNH1XV+hxDw== IronPort-HdrOrdr: A9a23:a2TtT6gOPfXwgsD7MfyFeYmVuXBQXuIji2hC6mlwRA09TySZ// rBoB19726TtN9xYgBZpTnuAsm9qB/nmaKdpLNhWItKPzOW31dATrsSjrcKqgeIc0aVm9K1l5 0QF5SWYOeAdGSS5vya3ODXKbkdKaG8gcKVuds= X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="61420800" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Juergen Gross Subject: [XEN PATCH 39/57] libs: Remove both "libs" and "build" target Date: Mon, 6 Dec 2021 17:02:22 +0000 Message-ID: <20211206170241.13165-40-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 "libs" is odd and has been introduced without a reason by c7d3afbb44. Instead, only use "all". Also remove "build" target as "all" is more appropriate and nothing is using "build" in libs/ in the xen.git repo. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/libs.mk | 12 +++--------- tools/libs/light/Makefile | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index 996d467346..7c5ae26bbd 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -53,13 +53,7 @@ $(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR = $(XEN_INCLUDE) $(PKG_CONFIG_LOCAL): PKG_CONFIG_LIBDIR = $(CURDIR) .PHONY: all -all: build - -.PHONY: build -build: libs libxen$(LIBNAME).map $(LIBHEADERS) - -.PHONY: libs -libs: headers.chk $(LIB) $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL) +all: headers.chk $(LIB) $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL) libxen$(LIBNAME).map $(LIBHEADERS) ifneq ($(NO_HEADERS_CHK),y) headers.chk: @@ -96,14 +90,14 @@ lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxen$(LIBNAME).map # If abi-dumper is available, write out the ABI analysis ifneq ($(ABI_DUMPER),) ifneq ($(nosharedlibs),y) -libs: $(PKG_ABI) +all: $(PKG_ABI) $(PKG_ABI): lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) headers.lst $(ABI_DUMPER) $< -o $@ -public-headers headers.lst -lver $(MAJOR).$(MINOR) endif endif .PHONY: install -install: build +install: all $(INSTALL_DIR) $(DESTDIR)$(libdir) $(INSTALL_DIR) $(DESTDIR)$(includedir) $(INSTALL_SHLIB) lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index fb5a9ca87e..be32d95d39 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -187,7 +187,7 @@ testidl.c: libxl_types.idl gentest.py $(XEN_INCLUDE)/libxl.h $(AUTOINCS) $(PYTHON) gentest.py libxl_types.idl testidl.c.new mv testidl.c.new testidl.c -build: $(CLIENTS) $(TEST_PROGS) $(AUTOSRCS) $(AUTOINCS) +all: $(CLIENTS) $(TEST_PROGS) $(AUTOSRCS) $(AUTOINCS) $(LIB_OBJS) $(PIC_OBJS) $(SAVE_HELPER_OBJS) $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS): $(AUTOINCS) libxl.api-ok From patchwork Mon Dec 6 17:02:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659109 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 74EAAC433EF for ; Mon, 6 Dec 2021 17:09:35 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239545.415572 (Exim 4.92) (envelope-from ) id 1muHUQ-0004YS-FX; Mon, 06 Dec 2021 17:09:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239545.415572; Mon, 06 Dec 2021 17:09:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHUQ-0004Wm-41; Mon, 06 Dec 2021 17:09:22 +0000 Received: by outflank-mailman (input) for mailman id 239545; Mon, 06 Dec 2021 17:09:21 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPV-0005ti-GU for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:17 +0000 Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8a860490-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:04:16 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8a860490-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810256; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tbDeksLVu0GyFKO1SroA0BOmx1FzKwu8uJ22siMq6ic=; b=fhJ5CmriJANP2RvZWfHSrPzvANdZlDR80vvd7jpPV1fTaWIc6dHgUhTx YnbeRlYR+xcVAJnb6bwg9wEA16zsWoNTpRpIQlIiODfGM8tYJpdtsH3gv RsetQyFhejESbwhCTrBCjggX2PZkdy1jnJ2M/1/1WZZf724HTpmB8/b2M s=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: MewBrood5Ax81IjdRTLTa7qtc8aDM2EA+0sCHzqmQ00R/+VsRDA4P8sy46YtZbwp7fBtmpS2BG Mx/oidONc1O2PWmNYeje2PxlEFYTB56ay8U66G9oJ5kgpPE8hmnlqVHatV0R9KqCYk1sovIkqD gUJu9wXKPz9IJxkIcohgNW0q5d0/kIZSY5vdHGmtlixVY1VPNCf6SjuzCyOsigdu8bw+07Czfe KoKlwV+xJZkY7YkfLEJHRyIqK4qFRai3TgTwZyBtDIGtxvZeUi4M6mOfV5gZsn+tW6UtevSCc9 IE/Uqtownkum5PPQAMLYrJbC X-SBRS: 5.1 X-MesageID: 59370702 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:Bi0NfKszY4judmKn2+nOfA0C5ufnVKdZMUV32f8akzHdYApBsoF/q tZmKWnSOfmCYWf9edp+Ot+0phsOsMCBy4VrSVA+/H0wQStA+JbJXdiXEBz9bniYRiHhoOOLz Cm8hv3odp1coqr0/0/1WlTZQP0VOZigHtIQMsadUsxKbVIiGHhJZS5LwbZj29cy2YbhWWthh PupyyHhEA79s9JLGjp8B5Kr8HuDa9yr5Vv0FnRnDRx6lAe2e0s9VfrzFonoR5fMeaFGH/bSe gr25OrRElU1XfsaIojNfr7TKiXmS1NJVOSEoiI+t6OK2nCuqsGuu0qS2TV1hUp/0l20c95NJ Nplr46KYhkEE4TwpLonFEN7Dn1fOoFN9+qSSZS/mZT7I0zudnLtx7NlDV0sPJ1e8eFyaY1M3 aVGcnZXNEnF3r/ohuLgIgVvrp1LwM3DNYUDunZm3HfBAOwvW5zrSKTW/95Imjw3g6iiGN6DN pFGMWU3NnwsZTV/KAooDogQrdu6oVPgQSJclHnLpIo4tj27IAtZj+G2bYu9lsaxbdpRtlaVo CTB5WuRKhMVLtuE0hKe72mhwOTImEvTWZ0QPK218OZwh1+ezXBVDwcZPXOrrP/8hkOgVtZ3L 00P5jFovaU07FasTNT2Q1u/unHslhcaR9pXFfx88AyXw7DYywmcD2kACDVGbbQbWNQeHGJwk AXTxpWwWGIp4Ob9pW+hGqm8tyGIEjY4AEY+WXE+ClEm/oXCp604gUeaJjp8K5KdgtrwEDD25 jmFqikimrke5fI2O7WHEUPv2Gz1+MWQJuIhzkCOBz/+sFslDGKwT9XwsQCz0BpWEGqOorBtV lAgktPW0u0BBIrleMelELRUR+HBCxpo3VThbb9T83sJqm3FF52LJ9k4DNRCyKFBaJxsldjBO hC7hO+pzMUPVEZGlIcuC25LN+wkzLL7CfPuXe3OY9xFb/BZLVHcrH40NBPKhT6ywCDAdJ3T3 7/BK65A6l5AVsxaIMeeHb9BgdfHOAhgrY8seXwL50v+iufPDJJkYbwELEGPfogEAFCs+23oH yJkH5LSkX13CbSmCgGOqNJ7BQ1afBATWMGtw+QKJ7HrH+aTMDx4YxMn6eh6ININcmU8vrqgw 0xRrWcEkgei3iOedl3RAp2hAZu2NatCQbsAFXREFT6VN7ILO+5DNY8TKMk6e6cJ7utmwaImR vUJYZzYUP9OVi7G63IWapyk9N5ucxGihASvOSu5YWdgI848FlKRotK0LBHy8CQuDzassZdsq bOXyQ6GE4EIQB5vDZiKZav3nU+xp3UUhMl7Q1DMfotIYEzp/YUzc37xg/Y7LtsiMxLGwjfGh Q+aDQ1B/bvGopMv8cmPjqeB9t/7H+x7F0tcPm/a8bfpanWKojv9mddNCb/acyrcWWX4/LSZS d9Ul/ysYucamFtqspZnF+o5x6wJ+Nay9aRRyR5pHSuXYg3zWK9gOHSPweJGqrZJmu1CoQKzV 0+CpotaNLGONJ+3GVIdPlN4POGK1PVSkTjO9/UlZk794XYvrraAVExTOTiKiTBcc+QpYN90n 795tZ5E8RG7hzorLs2C33Jd+Gm7J3AdV7kq68MBC4jxhwt3klxPbPQw0MMtDE1jvzmUDnQXH w== IronPort-HdrOrdr: A9a23:fBYhv63/b9S5OQJjkpxtpQqjBLQkLtp133Aq2lEZdPRUGvb2qy nIpoV96faUskdpZJhOo7G90cW7LE80sKQFg7X5Xo3SODUO2lHJEGgK1+KLqFfd8m/Fh4tgPM 9bAs5D4bbLY2SS4/yX3ODBKadC/OW6 X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59370702" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Juergen Gross Subject: [XEN PATCH 40/57] libs: rename LDUSELIBS to LDLIBS and use it instead of APPEND_LDFLAGS Date: Mon, 6 Dec 2021 17:02:23 +0000 Message-ID: <20211206170241.13165-41-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 LDLIBS is more appropriate and intended to be used to add library dependencies. APPEND_LDFLAGS wasn't intended to be changed by the build system. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/libs.mk | 4 ++-- tools/libs/guest/Makefile | 2 +- tools/libs/hypfs/Makefile | 2 +- tools/libs/light/Makefile | 18 +++++++++--------- tools/libs/stat/Makefile | 2 +- tools/libs/store/Makefile | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index 7c5ae26bbd..91d4efeaed 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -15,7 +15,7 @@ CFLAGS += -Werror -Wmissing-prototypes CFLAGS += $(CFLAGS_xeninclude) CFLAGS += $(foreach lib, $(USELIBS_$(LIBNAME)), $(CFLAGS_libxen$(lib))) -LDUSELIBS = $(foreach lib, $(USELIBS_$(LIBNAME)), $(LDLIBS_libxen$(lib))) +LDLIBS += $(foreach lib, $(USELIBS_$(LIBNAME)), $(LDLIBS_libxen$(lib))) LIB_OBJS := $(SRCS-y:.c=.o) PIC_OBJS := $(SRCS-y:.c=.opic) @@ -85,7 +85,7 @@ lib$(LIB_FILE_NAME).so.$(MAJOR): lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) $(SYMLINK_SHLIB) $< $@ lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxen$(LIBNAME).map - $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,lib$(LIB_FILE_NAME).so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDUSELIBS) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,lib$(LIB_FILE_NAME).so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDLIBS) $(APPEND_LDFLAGS) # If abi-dumper is available, write out the ABI analysis ifneq ($(ABI_DUMPER),) diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile index 1f4b7f7c58..636b4ea5cb 100644 --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -102,7 +102,7 @@ NO_HEADERS_CHK := y include $(XEN_ROOT)/tools/libs/libs.mk -libxenguest.so.$(MAJOR).$(MINOR): APPEND_LDFLAGS += $(ZLIB_LIBS) -lz +libxenguest.so.$(MAJOR).$(MINOR): LDLIBS += $(ZLIB_LIBS) -lz -include $(DEPS_INCLUDE) diff --git a/tools/libs/hypfs/Makefile b/tools/libs/hypfs/Makefile index 39feca87e8..efa955bd50 100644 --- a/tools/libs/hypfs/Makefile +++ b/tools/libs/hypfs/Makefile @@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1 MINOR = 0 -APPEND_LDFLAGS += -lz +LDLIBS += -lz SRCS-y += core.c diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index be32d95d39..622fa04470 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -166,14 +166,14 @@ NO_HEADERS_CHK := y include $(XEN_ROOT)/tools/libs/libs.mk -LDUSELIBS-y += $(PTYFUNCS_LIBS) -LDUSELIBS-$(CONFIG_LIBNL) += $(LIBNL3_LIBS) -LDUSELIBS-$(CONFIG_Linux) += -luuid -LDUSELIBS-$(CONFIG_Linux) += -lrt -LDUSELIBS-$(CONFIG_ARM) += -lfdt -LDUSELIBS-y += $(PTHREAD_LIBS) -LDUSELIBS-y += -lyajl -LDUSELIBS += $(LDUSELIBS-y) +LDLIBS-y += $(PTYFUNCS_LIBS) +LDLIBS-$(CONFIG_LIBNL) += $(LIBNL3_LIBS) +LDLIBS-$(CONFIG_Linux) += -luuid +LDLIBS-$(CONFIG_Linux) += -lrt +LDLIBS-$(CONFIG_ARM) += -lfdt +LDLIBS-y += $(PTHREAD_LIBS) +LDLIBS-y += -lyajl +LDLIBS += $(LDLIBS-y) $(LIB_OBJS) $(PIC_OBJS) $(LIBXL_TEST_OBJS): CFLAGS += $(CFLAGS_LIBXL) -include $(XEN_ROOT)/tools/config.h $(ACPI_OBJS) $(ACPI_PIC_OBJS): CFLAGS += -I. -DLIBACPI_STDUTILS=\"$(CURDIR)/libxl_x86_acpi.h\" @@ -232,7 +232,7 @@ $(XEN_INCLUDE)/_%.h: _%.h $(call move-if-changed,_$*.h,$(XEN_INCLUDE)/_$*.h) libxenlight_test.so: $(PIC_OBJS) $(LIBXL_TEST_OBJS) - $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LDUSELIBS) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LDLIBS) $(APPEND_LDFLAGS) test_%: test_%.o test_common.o libxenlight_test.so $(CC) $(LDFLAGS) -o $@ $^ $(filter-out %libxenlight.so, $(LDLIBS_libxenlight)) $(LDLIBS_libxentoollog) $(LDLIBS_libxentoolcore) -lyajl $(APPEND_LDFLAGS) diff --git a/tools/libs/stat/Makefile b/tools/libs/stat/Makefile index 01417b5334..c8c81048c0 100644 --- a/tools/libs/stat/Makefile +++ b/tools/libs/stat/Makefile @@ -26,7 +26,7 @@ SRCS-$(CONFIG_FreeBSD) += xenstat_freebsd.c LDLIBS-y += -lyajl LDLIBS-$(CONFIG_SunOS) += -lkstat -APPEND_LDFLAGS += $(LDLIBS-y) +LDLIBS += $(LDLIBS-y) include $(XEN_ROOT)/tools/libs/libs.mk diff --git a/tools/libs/store/Makefile b/tools/libs/store/Makefile index c208dbb48a..457122a041 100644 --- a/tools/libs/store/Makefile +++ b/tools/libs/store/Makefile @@ -5,7 +5,7 @@ MAJOR = 4 MINOR = 0 ifeq ($(CONFIG_Linux),y) -APPEND_LDFLAGS += -ldl +LDLIBS += -ldl endif SRCS-y += xs_lib.c From patchwork Mon Dec 6 17:02:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 197DEC433FE for ; Mon, 6 Dec 2021 17:08:19 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239506.415313 (Exim 4.92) (envelope-from ) id 1muHTH-0007dp-QY; Mon, 06 Dec 2021 17:08:11 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239506.415313; Mon, 06 Dec 2021 17:08:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHTH-0007dA-Lh; Mon, 06 Dec 2021 17:08:11 +0000 Received: by outflank-mailman (input) for mailman id 239506; Mon, 06 Dec 2021 17:08:10 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPX-0005ti-7H for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:19 +0000 Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8b818dc7-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:04:18 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8b818dc7-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810257; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ytpv1GJ97QFgCSDKhxDlCpFXGIfYKNw5dkuyhzF8ZW0=; b=cB/FqGgNcRy3UFOOj1Di8R3FwJjzEUhS4FRLJwFf8pBmETMvmJC4KlsD cDBCDc2bbAqEIypGzI4+OATxOO2Hp2KgZ99uueF73PUGMQE7C7S+LuptL iBLlQcujT5BRLQtGjhUtALdmbI5vyxkhi8m7BgyLuxLOk09/GEm2LQIc5 4=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: 2a7bXfnfX/hJI9VilSP3+m6XrAQHGhSghUBZDAmP73tecoD3mRLo4lwx/Ien1avZWKkk22q8RF tlUfJxOEtQwShxLmVFwRsqQ45NA0/U8QMTsE8HH02kv4U8hSo4kE2kjnUYM3jodzsUhKT0DpBy Srm3kNMQm1oFrE59ZVJHZ/h/SHscdZ4/+gpAyrAAi/IoKUuNmlDuC3M808BbuaQsUpUpiOpikn pKolnkVXPfUD+EgAsp2keHtkKBQiHXfoyG1t2/sKIOqmVub/HSh1LWYFJVRuiS1ACoi5OKssFD bNhxCCtvOBAtQHbI/Z5pLAoY X-SBRS: 5.1 X-MesageID: 59387971 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:UuFQTK7yYcnk/Gh1Pia83wxRtMnAchMFZxGqfqrLsTDasY5as4F+v mYfWGuPbq2KNjCkKo0iPdi19UMB6JLXzNZmSwBkqHs1Hi5G8cbLO4+Ufxz6V8+wwmwvb67FA +E2MISowBUcFyeEzvuV3zyIQUBUjclkfJKlYAL/En03FVAMpBsJ00o5wrdj2tAw27BVPivW0 T/Mi5yHULOa82Yc3lI8s8pvfzs24ZweEBtB1rAPTagjUG32zhH5P7pGTU2FFFPqQ5E8IwKPb 72rIIdVXI/u10xF5tuNyt4Xe6CRK1LYFVDmZnF+A8BOjvXez8CbP2lS2Pc0MC9qZzu1c99Zm dhshY2WWxkSZfOSnt9HeglFUBNTIvgTkFPHCSDXXc27ykTHdz3nwul0DVFwNoodkgp1KTgQr 7pCcmlLN03dwbLtqF64YrAEasALJc/3PIQZqzd4wCvQF/oOSpHfWaTao9Rf2V/cg+gTTK2OO JtGMFKDajzuWj5xNEY2EKsZo6Dyp1/jQSFmrlea8P9fD2/7k1UqjemF3MDuUsOObdVYmACfv G2u12b2GBYBL/SE1CGItHmrg4fnnDz5cJIfEqWi8fxni0HVwXYcYDUGWF3+rfSnh0qWX9NEN 1dS6icotbI19kGgUp/6RRLQiHeCoh4bXcsWC+Ag4RuB4qXR6gedQGMDS1Z8hMcO7ZFsA2Zwj xnQwo2vVWcHXKCppWy1p7q1nSKUKzYudjFcYxReZBsYoOvOv9Rm5v7QdepLHKmwh9zzPDj/x TGWsSQz74kuYd43O7aTpg6e3W/1znTdZktsv1iMADr5hu9sTNf9P9TA1LTN0RpXwG91pHGlt WNMpcWR5ftm4XqlxH3UG7Vl8F1ECp+43NzgbbxHQsBJG9eFoSfLkWVsDNdWfh0B3iEsI2CBX aMrkVkNjKK/xVPzBUONX6q/Ct4x0Y/rHsn/W/bfY7JmO8YqJFDdrXw0PxDPjwgBdXTAd4llY /93lu72Uh4n5VlPlmLqF4/xL5d1rszB+Y8jbc+ilEn2uVZvTHWUVa0EIDOzghMRt8u5TPHu2 48HbaOikkwHOMWnO3W/2dNDfDgicClgbbir+pM/SwJ2Clc/cI3XI6SKmu1Jlk0Mt/k9q9okC VnhABIFkwSm2iWcQehIA1g6AI7SsV9EhSpTFUQR0ZyAgRDPuK6js/UScYUZZ74i+LAxxPJ4V aBdKc6BHu5OWnLM/DFENcvxq4lrdRKKgwOSPnX6PGhjLsA4HwGZqMX5egbP9TUVCnblv8UJv LD9hBjQRoAORlo+AZ+OOu6v1V64oVMUhPl2AxnTOtBWdUi1qNpqJiX9g+UZOcYJLRmflDKW2 xzPWUUTpPXXop9z+97M3PjWo4CsGup4P0xbA2iEsurmaXiEpjKumNYSXvyJcDbRUHLP1J+jP egFnevhNPAnnUpRt9YuGbhc0q9jtcDkoKVXz1o4ESyTPUirEL5pPlKPwdJL6v9W3rZctAa7B hCP991dNenbMc/pCgdMdg8sb+DF3vAIgDjCq/8yJRyitiNw+bOGV2RUPgWN13MBfOckbtt9z LdzotMS5iy+lgEuY4SPgS1j/miRKmANDvc8vZYADY630gcmxzmuu3AH5vMaNH1XV+hxDw== IronPort-HdrOrdr: A9a23:JdkTsawH3TvmnH+QEREMKrPwKr1zdoMgy1knxilNoRw8SKOlfq eV7ZMmPH7P+U8ssR4b+OxoVJPsfZqYz+8W3WBzB8bHYOCFgguVxehZhOOIqQEIWReOk9K1vZ 0QFZSWY+efMbEVt6rHCXGDYrUd/OU= X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59387971" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Juergen Gross Subject: [XEN PATCH 41/57] libs: Remove need for *installlocal targets Date: Mon, 6 Dec 2021 17:02:24 +0000 Message-ID: <20211206170241.13165-42-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 There is no need for an extra "installlocal" target, we can use double-colon rules instead. "install-headers" in "libs/store" was introduced for the same reason that "installlocal" exist, so it is replaced as well. Signed-off-by: Anthony PERARD --- tools/libs/libs.mk | 4 ++-- tools/libs/light/Makefile | 10 ++-------- tools/libs/store/Makefile | 10 ++-------- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index 91d4efeaed..7f2c676be4 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -97,7 +97,7 @@ endif endif .PHONY: install -install: all +install:: all $(INSTALL_DIR) $(DESTDIR)$(libdir) $(INSTALL_DIR) $(DESTDIR)$(includedir) $(INSTALL_SHLIB) lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) @@ -108,7 +108,7 @@ install: all $(INSTALL_DATA) $(PKG_CONFIG) $(DESTDIR)$(PKG_INSTALLDIR) .PHONY: uninstall -uninstall: +uninstall:: rm -f $(DESTDIR)$(PKG_INSTALLDIR)/$(LIB_FILE_NAME).pc for i in $(LIBHEADER); do rm -f $(DESTDIR)$(includedir)/$$i; done rm -f $(DESTDIR)$(libdir)/lib$(LIB_FILE_NAME).so diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index 622fa04470..5e52db9b30 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -243,17 +243,11 @@ libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so testidl: testidl.o libxenlight.so $(CC) $(LDFLAGS) -o $@ testidl.o $(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) $(LDLIBS_libxentoolcore) $(APPEND_LDFLAGS) -install: installlocal $(LIBHEADERS) - -.PHONY: installlocal -installlocal: libxl-save-helper +install:: $(LIBHEADERS) libxl-save-helper $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(LIBEXEC_BIN) -uninstall: uninstalllocal - -.PHONY: uninstalllocal -uninstalllocal: +uninstall:: rm -f $(DESTDIR)$(LIBEXEC_BIN)/libxl-save-helper clean: cleanlocal diff --git a/tools/libs/store/Makefile b/tools/libs/store/Makefile index 457122a041..1bacee6cf1 100644 --- a/tools/libs/store/Makefile +++ b/tools/libs/store/Makefile @@ -32,10 +32,7 @@ endif -include $(DEPS_INCLUDE) .PHONY: install -install: install-headers - -.PHONY: install-headers -install-headers: +install:: $(INSTALL_DIR) $(DESTDIR)$(includedir) $(INSTALL_DIR) $(DESTDIR)$(includedir)/xenstore-compat $(INSTALL_DATA) $(XEN_INCLUDE)/xenstore-compat/xs.h $(DESTDIR)$(includedir)/xenstore-compat/xs.h @@ -44,10 +41,7 @@ install-headers: ln -sf xenstore-compat/xs_lib.h $(DESTDIR)$(includedir)/xs_lib.h .PHONY: uninstall -uninstall: uninstall-headers - -.PHONY: uninstall-headers -uninstall-headers: +uninstall:: rm -f $(DESTDIR)$(includedir)/xs_lib.h rm -f $(DESTDIR)$(includedir)/xs.h rm -f $(DESTDIR)$(includedir)/xenstore-compat/xs_lib.h From patchwork Mon Dec 6 17:02:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659041 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 15915C433EF for ; Mon, 6 Dec 2021 17:08:45 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239519.415405 (Exim 4.92) (envelope-from ) id 1muHTf-0003HP-Jd; Mon, 06 Dec 2021 17:08:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239519.415405; Mon, 06 Dec 2021 17:08:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHTf-0003G4-4q; Mon, 06 Dec 2021 17:08:35 +0000 Received: by outflank-mailman (input) for mailman id 239519; Mon, 06 Dec 2021 17:08:33 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPY-0005ti-9l for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:20 +0000 Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8cc123d2-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:04:19 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8cc123d2-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810259; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=EhMsevpH10Vo5lsrbd8HMBQJe8BAiJGveppQnUZtweM=; b=UNPc3qf38AS57BFuoVBeIesUcO+Zzxks1p7BRXLgdFPVYgYrbvXo/YFN OWypbqTe7GEIEKsPIN063ZM0Ex1tblutWOD0rBQ97lwWpz4p4GvV0oHmi kmCmwdyqg6HQl6vHbM8aUcFdcf5eV2SoY6NeKuozks2Mj2zDmTNRJrovv 8=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: 7gHSWxTipzDruyc8beHxu7ykn5ZO6eho71NfjYqJhR0Qa/VqvEOx22soiCv84a1Lzp4qzcGyOJ RAas3Csww+eNvMMFRJ0OFmJzaJ2XBIJg56HZ98wieLzFzc7Rvox93g0jcX624oISXrzPis8Cel OsNkyCf3Avkvo4qi4IDuHzOu7vNp8dk3nkvfjPtDcAnkDatqjKmiTYZZvkk2cfrVJiZVhmj/DG tLIz+SecDJdjvEgEw94UVtG17zHBRfQS8xSGaL3+k8tF2nl6Bw7+39cp3VsvO3UQCIT/+W1sTB XgCSUaFMUNB4GlFWTPvnSsun X-SBRS: 5.1 X-MesageID: 59370712 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:sEBDdqDtauODgxVW/9jkw5YqxClBgxIJ4kV8jS/XYbTApGwi1DcAz zdOCD/XOayLZjf0e4h/Ot+xoEtTvMPWz9cxQQY4rX1jcSlH+JHPbTi7wuYcHM8wwunrFh8PA xA2M4GYRCwMo/u1Si6FatANl1ElvU2zbue6WLGs1hxZH1c+EX570Uw7wYbVv6Yz6TSHK1LV0 T/Ni5W31G+Ng1aY5UpNtspvADs21BjDkGtwUm4WPJinj3eH/5UhN7oNJLnZEpfNatI88thW5 Qr05OrREmvxp3/BAz4++1rxWhVirrX6ZWBihpfKMkQLb9crSiEai84G2PQghUh/k2XQnvF/0 vZxmJWBZzUoZZ2RpckdTEwNe81+FfUuFL7vJHG+tYqYzlHccmuqyPJrZK00FdRGoKAtWzgIr KFGbmBWBvyAr7veLLaTQ+9whsMlPY/zMZkWoH1IxjDFF/c2B5vERs0m4PcFjWxv3p8XR54yY eI6MiVySy7LfidRYH0MVNUPmOqNmT7wJmgwRFW9+vNsvjm7IBZK+KfpGMrYfJqNX8o9tkSXv GXd5EziHwoXcteYzFKt822urv/CmzvhX4AfH6H+8eRl6HWDy2pWBBAIWF+TpfiillX4S99ZM 1YT+Cclse417kPDZtD7Qx2/pm/CphMGUsBcO+I/4QCJjKHT5m6k6nMsF2AbLoZ87YlvGGJsh gThc87V6SJHqO3MSFOT7JSogDqDFxoUdl9fWAIEUl5QizX8m70bghXKR9dlNae6iNzpBD39q wy3QDgCa6Y71pBSifjilbzTq3f1/8WSEFZpjunCdjv9tlsRWWKzW2C/BbE3B95kJZ3RcFSOt WNsdyO2vLFXVsHleMBgrYww8FCVCxStbWS0bb1HRcBJG9GRF5iLJ9o4DNZWfhgBDyr8UWW1C HI/QCsIjHOpAFOkbLVsf6W6ANkwwK7rGLzND66PPoUUM8UrLlHYrEmCgHJ8OUi3yiDAdollZ v+mnTuEVy5GWcyLMhLoLwvi7VPb7n9nnj6CLXwK5x+mzaCfdBaopUQtazOzghQCxPrc+m39q o8HX+PTkkk3eLCuM0H/rN9IRXhXfCdTOHwDg5EOHgJ1ClE9Qz9J5j646e5JRrGJaIwJzLqVp S/kBRcDoLc97FWeQTi3hrlYQOuHdf5CQbgTZkTA5H6khCouZ5iB9qAae8dldLUr7rU7n/V1U +MEa4OLBfEWEmbL/DEUbJ/cqo1+dUv02VLSbnT9ODVvLYR9QwHp+8P/ele9/ic5ESfq59A1p Ket112HTMNbFRhiFsvfdNmm00i14SoGgOt3UkaReotTdUzg/ZJEMSv0ivNrccgAJQ+anmmR1 hqMAAderu7I+tdn/N7MjKGCjoGoD+ohQRYKQziFte67bHCI8HCizIlMVPezUQrcDG6kqr+/Y eh1zu3nNKFVllh9rIchQa1gyrgz5oWzquYCnBhkBnjCc3+iFqhkfiudxcBKu6BAmu1ZtA+xV h7d89VWI+zUasbsEVpXLws5dOWTk/oTn2CKv/gyJUz74g5x/aaGDhoOb0Xd1nQFIesnKp4hz McgpNUSul62hRcdO9qbijxZqjaXJXsaXqR77pwXDecHUObwJo2utXAENhLL3Q== IronPort-HdrOrdr: A9a23:+KPxQa5VGOIhYMCVpwPXwMLXdLJyesId70hD6qhwISY7TiX+rb HKoB17726StN9/YhAdcLy7VZVoIkmsl6Kdg7NwAV7KZmCP0wGVxelZnO/fKlbbdREWmNQw6U 4ZSdkcNOHN X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59370712" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Juergen Gross Subject: [XEN PATCH 42/57] libs,tools/include: Clean "clean" targets Date: Mon, 6 Dec 2021 17:02:25 +0000 Message-ID: <20211206170241.13165-43-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 There is no need for an extra "cleanlocal" target, we can use double-colon rules instead. Generated headers are now in tools/include/, so remove those file there. Remove -f flag as it's already in $(RM). libs.mk: - don't try to remove "*.rpm" anymore. libs/light: - "_paths.*.tmp" isn't created anymore. - clean "libxenlight_test.so" and "libxl_test_*.opic". libs/util: - fix clean of version-script file. include/xen-foreign: - remove __pycache__ Signed-off-by: Anthony PERARD --- tools/libs/libs.mk | 4 ++-- tools/include/Makefile | 1 + tools/include/xen-foreign/Makefile | 1 + tools/libs/ctrl/Makefile | 5 +---- tools/libs/guest/Makefile | 3 +-- tools/libs/light/Makefile | 19 ++++++++----------- tools/libs/stat/Makefile | 5 +---- tools/libs/util/Makefile | 7 ++----- tools/libs/vchan/Makefile | 5 +---- 9 files changed, 18 insertions(+), 32 deletions(-) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index 7f2c676be4..3078e45cf4 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -121,8 +121,8 @@ TAGS: etags -t *.c *.h .PHONY: clean -clean: - rm -rf *.rpm $(LIB) *~ $(DEPS_RM) $(LIB_OBJS) $(PIC_OBJS) +clean:: + rm -rf $(LIB) *~ $(DEPS_RM) $(LIB_OBJS) $(PIC_OBJS) rm -f lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) lib$(LIB_FILE_NAME).so.$(MAJOR) rm -f headers.chk headers.lst rm -f $(PKG_CONFIG) diff --git a/tools/include/Makefile b/tools/include/Makefile index 42605d46b9..a9c11d06c8 100644 --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -80,6 +80,7 @@ uninstall: clean: rm -rf xen xen-xsm acpi $(MAKE) -C xen-foreign clean + rm -f _*.h .PHONY: dist dist: install diff --git a/tools/include/xen-foreign/Makefile b/tools/include/xen-foreign/Makefile index 6ce51daf5e..b538d0ea94 100644 --- a/tools/include/xen-foreign/Makefile +++ b/tools/include/xen-foreign/Makefile @@ -13,6 +13,7 @@ clean: rm -f $(headers) rm -f checker checker.c rm -f *.pyc *.o *~ + rm -rf __pycache__ distclean: clean diff --git a/tools/libs/ctrl/Makefile b/tools/libs/ctrl/Makefile index 5d866b8d04..a46e30a168 100644 --- a/tools/libs/ctrl/Makefile +++ b/tools/libs/ctrl/Makefile @@ -56,8 +56,5 @@ include $(XEN_ROOT)/tools/libs/libs.mk -include $(DEPS_INCLUDE) -clean: cleanlocal - -.PHONY: cleanlocal -cleanlocal: +clean:: rm -f libxenctrl.map diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile index 636b4ea5cb..67837c4e73 100644 --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -106,6 +106,5 @@ libxenguest.so.$(MAJOR).$(MINOR): LDLIBS += $(ZLIB_LIBS) -lz -include $(DEPS_INCLUDE) -.PHONY: cleanlocal -cleanlocal: +clean:: rm -f libxenguest.map diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index 5e52db9b30..719630eda2 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -250,17 +250,14 @@ install:: $(LIBHEADERS) libxl-save-helper uninstall:: rm -f $(DESTDIR)$(LIBEXEC_BIN)/libxl-save-helper -clean: cleanlocal - -.PHONY: cleanlocal -cleanlocal: - $(RM) -f _*.h *.o $(CLIENTS) - $(RM) -f _*.c *.pyc _paths.*.tmp _*.api-for-check - $(RM) -f testidl.c.new testidl.c *.api-ok - $(RM) -f $(TEST_PROGS) - $(RM) -rf __pycache__ - $(RM) -f libxenlight.map - $(RM) -f $(AUTOSRCS) $(AUTOINCS) +clean:: + $(RM) _*.h *.o $(CLIENTS) + $(RM) _*.c *.pyc _*.api-for-check + $(RM) testidl.c.new testidl.c *.api-ok + $(RM) $(TEST_PROGS) libxenlight_test.so libxl_test_*.opic + $(RM) -r __pycache__ + $(RM) libxenlight.map + $(RM) $(AUTOSRCS) $(AUTOINCS) $(MAKE) -C $(ACPI_PATH) ACPI_BUILD_DIR=$(CURDIR) clean -include $(DEPS_INCLUDE) diff --git a/tools/libs/stat/Makefile b/tools/libs/stat/Makefile index c8c81048c0..24b5949b3e 100644 --- a/tools/libs/stat/Makefile +++ b/tools/libs/stat/Makefile @@ -115,10 +115,7 @@ install: install-perl-bindings uninstall: uninstall-perl-bindings endif -clean: cleanlocal - -.PHONY: cleanlocal -cleanlocal: +clean:: rm -f $(BINDINGS) $(BINDINGSRC) $(DEPS_RM) rm -f libxenstat.map diff --git a/tools/libs/util/Makefile b/tools/libs/util/Makefile index 87425d862a..4e41bc9ff0 100644 --- a/tools/libs/util/Makefile +++ b/tools/libs/util/Makefile @@ -51,8 +51,5 @@ $(LIB_OBJS) $(PIC_OBJS): $(AUTOINCS) -include $(DEPS_INCLUDE) -clean: cleanlocal - -.PHONY: cleanlocal -cleanlocal: - $(RM) -f libxlutil.map +clean:: + $(RM) libxenutil.map diff --git a/tools/libs/vchan/Makefile b/tools/libs/vchan/Makefile index df112f1b88..f6f1002800 100644 --- a/tools/libs/vchan/Makefile +++ b/tools/libs/vchan/Makefile @@ -13,8 +13,5 @@ NO_HEADERS_CHK := y include $(XEN_ROOT)/tools/libs/libs.mk -include $(DEPS_INCLUDE) -clean: cleanlocal - -.PHONY: cleanlocal -cleanlocal: +clean:: rm -f libxenvchan.map From patchwork Mon Dec 6 17:02:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659065 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5FD94C433EF for ; Mon, 6 Dec 2021 17:09:12 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239537.415523 (Exim 4.92) (envelope-from ) id 1muHU6-0000VK-CH; Mon, 06 Dec 2021 17:09:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239537.415523; Mon, 06 Dec 2021 17:09:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHU4-0000Oh-PZ; Mon, 06 Dec 2021 17:09:00 +0000 Received: by outflank-mailman (input) for mailman id 239537; Mon, 06 Dec 2021 17:08:58 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPc-0005ti-Jz for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:24 +0000 Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8e39d86a-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:04:21 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8e39d86a-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810261; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UGaD29iaA2ETS2WyEXEUNDVMklxMoCd2TNwszrikX0M=; b=OemMnwp1XKxMfbYBnccu6e7sGn/blqX2zwZfzlAUuUMEU7OKlLDaJscH 1fWtck4T1lwRalNQ6/nM9GBH92e3dsm2Zvfd0kU1sV+0XNmkwSGX+6YEF aVZV8b6F8l06SmCWspMrGLyusZv9QUdNcAa7mIRCT09nX8X2z7ADXktDj Q=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: zUwf+n7CQ3+PAcuKXy6ZFit//IErd1iSeRqdiE+IIIY1Owjf6TF/2NlcBC29unDhhQXpli8v4B 0Wvi4FBS5i6qG3suHbI0qHlbR1OvTSRkIF+RsKdznUrhK7ZIz5cbp05dP/OFo6ZMjUPBcN9bUG Y4GHgaEVTQvE1EZJ2iUtdiahB3Dby2krDqDAZ5EshNP52Vp5pCI0s+AcsT3MFYVUyxsz7Xhw8V F/d15HvCSVHyHFzSEiiGWhoUBWiiFsbQLzrnNz5UzEujtLhGCscOs/vFWDxSYZvADhzIBamAD2 Kv2sdeKpmn3aZbP2jVAAXb41 X-SBRS: 5.1 X-MesageID: 59387986 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:9p0T+aCHjOnzcBVW/9jkw5YqxClBgxIJ4kV8jS/XYbTApDwkhTcFz 2cbXWmDafuNa2qhKt8iaYrn8klQ6Jfczd83QQY4rX1jcSlH+JHPbTi7wuYcHM8wwunrFh8PA xA2M4GYRCwMo/u1Si6FatANl1ElvU2zbue6WLGs1hxZH1c+EX570Uw7wYbVv6Yz6TSHK1LV0 T/Ni5W31G+Ng1aY5UpNtspvADs21BjDkGtwUm4WPJinj3eH/5UhN7oNJLnZEpfNatI88thW5 Qr05OrREmvxp3/BAz4++1rxWhVirrX6ZWBihpfKMkQLb9crSiEai84G2PQghUh/sjGYropym O5xhY3zTRYNLrPynt9BakwNe81+FfUuFL7vJHG+tYqYzlHccmuqyPJrZK00FdRGoKAtWzgIr KFGbmBWBvyAr7veLLaTQ+9whsMlPY/zMZkWoH1IxjDFF/c2B5vERs0m4PcFjWxg2ZEeQ54yY eIQYj9tdi3vQidTI1s6I8MMx9z5nUfGJmgwRFW9+vNsvjm7IBZK+KfpGMrYfJqNX8o9tkSXv GXd5EziHwoXcteYzFKt822urv/CmzvhX4AfH6H+8eRl6HWDy2pWBBAIWF+TpfiillX4S99ZM 1YT+Cclse417kPDZtD7Qx2/pm/CphMGUsBcO+I/4QCJjKHT5m6k6nMsF2AbLoZ87YlvGGJsh gThc87V6SJHibmEeCiepoyonSLxPTkxPXE8YxRYdF5QizX8m70bghXKR9dlNae6iNzpBD39q wy3QDgCa6Y71pBSifjilbzTq3f1/8WSEFZpjunCdjv9tlsRWWKzW2C/BbE3B95kJZ3RcFSOt WNsdyO2vLFXVsHleMBgrYww8FCVCxStbWS0bb1HRcBJG9GRF5iLJ9o4DNZWfhgBDyr8UWW1C HI/QCsIjHOpAFOkbLVsf6W6ANkwwK7rGLzND66PPoUUM8UrLlHYrEmCgHJ8OUi3yiDAdollZ v+mnTuEVy5GWcyLMhLoLwvi7VPb7n9nnj6CLXwK5x+mzaCfdBaopUQtazOzghQCxPrc+m39q o8HX+PTkkk3eLCuM0H/rN9IRXhXfCdTOHwDg5EOHgJ1ClE9Qz9J5j646e5JRrGJaIwJzLqVp S/kBRcDoLc97FWeQTi3hrlYQOuHdf5CQbgTZkTA5H6khCouZ5iB9qAae8dldLUr7rU7n/V1U +MEa4OLBfEWEmbL/DEUbJ/cqo1+dUv02VLSbnT9ODVvLYR9QwHp+8P/ele9/ic5ESfq59A1p Ket112HTMNbFRhiFsvfdNmm00i14SoGgOt3UkaReotTdUzg/ZJEMSv0ivNrccgAJQ+anmmR1 hqMAAderu7I+tdn/N7MjKGCjoGoD+ohQRYKQziFte67bHCI8HCizIlMVPezUQrcDG6kqr+/Y eh1zu3nNKFVllh9rIchQa1gyrgz5oWzquYCnBhkBnjCc3+iFqhkfiudxcBKu6BAmu1ZtA+xV h7d89VWI+zUasbsEVpXLws5dOWTk/oTn2CKv/gyJUz74g5x/aaGDhoOb0Xd1nQFIesnKp4hz McgpNUSul62hRcdO9qbijxZqjaXJXsaXqR77pwXDecHUObwJo2utXAENhLL3Q== IronPort-HdrOrdr: A9a23:KNUab6k/Bgqx5Pj2V1hRF6rtONLpDfIq3DAbv31ZSRFFG/Fxl6 iV88jzsiWE7wr5OUtQ4OxoV5PgfZqxz/NICMwqTNWftWrdyQ+VxeNZjbcKqgeIc0aVygce79 YET0EXMqyXMbEQt6jHCWeDf+rIuOP3k5yVuQ== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59387986" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Juergen Gross Subject: [XEN PATCH 43/57] libs: Rename $(SRCS-y) to $(OBJS-y) Date: Mon, 6 Dec 2021 17:02:26 +0000 Message-ID: <20211206170241.13165-44-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 The only thing done thing done with $(SRCS-y) is to replace ".c" by ".o". It is more useful to collect which object we want to build as make will figure out how to build it and from which source file. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/libs.mk | 7 +- tools/libs/call/Makefile | 12 +-- tools/libs/ctrl/Makefile | 74 +++++++------- tools/libs/devicemodel/Makefile | 12 +-- tools/libs/evtchn/Makefile | 12 +-- tools/libs/foreignmemory/Makefile | 12 +-- tools/libs/gnttab/Makefile | 14 +-- tools/libs/guest/Makefile | 86 ++++++++-------- tools/libs/hypfs/Makefile | 2 +- tools/libs/light/Makefile | 162 +++++++++++++++--------------- tools/libs/stat/Makefile | 12 +-- tools/libs/store/Makefile | 4 +- tools/libs/toolcore/Makefile | 4 +- tools/libs/toollog/Makefile | 4 +- tools/libs/util/Makefile | 16 +-- tools/libs/vchan/Makefile | 4 +- 16 files changed, 218 insertions(+), 219 deletions(-) diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index 3078e45cf4..d3b056e799 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -17,8 +17,7 @@ CFLAGS += $(foreach lib, $(USELIBS_$(LIBNAME)), $(CFLAGS_libxen$(lib))) LDLIBS += $(foreach lib, $(USELIBS_$(LIBNAME)), $(LDLIBS_libxen$(lib))) -LIB_OBJS := $(SRCS-y:.c=.o) -PIC_OBJS := $(SRCS-y:.c=.opic) +PIC_OBJS := $(OBJS-y:.o=.opic) LIB_FILE_NAME = $(FILENAME_$(LIBNAME)) LIB := lib$(LIB_FILE_NAME).a @@ -76,7 +75,7 @@ headers.lst: FORCE libxen$(LIBNAME).map: echo 'VERS_$(MAJOR).$(MINOR) { global: *; };' >$@ -lib$(LIB_FILE_NAME).a: $(LIB_OBJS) +lib$(LIB_FILE_NAME).a: $(OBJS-y) $(AR) rc $@ $^ lib$(LIB_FILE_NAME).so: lib$(LIB_FILE_NAME).so.$(MAJOR) @@ -122,7 +121,7 @@ TAGS: .PHONY: clean clean:: - rm -rf $(LIB) *~ $(DEPS_RM) $(LIB_OBJS) $(PIC_OBJS) + rm -rf $(LIB) *~ $(DEPS_RM) $(OBJS-y) $(PIC_OBJS) rm -f lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) lib$(LIB_FILE_NAME).so.$(MAJOR) rm -f headers.chk headers.lst rm -f $(PKG_CONFIG) diff --git a/tools/libs/call/Makefile b/tools/libs/call/Makefile index 93d404b79e..e5cb7c937c 100644 --- a/tools/libs/call/Makefile +++ b/tools/libs/call/Makefile @@ -4,11 +4,11 @@ include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1 MINOR = 3 -SRCS-y += core.c buffer.c -SRCS-$(CONFIG_Linux) += linux.c -SRCS-$(CONFIG_FreeBSD) += freebsd.c -SRCS-$(CONFIG_SunOS) += solaris.c -SRCS-$(CONFIG_NetBSD) += netbsd.c -SRCS-$(CONFIG_MiniOS) += minios.c +OBJS-y += core.o buffer.o +OBJS-$(CONFIG_Linux) += linux.o +OBJS-$(CONFIG_FreeBSD) += freebsd.o +OBJS-$(CONFIG_SunOS) += solaris.o +OBJS-$(CONFIG_NetBSD) += netbsd.o +OBJS-$(CONFIG_MiniOS) += minios.o include $(XEN_ROOT)/tools/libs/libs.mk diff --git a/tools/libs/ctrl/Makefile b/tools/libs/ctrl/Makefile index a46e30a168..df145ba8ec 100644 --- a/tools/libs/ctrl/Makefile +++ b/tools/libs/ctrl/Makefile @@ -1,43 +1,43 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk -SRCS-y += xc_altp2m.c -SRCS-y += xc_cpupool.c -SRCS-y += xc_domain.c -SRCS-y += xc_evtchn.c -SRCS-y += xc_gnttab.c -SRCS-y += xc_misc.c -SRCS-y += xc_flask.c -SRCS-y += xc_physdev.c -SRCS-y += xc_private.c -SRCS-y += xc_csched.c -SRCS-y += xc_csched2.c -SRCS-y += xc_arinc653.c -SRCS-y += xc_rt.c -SRCS-y += xc_tbuf.c -SRCS-y += xc_pm.c -SRCS-y += xc_cpu_hotplug.c -SRCS-y += xc_vm_event.c -SRCS-y += xc_vmtrace.c -SRCS-y += xc_monitor.c -SRCS-y += xc_mem_paging.c -SRCS-y += xc_mem_access.c -SRCS-y += xc_memshr.c -SRCS-y += xc_hcall_buf.c -SRCS-y += xc_foreign_memory.c -SRCS-y += xc_kexec.c -SRCS-y += xc_resource.c -SRCS-$(CONFIG_X86) += xc_psr.c -SRCS-$(CONFIG_X86) += xc_pagetab.c -SRCS-$(CONFIG_Linux) += xc_linux.c -SRCS-$(CONFIG_FreeBSD) += xc_freebsd.c -SRCS-$(CONFIG_SunOS) += xc_solaris.c -SRCS-$(CONFIG_NetBSD) += xc_netbsd.c -SRCS-$(CONFIG_NetBSDRump) += xc_netbsd.c -SRCS-$(CONFIG_MiniOS) += xc_minios.c -SRCS-y += xc_evtchn_compat.c -SRCS-y += xc_gnttab_compat.c -SRCS-y += xc_devicemodel_compat.c +OBJS-y += xc_altp2m.o +OBJS-y += xc_cpupool.o +OBJS-y += xc_domain.o +OBJS-y += xc_evtchn.o +OBJS-y += xc_gnttab.o +OBJS-y += xc_misc.o +OBJS-y += xc_flask.o +OBJS-y += xc_physdev.o +OBJS-y += xc_private.o +OBJS-y += xc_csched.o +OBJS-y += xc_csched2.o +OBJS-y += xc_arinc653.o +OBJS-y += xc_rt.o +OBJS-y += xc_tbuf.o +OBJS-y += xc_pm.o +OBJS-y += xc_cpu_hotplug.o +OBJS-y += xc_vm_event.o +OBJS-y += xc_vmtrace.o +OBJS-y += xc_monitor.o +OBJS-y += xc_mem_paging.o +OBJS-y += xc_mem_access.o +OBJS-y += xc_memshr.o +OBJS-y += xc_hcall_buf.o +OBJS-y += xc_foreign_memory.o +OBJS-y += xc_kexec.o +OBJS-y += xc_resource.o +OBJS-$(CONFIG_X86) += xc_psr.o +OBJS-$(CONFIG_X86) += xc_pagetab.o +OBJS-$(CONFIG_Linux) += xc_linux.o +OBJS-$(CONFIG_FreeBSD) += xc_freebsd.o +OBJS-$(CONFIG_SunOS) += xc_solaris.o +OBJS-$(CONFIG_NetBSD) += xc_netbsd.o +OBJS-$(CONFIG_NetBSDRump) += xc_netbsd.o +OBJS-$(CONFIG_MiniOS) += xc_minios.o +OBJS-y += xc_evtchn_compat.o +OBJS-y += xc_gnttab_compat.o +OBJS-y += xc_devicemodel_compat.o CFLAGS += -D__XEN_TOOLS__ CFLAGS += $(PTHREAD_CFLAGS) diff --git a/tools/libs/devicemodel/Makefile b/tools/libs/devicemodel/Makefile index 3e50ff6d90..a0a2d24f99 100644 --- a/tools/libs/devicemodel/Makefile +++ b/tools/libs/devicemodel/Makefile @@ -4,11 +4,11 @@ include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1 MINOR = 4 -SRCS-y += core.c -SRCS-$(CONFIG_Linux) += common.c -SRCS-$(CONFIG_FreeBSD) += common.c -SRCS-$(CONFIG_SunOS) += compat.c -SRCS-$(CONFIG_NetBSD) += compat.c -SRCS-$(CONFIG_MiniOS) += compat.c +OBJS-y += core.o +OBJS-$(CONFIG_Linux) += common.o +OBJS-$(CONFIG_FreeBSD) += common.o +OBJS-$(CONFIG_SunOS) += compat.o +OBJS-$(CONFIG_NetBSD) += compat.o +OBJS-$(CONFIG_MiniOS) += compat.o include $(XEN_ROOT)/tools/libs/libs.mk diff --git a/tools/libs/evtchn/Makefile b/tools/libs/evtchn/Makefile index b8c37b5b97..8208ecf650 100644 --- a/tools/libs/evtchn/Makefile +++ b/tools/libs/evtchn/Makefile @@ -4,11 +4,11 @@ include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1 MINOR = 2 -SRCS-y += core.c -SRCS-$(CONFIG_Linux) += linux.c -SRCS-$(CONFIG_FreeBSD) += freebsd.c -SRCS-$(CONFIG_SunOS) += solaris.c -SRCS-$(CONFIG_NetBSD) += netbsd.c -SRCS-$(CONFIG_MiniOS) += minios.c +OBJS-y += core.o +OBJS-$(CONFIG_Linux) += linux.o +OBJS-$(CONFIG_FreeBSD) += freebsd.o +OBJS-$(CONFIG_SunOS) += solaris.o +OBJS-$(CONFIG_NetBSD) += netbsd.o +OBJS-$(CONFIG_MiniOS) += minios.o include $(XEN_ROOT)/tools/libs/libs.mk diff --git a/tools/libs/foreignmemory/Makefile b/tools/libs/foreignmemory/Makefile index 0eb9a3a712..4427435932 100644 --- a/tools/libs/foreignmemory/Makefile +++ b/tools/libs/foreignmemory/Makefile @@ -4,11 +4,11 @@ include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1 MINOR = 4 -SRCS-y += core.c -SRCS-$(CONFIG_Linux) += linux.c -SRCS-$(CONFIG_FreeBSD) += freebsd.c -SRCS-$(CONFIG_SunOS) += compat.c solaris.c -SRCS-$(CONFIG_NetBSD) += netbsd.c -SRCS-$(CONFIG_MiniOS) += minios.c +OBJS-y += core.o +OBJS-$(CONFIG_Linux) += linux.o +OBJS-$(CONFIG_FreeBSD) += freebsd.o +OBJS-$(CONFIG_SunOS) += compat.o solaris.o +OBJS-$(CONFIG_NetBSD) += netbsd.o +OBJS-$(CONFIG_MiniOS) += minios.o include $(XEN_ROOT)/tools/libs/libs.mk diff --git a/tools/libs/gnttab/Makefile b/tools/libs/gnttab/Makefile index ae390ce60f..7d7aeeadff 100644 --- a/tools/libs/gnttab/Makefile +++ b/tools/libs/gnttab/Makefile @@ -4,13 +4,13 @@ include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1 MINOR = 2 -SRCS-GNTTAB += gnttab_core.c -SRCS-GNTSHR += gntshr_core.c +OBJS-GNTTAB += gnttab_core.o +OBJS-GNTSHR += gntshr_core.o -SRCS-$(CONFIG_Linux) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) linux.c -SRCS-$(CONFIG_MiniOS) += $(SRCS-GNTTAB) gntshr_unimp.c minios.c -SRCS-$(CONFIG_FreeBSD) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) freebsd.c -SRCS-$(CONFIG_NetBSD) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) netbsd.c -SRCS-$(CONFIG_SunOS) += gnttab_unimp.c gntshr_unimp.c +OBJS-$(CONFIG_Linux) += $(OBJS-GNTTAB) $(OBJS-GNTSHR) linux.o +OBJS-$(CONFIG_MiniOS) += $(OBJS-GNTTAB) gntshr_unimp.o minios.o +OBJS-$(CONFIG_FreeBSD) += $(OBJS-GNTTAB) $(OBJS-GNTSHR) freebsd.o +OBJS-$(CONFIG_NetBSD) += $(OBJS-GNTTAB) $(OBJS-GNTSHR) netbsd.o +OBJS-$(CONFIG_SunOS) += gnttab_unimp.o gntshr_unimp.o include $(XEN_ROOT)/tools/libs/libs.mk diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile index 67837c4e73..455e23c432 100644 --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -6,69 +6,69 @@ ifeq ($(CONFIG_LIBXC_MINIOS),y) override CONFIG_MIGRATE := n endif -SRCS-y += xg_private.c -SRCS-y += xg_domain.c -SRCS-y += xg_suspend.c -SRCS-y += xg_resume.c +OBJS-y += xg_private.o +OBJS-y += xg_domain.o +OBJS-y += xg_suspend.o +OBJS-y += xg_resume.o ifeq ($(CONFIG_MIGRATE),y) -SRCS-y += xg_sr_common.c -SRCS-$(CONFIG_X86) += xg_sr_common_x86.c -SRCS-$(CONFIG_X86) += xg_sr_common_x86_pv.c -SRCS-$(CONFIG_X86) += xg_sr_restore_x86_pv.c -SRCS-$(CONFIG_X86) += xg_sr_restore_x86_hvm.c -SRCS-$(CONFIG_X86) += xg_sr_save_x86_pv.c -SRCS-$(CONFIG_X86) += xg_sr_save_x86_hvm.c -SRCS-y += xg_sr_restore.c -SRCS-y += xg_sr_save.c -SRCS-y += xg_offline_page.c +OBJS-y += xg_sr_common.o +OBJS-$(CONFIG_X86) += xg_sr_common_x86.o +OBJS-$(CONFIG_X86) += xg_sr_common_x86_pv.o +OBJS-$(CONFIG_X86) += xg_sr_restore_x86_pv.o +OBJS-$(CONFIG_X86) += xg_sr_restore_x86_hvm.o +OBJS-$(CONFIG_X86) += xg_sr_save_x86_pv.o +OBJS-$(CONFIG_X86) += xg_sr_save_x86_hvm.o +OBJS-y += xg_sr_restore.o +OBJS-y += xg_sr_save.o +OBJS-y += xg_offline_page.o else -SRCS-y += xg_nomigrate.c +OBJS-y += xg_nomigrate.o endif -SRCS-y += xg_core.c -SRCS-$(CONFIG_X86) += xg_core_x86.c -SRCS-$(CONFIG_ARM) += xg_core_arm.c +OBJS-y += xg_core.o +OBJS-$(CONFIG_X86) += xg_core_x86.o +OBJS-$(CONFIG_ARM) += xg_core_arm.o CFLAGS += -I$(XEN_libxenctrl) vpath %.c ../../../xen/common/libelf CFLAGS += -I../../../xen/common/libelf -ELF_SRCS-y += libelf-tools.c libelf-loader.c -ELF_SRCS-y += libelf-dominfo.c +ELF_OBJS-y += libelf-tools.o libelf-loader.o +ELF_OBJS-y += libelf-dominfo.o -SRCS-y += $(ELF_SRCS-y) +OBJS-y += $(ELF_OBJS-y) -$(patsubst %.c,%.o,$(ELF_SRCS-y)): CFLAGS += -Wno-pointer-sign -$(patsubst %.c,%.opic,$(ELF_SRCS-y)): CFLAGS += -Wno-pointer-sign +$(ELF_OBJS-y): CFLAGS += -Wno-pointer-sign +$(ELF_OBJS-y:.o=.opic): CFLAGS += -Wno-pointer-sign ifeq ($(CONFIG_X86),y) # Add libx86 to the build vpath %.c ../../../xen/lib/x86 -SRCS-y += cpuid.c msr.c policy.c +OBJS-y += cpuid.o msr.o policy.o endif # new domain builder -SRCS-y += xg_dom_core.c -SRCS-y += xg_dom_boot.c -SRCS-y += xg_dom_elfloader.c -SRCS-$(CONFIG_X86) += xg_dom_bzimageloader.c -SRCS-$(CONFIG_X86) += xg_dom_decompress_lz4.c -SRCS-$(CONFIG_X86) += xg_dom_hvmloader.c -SRCS-$(CONFIG_ARM) += xg_dom_armzimageloader.c -SRCS-y += xg_dom_binloader.c -SRCS-y += xg_dom_compat_linux.c - -SRCS-$(CONFIG_X86) += xg_dom_x86.c -SRCS-$(CONFIG_X86) += xg_cpuid_x86.c -SRCS-$(CONFIG_ARM) += xg_dom_arm.c +OBJS-y += xg_dom_core.o +OBJS-y += xg_dom_boot.o +OBJS-y += xg_dom_elfloader.o +OBJS-$(CONFIG_X86) += xg_dom_bzimageloader.o +OBJS-$(CONFIG_X86) += xg_dom_decompress_lz4.o +OBJS-$(CONFIG_X86) += xg_dom_hvmloader.o +OBJS-$(CONFIG_ARM) += xg_dom_armzimageloader.o +OBJS-y += xg_dom_binloader.o +OBJS-y += xg_dom_compat_linux.o + +OBJS-$(CONFIG_X86) += xg_dom_x86.o +OBJS-$(CONFIG_X86) += xg_cpuid_x86.o +OBJS-$(CONFIG_ARM) += xg_dom_arm.o ifeq ($(CONFIG_LIBXC_MINIOS),y) -SRCS-y += xg_dom_decompress_unsafe.c -SRCS-y += xg_dom_decompress_unsafe_bzip2.c -SRCS-y += xg_dom_decompress_unsafe_lzma.c -SRCS-y += xg_dom_decompress_unsafe_lzo1x.c -SRCS-y += xg_dom_decompress_unsafe_xz.c -SRCS-y += xg_dom_decompress_unsafe_zstd.c +OBJS-y += xg_dom_decompress_unsafe.o +OBJS-y += xg_dom_decompress_unsafe_bzip2.o +OBJS-y += xg_dom_decompress_unsafe_lzma.o +OBJS-y += xg_dom_decompress_unsafe_lzo1x.o +OBJS-y += xg_dom_decompress_unsafe_xz.o +OBJS-y += xg_dom_decompress_unsafe_zstd.o endif CFLAGS += -Werror -Wmissing-prototypes diff --git a/tools/libs/hypfs/Makefile b/tools/libs/hypfs/Makefile index efa955bd50..630e1e6f3e 100644 --- a/tools/libs/hypfs/Makefile +++ b/tools/libs/hypfs/Makefile @@ -6,6 +6,6 @@ MINOR = 0 LDLIBS += -lz -SRCS-y += core.c +OBJS-y += core.o include ../libs.mk diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index 719630eda2..d3ae2f6179 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -1,31 +1,31 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk -SRCS-y += osdeps.c -SRCS-y += libxl_paths.c -SRCS-y += libxl_bootloader.c -SRCS-y += flexarray.c +OBJS-y += osdeps.o +OBJS-y += libxl_paths.o +OBJS-y += libxl_bootloader.o +OBJS-y += flexarray.o ifeq ($(CONFIG_LIBNL),y) -SRCS-y += libxl_netbuffer.c +OBJS-y += libxl_netbuffer.o else -SRCS-y += libxl_nonetbuffer.c +OBJS-y += libxl_nonetbuffer.o endif ifeq ($(CONFIG_X86),y) -SRCS-y += libxl_convert_callout.c +OBJS-y += libxl_convert_callout.o else -SRCS-y += libxl_no_convert_callout.c +OBJS-y += libxl_no_convert_callout.o endif -SRCS-y += libxl_remus.c -SRCS-y += libxl_checkpoint_device.c -SRCS-y += libxl_remus_disk_drbd.c +OBJS-y += libxl_remus.o +OBJS-y += libxl_checkpoint_device.o +OBJS-y += libxl_remus_disk_drbd.o ifeq ($(CONFIG_LIBNL),y) -SRCS-y += libxl_colo_restore.c -SRCS-y += libxl_colo_save.c -SRCS-y += libxl_colo_qdisk.c -SRCS-y += libxl_colo_proxy.c -SRCS-y += libxl_colo_nic.c +OBJS-y += libxl_colo_restore.o +OBJS-y += libxl_colo_save.o +OBJS-y += libxl_colo_qdisk.o +OBJS-y += libxl_colo_proxy.o +OBJS-y += libxl_colo_nic.o else -SRCS-y += libxl_no_colo.c +OBJS-y += libxl_no_colo.o endif ACPI_PATH = $(XEN_ROOT)/tools/libacpi @@ -40,82 +40,82 @@ vpath static_tables.c $(ACPI_PATH)/ acpi: $(MAKE) -C $(ACPI_PATH) ACPI_BUILD_DIR=$(CURDIR) DSDT_FILES="$(DSDT_FILES-y)" -SRCS-$(CONFIG_X86) += $(ACPI_OBJS:.o=.c) +OBJS-$(CONFIG_X86) += $(ACPI_OBJS) CFLAGS += -Wno-format-zero-length -Wmissing-declarations \ -Wno-declaration-after-statement -Wformat-nonliteral CFLAGS-$(CONFIG_X86) += -DCONFIG_PCI_SUPP_LEGACY_IRQ -SRCS-$(CONFIG_X86) += libxl_cpuid.c -SRCS-$(CONFIG_X86) += libxl_x86.c -SRCS-$(CONFIG_X86) += libxl_psr.c -SRCS-$(CONFIG_X86) += libxl_x86_acpi.c -SRCS-$(CONFIG_ARM) += libxl_nocpuid.c -SRCS-$(CONFIG_ARM) += libxl_arm.c -SRCS-$(CONFIG_ARM) += libxl_libfdt_compat.c +OBJS-$(CONFIG_X86) += libxl_cpuid.o +OBJS-$(CONFIG_X86) += libxl_x86.o +OBJS-$(CONFIG_X86) += libxl_psr.o +OBJS-$(CONFIG_X86) += libxl_x86_acpi.o +OBJS-$(CONFIG_ARM) += libxl_nocpuid.o +OBJS-$(CONFIG_ARM) += libxl_arm.o +OBJS-$(CONFIG_ARM) += libxl_libfdt_compat.o ifeq ($(CONFIG_ARM_64),y) DSDT_FILES-y = dsdt_anycpu_arm.c -SRCS-y += libxl_arm_acpi.c -SRCS-y += $(DSDT_FILES-y) +OBJS-y += libxl_arm_acpi.o +OBJS-y += $(DSDT_FILES-y:.c=.o) dsdt_anycpu_arm.c: $(MAKE) -C $(ACPI_PATH) ACPI_BUILD_DIR=$(CURDIR) DSDT_FILES="$(DSDT_FILES-y)" else -SRCS-$(CONFIG_ARM) += libxl_arm_no_acpi.c +OBJS-$(CONFIG_ARM) += libxl_arm_no_acpi.o endif -SRCS-OS-$(CONFIG_NetBSD) = libxl_netbsd.c -SRCS-OS-$(CONFIG_Linux) = libxl_linux.c libxl_setresuid.c -SRCS-OS-$(CONFIG_FreeBSD) = libxl_freebsd.c libxl_setresuid.c -ifeq ($(SRCS-OS-y),) +OBJS-OS-$(CONFIG_NetBSD) = libxl_netbsd.o +OBJS-OS-$(CONFIG_Linux) = libxl_linux.o libxl_setresuid.o +OBJS-OS-$(CONFIG_FreeBSD) = libxl_freebsd.o libxl_setresuid.o +ifeq ($(OBJS-OS-y),) $(error Your Operating System is not supported by libxenlight, \ please check libxl_linux.c and libxl_netbsd.c to see how to get it ported) endif -SRCS-y += $(SRCS-OS-y) - -SRCS-y += libxl.c -SRCS-y += libxl_create.c -SRCS-y += libxl_dm.c -SRCS-y += libxl_pci.c -SRCS-y += libxl_dom.c -SRCS-y += libxl_exec.c -SRCS-y += libxl_xshelp.c -SRCS-y += libxl_device.c -SRCS-y += libxl_internal.c -SRCS-y += libxl_utils.c -SRCS-y += libxl_uuid.c -SRCS-y += libxl_json.c -SRCS-y += libxl_aoutils.c -SRCS-y += libxl_numa.c -SRCS-y += libxl_vnuma.c -SRCS-y += libxl_stream_read.c -SRCS-y += libxl_stream_write.c -SRCS-y += libxl_save_callout.c -SRCS-y += _libxl_save_msgs_callout.c -SRCS-y += libxl_qmp.c -SRCS-y += libxl_event.c -SRCS-y += libxl_fork.c -SRCS-y += libxl_dom_suspend.c -SRCS-y += libxl_dom_save.c -SRCS-y += libxl_usb.c -SRCS-y += libxl_vtpm.c -SRCS-y += libxl_nic.c -SRCS-y += libxl_disk.c -SRCS-y += libxl_console.c -SRCS-y += libxl_cpupool.c -SRCS-y += libxl_mem.c -SRCS-y += libxl_sched.c -SRCS-y += libxl_tmem.c -SRCS-y += libxl_9pfs.c -SRCS-y += libxl_domain.c -SRCS-y += libxl_vdispl.c -SRCS-y += libxl_pvcalls.c -SRCS-y += libxl_vsnd.c -SRCS-y += libxl_vkb.c -SRCS-y += libxl_genid.c -SRCS-y += _libxl_types.c -SRCS-y += libxl_flask.c -SRCS-y += _libxl_types_internal.c +OBJS-y += $(OBJS-OS-y) + +OBJS-y += libxl.o +OBJS-y += libxl_create.o +OBJS-y += libxl_dm.o +OBJS-y += libxl_pci.o +OBJS-y += libxl_dom.o +OBJS-y += libxl_exec.o +OBJS-y += libxl_xshelp.o +OBJS-y += libxl_device.o +OBJS-y += libxl_internal.o +OBJS-y += libxl_utils.o +OBJS-y += libxl_uuid.o +OBJS-y += libxl_json.o +OBJS-y += libxl_aoutils.o +OBJS-y += libxl_numa.o +OBJS-y += libxl_vnuma.o +OBJS-y += libxl_stream_read.o +OBJS-y += libxl_stream_write.o +OBJS-y += libxl_save_callout.o +OBJS-y += _libxl_save_msgs_callout.o +OBJS-y += libxl_qmp.o +OBJS-y += libxl_event.o +OBJS-y += libxl_fork.o +OBJS-y += libxl_dom_suspend.o +OBJS-y += libxl_dom_save.o +OBJS-y += libxl_usb.o +OBJS-y += libxl_vtpm.o +OBJS-y += libxl_nic.o +OBJS-y += libxl_disk.o +OBJS-y += libxl_console.o +OBJS-y += libxl_cpupool.o +OBJS-y += libxl_mem.o +OBJS-y += libxl_sched.o +OBJS-y += libxl_tmem.o +OBJS-y += libxl_9pfs.o +OBJS-y += libxl_domain.o +OBJS-y += libxl_vdispl.o +OBJS-y += libxl_pvcalls.o +OBJS-y += libxl_vsnd.o +OBJS-y += libxl_vkb.o +OBJS-y += libxl_genid.o +OBJS-y += _libxl_types.o +OBJS-y += libxl_flask.o +OBJS-y += _libxl_types_internal.o ifeq ($(CONFIG_LIBNL),y) CFLAGS_LIBXL += $(LIBNL3_CFLAGS) @@ -175,7 +175,7 @@ LDLIBS-y += $(PTHREAD_LIBS) LDLIBS-y += -lyajl LDLIBS += $(LDLIBS-y) -$(LIB_OBJS) $(PIC_OBJS) $(LIBXL_TEST_OBJS): CFLAGS += $(CFLAGS_LIBXL) -include $(XEN_ROOT)/tools/config.h +$(OBJS-y) $(PIC_OBJS) $(LIBXL_TEST_OBJS): CFLAGS += $(CFLAGS_LIBXL) -include $(XEN_ROOT)/tools/config.h $(ACPI_OBJS) $(ACPI_PIC_OBJS): CFLAGS += -I. -DLIBACPI_STDUTILS=\"$(CURDIR)/libxl_x86_acpi.h\" $(TEST_PROG_OBJS) _libxl.api-for-check: CFLAGS += $(CFLAGS_libxentoollog) $(CFLAGS_libxentoolcore) libxl_dom.o libxl_dom.opic: CFLAGS += -I$(XEN_ROOT)/tools # include libacpi/x86.h @@ -189,7 +189,7 @@ testidl.c: libxl_types.idl gentest.py $(XEN_INCLUDE)/libxl.h $(AUTOINCS) all: $(CLIENTS) $(TEST_PROGS) $(AUTOSRCS) $(AUTOINCS) -$(LIB_OBJS) $(PIC_OBJS) $(SAVE_HELPER_OBJS) $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS): $(AUTOINCS) libxl.api-ok +$(OBJS-y) $(PIC_OBJS) $(SAVE_HELPER_OBJS) $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS): $(AUTOINCS) libxl.api-ok libxl.api-ok: check-libxl-api-rules _libxl.api-for-check $(PERL) $^ @@ -216,8 +216,8 @@ $(XEN_INCLUDE)/libxl_json.h: $(XEN_INCLUDE)/_libxl_types_json.h libxl_internal.h: _libxl_types_internal.h _libxl_types_private.h _libxl_types_internal_private.h libxl_internal_json.h: _libxl_types_internal_json.h -$(LIB_OBJS) $(PIC_OBJS) $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS) $(SAVE_HELPER_OBJS): $(XEN_INCLUDE)/libxl.h -$(LIB_OBJS) $(PIC_OBJS) $(LIBXL_TEST_OBJS): libxl_internal.h +$(OBJS-y) $(PIC_OBJS) $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS) $(SAVE_HELPER_OBJS): $(XEN_INCLUDE)/libxl.h +$(OBJS-y) $(PIC_OBJS) $(LIBXL_TEST_OBJS): libxl_internal.h _libxl_type%.h _libxl_type%_json.h _libxl_type%_private.h _libxl_type%.c: libxl_type%.idl gentypes.py idl.py $(eval stem = $(notdir $*)) diff --git a/tools/libs/stat/Makefile b/tools/libs/stat/Makefile index 24b5949b3e..e39fe29bd1 100644 --- a/tools/libs/stat/Makefile +++ b/tools/libs/stat/Makefile @@ -17,12 +17,12 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -include $(XEN_ROOT)/tools/config.h -SRCS-y += xenstat.c -SRCS-y += xenstat_qmp.c -SRCS-$(CONFIG_Linux) += xenstat_linux.c -SRCS-$(CONFIG_SunOS) += xenstat_solaris.c -SRCS-$(CONFIG_NetBSD) += xenstat_netbsd.c -SRCS-$(CONFIG_FreeBSD) += xenstat_freebsd.c +OBJS-y += xenstat.o +OBJS-y += xenstat_qmp.o +OBJS-$(CONFIG_Linux) += xenstat_linux.o +OBJS-$(CONFIG_SunOS) += xenstat_solaris.o +OBJS-$(CONFIG_NetBSD) += xenstat_netbsd.o +OBJS-$(CONFIG_FreeBSD) += xenstat_freebsd.o LDLIBS-y += -lyajl LDLIBS-$(CONFIG_SunOS) += -lkstat diff --git a/tools/libs/store/Makefile b/tools/libs/store/Makefile index 1bacee6cf1..6cc9baaabe 100644 --- a/tools/libs/store/Makefile +++ b/tools/libs/store/Makefile @@ -8,8 +8,8 @@ ifeq ($(CONFIG_Linux),y) LDLIBS += -ldl endif -SRCS-y += xs_lib.c -SRCS-y += xs.c +OBJS-y += xs_lib.o +OBJS-y += xs.o LIBHEADER = xenstore.h xenstore_lib.h diff --git a/tools/libs/toolcore/Makefile b/tools/libs/toolcore/Makefile index 3550786491..632048c899 100644 --- a/tools/libs/toolcore/Makefile +++ b/tools/libs/toolcore/Makefile @@ -7,13 +7,13 @@ AUTOINCS := $(XEN_INCLUDE)/_xentoolcore_list.h LIBHEADER := xentoolcore.h xentoolcore_internal.h -SRCS-y += handlereg.c +OBJS-y += handlereg.o include $(XEN_ROOT)/tools/libs/libs.mk PKG_CONFIG_DESC := Central support for Xen Hypervisor userland libraries -$(LIB_OBJS): $(AUTOINCS) +$(OBJS-y): $(AUTOINCS) $(PIC_OBJS): $(AUTOINCS) $(XEN_INCLUDE)/_xentoolcore_list.h: $(XEN_INCLUDE)/xen-external/bsd-sys-queue-h-seddery $(XEN_INCLUDE)/xen-external/bsd-sys-queue.h diff --git a/tools/libs/toollog/Makefile b/tools/libs/toollog/Makefile index dce1b2de85..c09aa02ba5 100644 --- a/tools/libs/toollog/Makefile +++ b/tools/libs/toollog/Makefile @@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1 MINOR = 0 -SRCS-y += xtl_core.c -SRCS-y += xtl_logger_stdio.c +OBJS-y += xtl_core.o +OBJS-y += xtl_logger_stdio.o include $(XEN_ROOT)/tools/libs/libs.mk diff --git a/tools/libs/util/Makefile b/tools/libs/util/Makefile index 4e41bc9ff0..17b95f7c71 100644 --- a/tools/libs/util/Makefile +++ b/tools/libs/util/Makefile @@ -1,13 +1,13 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk -SRCS-y += libxlu_cfg_y.c -SRCS-y += libxlu_cfg_l.c -SRCS-y += libxlu_cfg.c -SRCS-y += libxlu_disk_l.c -SRCS-y += libxlu_disk.c -SRCS-y += libxlu_vif.c -SRCS-y += libxlu_pci.c +OBJS-y += libxlu_cfg_y.o +OBJS-y += libxlu_cfg_l.o +OBJS-y += libxlu_cfg.o +OBJS-y += libxlu_disk_l.o +OBJS-y += libxlu_disk.o +OBJS-y += libxlu_vif.o +OBJS-y += libxlu_pci.o CFLAGS += -Wno-format-zero-length -Wmissing-declarations \ -Wno-declaration-after-statement -Wformat-nonliteral @@ -39,7 +39,7 @@ NO_HEADERS_CHK := y include $(XEN_ROOT)/tools/libs/libs.mk -$(LIB_OBJS) $(PIC_OBJS): $(AUTOINCS) +$(OBJS-y) $(PIC_OBJS): $(AUTOINCS) %.c %.h:: %.y @rm -f $*.[ch] diff --git a/tools/libs/vchan/Makefile b/tools/libs/vchan/Makefile index f6f1002800..a41f3623c8 100644 --- a/tools/libs/vchan/Makefile +++ b/tools/libs/vchan/Makefile @@ -5,8 +5,8 @@ CFLAGS += $(CFLAGS_libxenctrl) LIBHEADER := libxenvchan.h -SRCS-y += init.c -SRCS-y += io.c +OBJS-y += init.o +OBJS-y += io.o NO_HEADERS_CHK := y From patchwork Mon Dec 6 17:02:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659053 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B7E38C4332F for ; Mon, 6 Dec 2021 17:08:57 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239527.415462 (Exim 4.92) (envelope-from ) id 1muHTt-0006Ar-Di; Mon, 06 Dec 2021 17:08:49 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239527.415462; Mon, 06 Dec 2021 17:08:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHTs-00066N-NH; Mon, 06 Dec 2021 17:08:48 +0000 Received: by outflank-mailman (input) for mailman id 239527; Mon, 06 Dec 2021 17:08:45 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPd-0005ti-K4 for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:25 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8ed2b36a-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:04:23 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8ed2b36a-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810263; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qNEiXbZNcqKEkFNMg9wHhNcWDaVP6Y/xsY+VPfn4eh0=; b=GhF2qD+8Bf3DZeX7Fo++ffP8NDxi67gOBZMIGpELxd8F66sVFV2XQZfk vbNnPiO7TE8QkjJHH5qTifrJOmd5iCkRPlzLSAv9I7YGBGsAsVlIexGHR Th4RPHQZl9Yin8+S1bpgSJHtEO9DMGjqW33g9/fxv7t8OiJtjgRd8PD8X w=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: xExfwYnABfsPqQDlHb1Z8/1Yp7pRi/cEttHbvh0dQB9S5rwHUP3z7fp3ALFsXLaNtPULBZbg0Z hq9mJ48m0GrgpNVJ2yS8RL1l1D8HQgKRoZZlb0ziquFuJ15/a0UR58QTibn97kTKEc5lxDmGoE D+KRi7Gd7HDjo+CF3omn2LRMdGoYnh7T+mxEwUG5Fe1XmYx8hqnRrFzwRTyZPX6pN3bkrK3Py/ zsedEiZGoF2b52iA4F2lVTZXUA884I+4OeVfCti0VaARKt8HJMOSHE3x+/XKQs5RuIuA0x3ViA thGk8uLp6u8jyckhK56W2kAK X-SBRS: 5.1 X-MesageID: 58884486 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:H1Omlauxkx4sAWI2IXbWlfpzqufnVKdZMUV32f8akzHdYApBsoF/q tZmKWjVaa2LNjD1KNxwOdjjoUsC6pGBmtRhHFFp+yFjRi8S+JbJXdiXEBz9bniYRiHhoOOLz Cm8hv3odp1coqr0/0/1WlTZQP0VOZigHtIQMsadUsxKbVIiGHhJZS5LwbZj29cy2YbhWWthh PupyyHhEA79s9JLGjp8B5Kr8HuDa9yr5Vv0FnRnDRx6lAe2e0s9VfrzFonoR5fMeaFGH/bSe gr25OrRElU1XfsaIojNfr7TKiXmS1NJVOSEoiI+t6OK2nCuqsGuu0qS2TV1hUp/0l20c95NJ NplnJ29TwcOBrT1kulBYyZUDCZvOPZ+weqSSZS/mZT7I0zudnLtx7NlDV0sPJ1e8eFyaY1M3 aVGcnZXNEnF3r/ohuLgIgVvrp1LwM3DNYUDunZm3HfBAOwvW5zrSKTW/95Imjw3g6iiGN6DN 5pJNWY/MnwsZTUSE2wRL4oQsNyhuUL2UHpXhFKemqs4tj27IAtZj+G2bYu9lsaxbdpRtlaVo CTB5WuRKhMVLtuE0hKe72mhwOTImEvTWZ0QPK218OZwh1+ezXBVDwcZPXOrrP/8hkOgVtZ3L 00P5jFovaU07FasTNT2Q1u/unHslhcaR9pXFfx88AyXw7DYywmcD2kACDVGbbQbWNQeHGJwk AXTxpWwWGIp4Ob9pW+hGqm8hDK/PygyFXY7byJYfTQJ/N7ypdoLt0eaJjp8K5KdgtrwEDD25 jmFqikimrke5fI2O7WHEUPv2Gz1+MWQJuIhzkCOBz/+sFslDGKwT9XwsQCz0BpWEGqOorBtV lAgktPW0u0BBIrleMelELRUR+HBCxpo3VThbb9T83sJqm3FF52LJ9k4DNRCyKFBaJxsldjBO hC7hO+pzMUPVEZGlIcuC25LN+wkzLL7CfPuXe3OY9xFb/BZLVHcrH40NBPKhT6ywCDAdJ3T3 7/BK65A6l5AVsxaIMeeHb9BgdfHOAhgrY8seXwL50v+iufPDJJkYbwELEGPfogEAFCs+23oH yJkH5LSkX13CbSmCgGOqNJ7BQ1afBATWMGtw+QKJ7HrH+aTMDx4YxMn6eh6ININcmU8vrqgw 0xRrWcEkgei3iOedl3RAp2hAZu2NatCQbsAFXREFT6VN7ILOO5DNY8TKMk6e6cJ7utmwaImR vUJYZzYUP9OVi7G63IWapyk9N5ucxGihASvOSu5YWdgI848FlKRotK0LBHy8CQuDzassZdsq bOXyQ6GE4EIQB5vDZiKZav3nU+xp3UUhMl7Q1DMfotIYEzp/YUzc37xg/Y7LtsiMxLGwjfGh Q+aDQ1B/bvGopMv8cmPjqeB9t/7H+x7F0tcPm/a8bfpanWKojv9mddNCb/acyrcWWX4/LSZS d9Ul/ysYucamFtqspZnF+o5x6wJ+Nay9aRRyR5pHSuXYg3zWK9gOHSPweJGqrZJmu1CoQKzV 0+CpotaNLGONJ+3GVIdPlN4POGK1PVSkTjO9/UlZk794XYvrraAVExTOTiKiTBcc+QpYN90n 795tZ5E8RG7hzorLs2C33Jd+Gm7J3AdV7kq68MBC4jxhwt3klxPbPQw0MMtDE1jvzmUDnQXH w== IronPort-HdrOrdr: A9a23:V+oIT669Pq5m5c90UwPXwM7XdLJyesId70hD6qhwISY7TiX+rb HIoB17726MtN9/YhAdcLy7VZVoBEmsl6KdgrNhWYtKPjOHhILAFugLhuHfKn/bakjDH4ZmpM FdmsNFZuEYY2IXsS+D2njaL+od X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="58884486" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Juergen Gross Subject: [XEN PATCH 44/57] libs/guest: rename ELF_OBJS to LIBELF_OBJS Date: Mon, 6 Dec 2021 17:02:27 +0000 Message-ID: <20211206170241.13165-45-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 It seems a better name. Latter, we will introduce LIBX86_OBJS to collect lib/x86/* objects. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/guest/Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile index 455e23c432..770b9a7ef1 100644 --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -33,13 +33,12 @@ CFLAGS += -I$(XEN_libxenctrl) vpath %.c ../../../xen/common/libelf CFLAGS += -I../../../xen/common/libelf -ELF_OBJS-y += libelf-tools.o libelf-loader.o -ELF_OBJS-y += libelf-dominfo.o +LIBELF_OBJS += libelf-tools.o libelf-loader.o +LIBELF_OBJS += libelf-dominfo.o -OBJS-y += $(ELF_OBJS-y) +OBJS-y += $(LIBELF_OBJS) -$(ELF_OBJS-y): CFLAGS += -Wno-pointer-sign -$(ELF_OBJS-y:.o=.opic): CFLAGS += -Wno-pointer-sign +$(LIBELF_OBJS) $(LIBELF_OBJS:.o=.opic): CFLAGS += -Wno-pointer-sign ifeq ($(CONFIG_X86),y) # Add libx86 to the build vpath %.c ../../../xen/lib/x86 From patchwork Mon Dec 6 17:02:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659033 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 029D0C433F5 for ; Mon, 6 Dec 2021 17:08:35 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239514.415358 (Exim 4.92) (envelope-from ) id 1muHTW-0001QL-QL; Mon, 06 Dec 2021 17:08:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239514.415358; Mon, 06 Dec 2021 17:08:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHTW-0001Q6-Le; Mon, 06 Dec 2021 17:08:26 +0000 Received: by outflank-mailman (input) for mailman id 239514; Mon, 06 Dec 2021 17:08:26 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPg-0005ta-7S for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:28 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 90c3a7a2-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:04:27 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 90c3a7a2-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810267; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1nH3DERE1JlMh8VwtbIndoxT3Z56m8Z/3wBuefLC+Yw=; b=XV9s3SIefE0kF/n7YJUfCBGvChX1OviAHpE8ALt/VPcPgL6LYtR8pqoP 8rJGH9m0sCrSZPzOQ0boDl/dr2PJBqcxQ5fBX1obo4ZNNCHXh73bM2xZj IEkyYNI0DxdG+bc5W8jZsPs5rpGyz4PzmedFnDh9MOTyZ4E0gux0BuWji 8=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: aDd2dpyJ7gRfSVbxV4+9/bzhPrf3mPz4foNM8gwZeG9SEPtXKtb3t64tf6/AXampwdzjPdLOoM sA7Uexx3oSwZwtLqp5Emnz+oBUSIqPdKLY9hn3X0FkZvVgrwMt3Led8LAnCIx9TRUen14VD3XM C3AOgMF+1UMgm++3gfJzPvP7AvZ409pZVDDPbkAeYXN0vSbG3f/v6eeukk0sJ36eJw3ONatVrj fA67+69DtiNidWjHJmVvGuB5uD9JBlXwgXTr+Xh12Nq9BcLPuv61rU7M+z0Xz2/6NPaHzIA+Y6 BYLgJDC5GvOZ14VJakOWh/DJ X-SBRS: 5.1 X-MesageID: 59766550 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:kA42gqKMdy6/d3K4FE+RIJIlxSXFcZb7ZxGr2PjKsXjdYENS1jcPy GUcUGiPMv6DZmb1e4oiPIS+o00F6pLUndBmGQBlqX01Q3x08seUXt7xwmUcns+xwm8vaGo9s q3yv/GZdJhcokcxIn5BC5C5xZVG/fjgqoHUVaiUZUideSc+EH140Eg7xbZj6mJVqYPR7z2l6 IuaT/L3YDdJ6xYsWo7Dw/vewP/HlK2aVAIw5jTSV9gS1LPtvyB94KYkDbOwNxPFrrx8RYZWc QphIIaRpQs19z91Yj+sfy2SnkciGtY+NiDW4pZatjTLbrGvaUXe345iXMfwZ3u7hB2nsspjk +RLk6C2Cj0SL/zsl84FdCJhRnQW0a1uoNcrIFC6uM2XiUbHb2Ht07NlC0Re0Y8wo7gtRzsUr LpBdW5LPkvra+GemdpXTsFlgNgjK8/6epsSoHh6wRnSDOo8QICFSKLPjTNd9Gph2Z4QQKuGD yYfQWM2cxKHXxpWBmwSN4oSrfqmnWjxLxQN/Tp5ooJoujOOnWSdyoPFL979atGMA8JPkS6wp G3c+H/iKgoHL9HZwj2Amlqtme3njS79QJgVFrCz6rhtmlL77nweDlgaWEW2pdG9i1WiQJRPJ koM4C0soKMuskuxQbHVVhukoHmCr1gEVsBZCeES5wSEy66S6AGcblXoVRYYNoZg7pVvA2V3i BnZxLsFGACDrpW7ZGiPrYaSiw+0ehIuPD4iagUcajA8toyLTJ4IsjrDSdNqEaiQh9LzGC3tz z3ikBXSl4n/nuZQifzloAmvbyaE48GQE1Vrvlm/sneNt1shPOaYi5qUBU83BBqqBKKQVRG/s XcNgKByB8heXMjWxERhrAjgdYxFBspp0hWB2DaD/LF7rlxBHkJPm6gKulmSw28zba45lcfBO hO7hO+ozMY70IGWRaF2eZmtLM8h0LLtE9/oPtiNMIEePcIgKVXdon4+DaJ144wLuBJ2+U3YE c3EGftA8F5AUfg3pNZIb7l1PUAXKtAWmjqIGMGTI+WP2ruCfn+FIYrpw3PVBt3VGJis+V2Pm /4GbpPi40wGDIXWP3mGmaZOfAtiBSVqWvjLRzl/K7frzvxOQzp6VZc8ANoJJuRYokiivruSo yzmBBYHkAGXaL+uAVziV02PoYjHBf5XxU/X9wR1Vbpx83R8M4up8okFcJ47Iesu+OB5lKYmR PgZYcSQRP9IT22fqTgaaJD8qq1kdQiq2l3Sb3b0PmBncs4yXRHN9//lYhDrqHsEAB2ouJZsu LanzA7aH8YOHlwwEMbMZfuz5FqtpnxByvlqVk7FL4ALKkXh+YRnMQLrifozL51eIBnP3GLCh Q2XHQ0Zta/GpIpsqIvFgqWNroGIFepiHxUFQzmHvOjubSSDpzit245NVuqMbAvxbmKs9fXwf /hRwtH9LOYDwARAvb1jHus51qk5/dbu+eNXl1w2AHXRYl23Ibp8OX3aj9JXv6hAy7IF6wu7X kWDpotTNbmTYZ63FVcQIEwub/iZ1OFSkT7XtKxnLEL/7S5x3byGTUQNYEXc1H0DdON4YNE/3 OMsmM8K8Aju2BMlP+GPgj1Q62nRfGcLVL8qt81CDYLm4ubxJoquvXAI5vfK3ayy IronPort-HdrOrdr: A9a23:bIKx8K3LAnLHUrfS1DC0ewqjBLgkLtp133Aq2lEZdPRUGvb2qy nIpoV/6faUskd3ZJhOo7G90cW7LE80lqQFg7X5X43DYOCOggLBR+tfBOPZslnd8kbFmNK1u5 0NT0EHMqySMWRH X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59766550" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Juergen Gross Subject: [XEN PATCH 45/57] libs/guest: rework CFLAGS Date: Mon, 6 Dec 2021 17:02:28 +0000 Message-ID: <20211206170241.13165-46-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Remove '-Werror -Wmissing-progress -I./include $(CFLAGS_xeninclude)', those flags are already added via "libs.mk". Flag "-I." isn't needed, we just need to fix the #include of "xg_core.h" as this header isn't expected to be installed. Make use of "-iquote" instead of '-I' for double-quote included headers. Also, regroup the CFLAGS into the same place in the makefile. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/guest/Makefile | 20 +++++++++----------- tools/libs/guest/xg_offline_page.c | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile index 770b9a7ef1..62b8fead86 100644 --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -28,18 +28,13 @@ OBJS-y += xg_core.o OBJS-$(CONFIG_X86) += xg_core_x86.o OBJS-$(CONFIG_ARM) += xg_core_arm.o -CFLAGS += -I$(XEN_libxenctrl) - vpath %.c ../../../xen/common/libelf -CFLAGS += -I../../../xen/common/libelf LIBELF_OBJS += libelf-tools.o libelf-loader.o LIBELF_OBJS += libelf-dominfo.o OBJS-y += $(LIBELF_OBJS) -$(LIBELF_OBJS) $(LIBELF_OBJS:.o=.opic): CFLAGS += -Wno-pointer-sign - ifeq ($(CONFIG_X86),y) # Add libx86 to the build vpath %.c ../../../xen/lib/x86 @@ -70,10 +65,12 @@ OBJS-y += xg_dom_decompress_unsafe_xz.o OBJS-y += xg_dom_decompress_unsafe_zstd.o endif -CFLAGS += -Werror -Wmissing-prototypes -CFLAGS += -I. -I./include $(CFLAGS_xeninclude) -CFLAGS += -D__XEN_TOOLS__ -CFLAGS += -include $(XEN_ROOT)/tools/config.h +CFLAGS += -D__XEN_TOOLS__ +CFLAGS += -include $(XEN_ROOT)/tools/config.h +CFLAGS += -iquote ../../../xen/common/libelf + +# To be able to include xc_private.h +CFLAGS += -iquote $(XEN_libxenctrl) # Needed for posix_fadvise64() in xc_linux.c CFLAGS-$(CONFIG_Linux) += -D_GNU_SOURCE @@ -92,8 +89,9 @@ ZLIB_CFLAGS := ZLIB_LIBS := endif -xg_dom_bzimageloader.o: CFLAGS += $(ZLIB_CFLAGS) -xg_dom_bzimageloader.opic: CFLAGS += $(ZLIB_CFLAGS) +xg_dom_bzimageloader.o xg_dom_bzimageloader.opic: CFLAGS += $(ZLIB_CFLAGS) + +$(LIBELF_OBJS) $(LIBELF_OBJS:.o=.opic): CFLAGS += -Wno-pointer-sign LIBHEADER := xenguest.h diff --git a/tools/libs/guest/xg_offline_page.c b/tools/libs/guest/xg_offline_page.c index cfe0e2d537..c594fdba41 100644 --- a/tools/libs/guest/xg_offline_page.c +++ b/tools/libs/guest/xg_offline_page.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include "xg_core.h" #include "xc_private.h" #include "xg_private.h" From patchwork Mon Dec 6 17:02:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12658997 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0CC4DC433F5 for ; Mon, 6 Dec 2021 17:07:33 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239466.415160 (Exim 4.92) (envelope-from ) id 1muHSX-00081b-Rp; Mon, 06 Dec 2021 17:07:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239466.415160; Mon, 06 Dec 2021 17:07:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHSX-00081M-O4; Mon, 06 Dec 2021 17:07:25 +0000 Received: by outflank-mailman (input) for mailman id 239466; Mon, 06 Dec 2021 17:07:23 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPf-0005ti-O7 for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:27 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 91512ef9-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:04:26 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 91512ef9-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810266; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QUW3oQGRCIsCTBwhj/I18yejXA0w2YENn2RLNn0NPtM=; b=JuePm0wKVw0oYpRWf4feSH/z17Y2zzA7sbfGg0JrYjQKk3XVPuYqp6qV lgbR+ytUlUnVBz24vtosHouW+1p2qx8y1VnTzzKa8Ck9cNKhWN1vtrRIO GaM2q3TsFWdbL8OP6fC5XLNn52ufifnTcTRPBIGIDzqZzpNjTDsRwrByr k=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: IItMqUgkway0r+Nq/loDXcAFMx6wq8tuD+pZ2gYoiVbGJm7EqQJjdH8CHBcAIbgEgwADRLXjp6 ozRSMSShm8lK8KIo7Hu4sF7Nn+mHIXX/8rKohQjZZzY6Ko7kY4Y4WS4XhSE8HKRIa/eOGlaWIv zbzrfqesfBhQD8sJKNBwjCi2ChkI2sAdwaxw67hK6Qfl2bfigD3KPK0uZEPLOhK5yI/Jh41Z7e jmiPgqz32EiTCpnGLbGPtINNtFtTZcGY1tOs4/wMbE3AJiH9HNdlbwuGWrj3ihCiWQ4HePaPoN hIHCP/PAbKR72oUs8tNWR2sV X-SBRS: 5.1 X-MesageID: 58884496 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:E4mUoq9bdH6w7H0DknP1DrUDcXmTJUtcMsCJ2f8bNWPcYEJGY0x3z GYbUGuPP6zfZ2P9LtB0a96//E9QucTXz4BmTgI5+Ck8E34SpcT7XtnIdU2Y0wF+jyHgoOCLy +1EN7Es+ehtFie0Si9AttENlFEkvU2ybuOU5NXsZ2YhGmeIdA970Ug6wrRh3NYy6TSEK1jlV e3a8pW31GCNg1aYAkpMg05UgEoy1BhakGpwUm0WPZinjneH/5UmJMt3yZWKB2n5WuFp8tuSH I4v+l0bElTxpH/BAvv9+lryn9ZjrrT6ZWBigVIOM0Sub4QrSoXfHc/XOdJFAXq7hQllkPgu7 fJxvr6sWTwyL43+qtkQUDV/TH1xaPguFL/veRBTsOSWxkzCNXDt3+9vHAc9OohwFuRfWD8Us 6ZCcXZUM07F17neLLGTE4GAguwqKtXrO4UO/Glt1zjDAd4tQIzZQrWM7thdtNs1rp0eTaaCO 5tHAdZpRAT7TgEQK3ocMooRxdqHhCH8LRBjinvA8MLb5ECMlVcsgdABKuH9ZdiiVchT2EGCq Qru/WvjBQoBHMeC0jfD+XWp7sfOgiHTSI8UDKe/9PNhnBuU3GN7IA0bUx63rOe0jma6WslDM AoE9yw2t68w+Ue3CN7nUHWQqXiYvhkaSpxIHvcz8g2lxa/d4gLfDW8BJgOtc/R/6pVwH2Zzk AbUwZW5XlSDrYF5V1rC05CophGuKRMOPE8wVxIJTicivIXs9dRbYg30cv5vF6u8j9vQED72w iyXoCVWu4j/nfLnxI3gowmZ3mvESozhC1dsu16JBj7NAhZRPdb9P+SVBU7nAeGsxWpzZn2Ip zA6lseX94ji5rndxXXWEI3h8FxEjstp0QEwY3YyRvHNFBz3ohZPmLy8Bhkkfi+F1e5eJlfUj Lf741852XOqFCLCgVVLS4ywEd826qPrCM7oUPvZBvIXPMMhK1XWoXs0OxHAt4wIrKTKuftlU Xt8WZzzZUv29Iw9lGbmLwvj+eFDKt8CKZP7GsmgkkXPPUu2b3+JU7YVWGZinchihJ5oVD79q o4FX+PTkk03eLSnPkH/rN5CRXhXfCNTLc2n9KRqmhurf1MO9JcJUKSKn9vMuuVNwsxoqws/1 i3nBxIDlgOg3SavxMfjQikLVY4DlK1X9RoTVRHA937ys5T6SYrwvqoZabUterwrqL5qwfJuF qFXcMScGPVfDD/A/m1FP5X6qYVjcjWthB6PYHX5MGRuIcY4Slyb4MLgcyvu6DIKUni9u/whr uDyzQjcW5cCGVhvVZ6EdPK1wlqtlnEBg+YuDVDQK9xedRy0oohnIiD8lNEtJMQIJUmRzzeWz V/OUxwZufPMs8k+99yQ3fKIqIKgEu1fGEtGHjaEsebqZHeCpmf6mN1OSueFezzZRVjYwqT6a LUH1ez4Pd0GgE1O79h2HYF0wP9s/NDovbJbkFhpRS2Zc1SxB7p8CXCaxs0T5LZVz7pUtAbqC EKC/t5WZeeANM//SQNDIQMkaqKI1O0OmymU5vMweR2o6Chy9buBcENTIxjT13ANcOoraNsok bU7pcobyw2jkR57YN+Jgxdd+3mIMnFdAb4ssYsXAdOzhwcmor2YjUcw1sMiDEmzVuhx IronPort-HdrOrdr: A9a23:EYaJNa3ZMI7xKRYqPmM61QqjBLQkLtp133Aq2lEZdPRUGvb2qy nIpoV96faUskdpZJhOo7G90cW7LE80sKQFg7X5Xo3SODUO2lHJEGgK1+KLqFfd8m/Fh4tgPM 9bAs5D4bbLY2SS4/yX3ODBKadC/OW6 X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="58884496" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Juergen Gross Subject: [XEN PATCH 46/57] libs/store: use of -iquote instead of -I Date: Mon, 6 Dec 2021 17:02:29 +0000 Message-ID: <20211206170241.13165-47-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/store/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libs/store/Makefile b/tools/libs/store/Makefile index 6cc9baaabe..65092d8432 100644 --- a/tools/libs/store/Makefile +++ b/tools/libs/store/Makefile @@ -22,7 +22,7 @@ CFLAGS += -DXEN_LIB_STORED="\"$(XEN_LIB_STORED)\"" CFLAGS += -DXEN_RUN_STORED="\"$(XEN_RUN_STORED)\"" vpath xs_lib.c $(XEN_ROOT)/tools/xenstore -CFLAGS += -I $(XEN_ROOT)/tools/xenstore +CFLAGS += -iquote $(XEN_ROOT)/tools/xenstore xs.opic: CFLAGS += -DUSE_PTHREAD ifeq ($(CONFIG_Linux),y) From patchwork Mon Dec 6 17:02:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659001 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8C68AC433F5 for ; Mon, 6 Dec 2021 17:07:45 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239474.415182 (Exim 4.92) (envelope-from ) id 1muHSi-0000nc-Pp; Mon, 06 Dec 2021 17:07:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239474.415182; Mon, 06 Dec 2021 17:07:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHSi-0000nJ-Ki; Mon, 06 Dec 2021 17:07:36 +0000 Received: by outflank-mailman (input) for mailman id 239474; Mon, 06 Dec 2021 17:07:35 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPj-0005ti-Pj for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:31 +0000 Received: from esa6.hc3370-68.iphmx.com (esa6.hc3370-68.iphmx.com [216.71.155.175]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 93194e60-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:04:30 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 93194e60-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810270; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=p5aAroINdY0XxstjIhOll7B4+KbnIHxusYrnLiZlbAY=; b=Pqr2cvAxtlIySiaJWHrtWXJOLgJFVDinliXRFLIJczfsqZLSMQKJ7jn+ F5Ocly2PXPSP2GrJs/D0c7olTh/NAcxf5hLlMUFFAlsbXmLb9v6GB3h0r gsSveEpt6fjzwhFNllFgO0XayXI5+ZHwaY98Pb84AMuRCfRg0/Gy+GROs w=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: HBQFEQ+Y1u8kQ2/rCy/yYli3LDSL6ypUwUk7RO+01grHlWf6UQ/ZmXkXODPK73GhJsz/hPT65x lszt5Za7VFGBZ9rQR6qQYRCE2QQ6pKwZslXlC3CzIG3PGTqE8itXD1jyuUNTbxNjnJT6OdHDXT AwepTnXXDdrBelbcIKrytpl2sDp7GqQ1jiXL+WyWNMPH5QBL7mb4j+UjhfA67AtgVelfHLzfkp ZJu2UsIqVMstvwjSo46qF92JYoGVUr8f8g9ioEE6rgGij8jXxmhV2ByvFsSVqluDfid5P1NAKz 7srUcgCrRnB+lvJuNloc51IC X-SBRS: 5.1 X-MesageID: 59324146 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:ZiC+katT2BP3OfOz8s5ve02bpefnVKdZMUV32f8akzHdYApBsoF/q tZmKW/SMviDYDP1LYwjO4+woUpUup6HmN9jQAM6+S8zEy4S+JbJXdiXEBz9bniYRiHhoOOLz Cm8hv3odp1coqr0/0/1WlTZQP0VOZigHtIQMsadUsxKbVIiGHhJZS5LwbZj29cy2YbhWWthh PupyyHhEA79s9JLGjp8B5Kr8HuDa9yr5Vv0FnRnDRx6lAe2e0s9VfrzFonoR5fMeaFGH/bSe gr25OrRElU1XfsaIojNfr7TKiXmS1NJVOSEoiI+t6OK2nCuqsGuu0qS2TV1hUp/0l20c95NJ NplurXpbQoQHZT2qronekIIIzkvB/F50eqSSZS/mZT7I0zudnLtx7NlDV0sPJ1e8eFyaY1M3 aVGcnZXNEnF3r/ohuLgIgVvrp1LwM3DNYUDunZm3HfBAOwvW5zrSKTW/95Imjw3g6iiGN6DN pFDNWMzMnwsZTVhIF0NGct9t920h2XfUHp9kH67r60etj27IAtZj+G2bYu9lsaxbdpRtlaVo CTB5WuRKhMVLtuE0hKe72mhwOTImEvTWZ0QPK218OZwh1+ezXBVDwcZPXOrrP/8hkOgVtZ3L 00P5jFovaU07FasTNT2Q1u/unHslhcaR9pXFfx88AyXw7DYywmcD2kACDVGbbQbWNQeHGJwk AXTxpWwWGIp4Ob9pW+hGqm8ohrrHSUsDlY4V3E+ZFBV08Gymt0Mp0eaJjp8K5KdgtrwEDD25 jmFqikimrke5fI2O7WHEUPv2Gz1+MWQJuIhzkCOBz/+sFslDGKwT9XwsQCz0BpWEGqOorBtV lAgktPW0u0BBIrleMelELRUR+HBCxpo3VThbb9T83sJqm3FF52LJ9k4DNRCyKFBaJxsldjBO hC7hO+pzMUPVEZGlIcuC25LN+wkzLL7CfPuXe3OY9xFb/BZLVHcrH40NBPKhT6ywCDAdJ3T3 7/BK65A6l5AVsxaIMeeHb9BgdfHOAhgrY8seXwL50v+iufPDJJkYbwELEGPfogEAFCs+23oH yJkH5LSkX13CbSmCgGOqNJ7BQ1afBATWMGtw+QKJ7HrH+aTMDx4YxMn6eh6ININcmU8vrqgw 0xRrWcEkgei3iOedl3RAp2hAZu2NatCQbsAFXREFT6VN7ILOO5DNY8TKMk6e6cJ7utmwaImR vUJYZzYUP9OVi7G63IWapyk9N5ucxGihASvOSu5YWdgI848FlKRotK0LBHy8CQuDzassZdsq bOXyQ6GE4EIQB5vDZiKZav3nU+xp3UUhMl7Q1DMfotIYEzp/YUzc37xg/Y7LtsiMxLGwjfGh Q+aDQ1B/bvGopMv8cmPjqeB9t/7H+x7F0tcPm/a8bfpanWKojv9mddNCb/acyrcWWX4/LSZS d9Ul/ysYucamFtqspZnF+o5x6wJ+Nay9aRRyR5pHSuXYg3zWK9gOHSPweJGqrZJmu1CoQKzV 0+CpotaNLGONJ+3GVIdPlN4POGK1PVSkTjO9/UlZk794XYvrraAVExTOTiKiTBcc+QpYN90n 795tZ5E8RG7hzorLs2C33Jd+Gm7J3AdV7kq68MBC4jxhwt3klxPbPQw0MMtDE1jvzmUDnQXH w== IronPort-HdrOrdr: A9a23:kNp2CaxHh+WItbtFnv2GKrPwAr1zdoMgy1knxilNoERuA6ilfr OV7ZMmPH7P+U0ssR4b+exoVJPsfZqYz+8R3WBzB8bZYOCFghrKEGgK1+KLqFfd8m/Fh4xgPM xbHJSWfeeQMbEMt6jHCWeDf+rJHLG8gd2VbKzlvhFQpElRGthdBilCe36mLnE= X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59324146" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Juergen Gross Subject: [XEN PATCH 47/57] libs/stat: Fix and rework python-bindings build Date: Mon, 6 Dec 2021 17:02:30 +0000 Message-ID: <20211206170241.13165-48-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Fix the dependency on the library, $(SHLIB) variable doesn't exist anymore. Rework dependency on the include file, we can let `swig` generate the dependency for us with the use of "-M*" flags. The xenstat.h file has moved so we need to fix the include location. Rather than relaying on the VCS to create an empty directory for us, we can create one before generating the *.c file for the bindings. Make use of generic variable names to build a shared library from a source file: CFLAGS, LDFLAGS, and LDLIBS. Fix python's specific *flags by using python-config, and add them to generic flags variables: CFLAGS, LDLIBS. To build a shared library, we need to build the source file with "-fPIC", which was drop by 6d0ec05390 (tools: split libxenstat into new tools/libs/stat directory). The source file generated by swig seems to be missing a prototype for the "init" function, so we need "-Wno-missing-prototypes" in order to build it. Add some targets to .PHONY. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/stat/Makefile | 27 +++++++++++++++------ tools/libs/stat/bindings/swig/python/.empty | 1 - 2 files changed, 19 insertions(+), 9 deletions(-) delete mode 100644 tools/libs/stat/bindings/swig/python/.empty diff --git a/tools/libs/stat/Makefile b/tools/libs/stat/Makefile index e39fe29bd1..d5d9cb3659 100644 --- a/tools/libs/stat/Makefile +++ b/tools/libs/stat/Makefile @@ -49,23 +49,34 @@ install-bindings: install-perl-bindings install-python-bindings .PHONY: uninstall-bindings uninstall-bindings: uninstall-perl-bindings uninstall-python-bindings -$(BINDINGS): $(SHLIB) $(SHLIB_LINKS) include/xenstat.h +$(BINDINGS): libxenstat.so -SWIG_FLAGS=-module xenstat -Iinclude -I. +SWIG_FLAGS = -module xenstat -I$(XEN_INCLUDE) +SWIG_FLAGS += -MMD -MP -MF .$(if $(filter-out .,$(@D)),$(subst /,@,$(@D))@)$(@F).d # Python bindings -PYTHON_VERSION=$(PYTHON:python%=%) -PYTHON_FLAGS=-I/usr/include/python$(PYTHON_VERSION) -lpython$(PYTHON_VERSION) $(PYMOD): $(PYSRC) $(PYSRC): bindings/swig/xenstat.i - swig -python $(SWIG_FLAGS) -outdir $(@D) -o $(PYSRC) $< - + mkdir -p $(@D) + swig -python $(SWIG_FLAGS) -outdir $(@D) -o $@ $< + +$(PYLIB): CFLAGS += $(shell $(PYTHON)-config --includes) +$(PYLIB): CFLAGS += -fPIC +$(PYLIB): CFLAGS += -Wno-missing-prototypes +$(PYLIB): LDFLAGS += $(SHLIB_LDFLAGS) +$(PYLIB): LDLIBS := $(shell $(PYTHON)-config --libs) +$(PYLIB): LDLIBS += $(LDLIBS_libxenstat) $(PYLIB): $(PYSRC) - $(CC) $(CFLAGS) $(LDFLAGS) $(PYTHON_FLAGS) $(SHLIB_LDFLAGS) -lxenstat -o $@ $< $(APPEND_LDFLAGS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS) $(APPEND_LDFLAGS) +.PHONY: python-bindings python-bindings: $(PYLIB) $(PYMOD) -pythonlibdir=$(prefix)/lib/python$(PYTHON_VERSION)/site-packages +pythonlibdir = $(shell $(PYTHON) -c \ + 'import distutils.sysconfig as cfg; \ + print(cfg.get_python_lib(False, False, prefix="$(prefix)"))') + +.PHONY: install-python-bindings install-python-bindings: $(PYLIB) $(PYMOD) $(INSTALL_PROG) $(PYLIB) $(DESTDIR)$(pythonlibdir)/_xenstat.so $(INSTALL_PROG) $(PYMOD) $(DESTDIR)$(pythonlibdir)/xenstat.py diff --git a/tools/libs/stat/bindings/swig/python/.empty b/tools/libs/stat/bindings/swig/python/.empty deleted file mode 100644 index 2a8dd4274d..0000000000 --- a/tools/libs/stat/bindings/swig/python/.empty +++ /dev/null @@ -1 +0,0 @@ -This directory is empty; this file is included to prevent version control systems from removing the directory. From patchwork Mon Dec 6 17:02:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659107 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 050A7C433F5 for ; Mon, 6 Dec 2021 17:09:35 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239544.415567 (Exim 4.92) (envelope-from ) id 1muHUP-0004Qw-RP; Mon, 06 Dec 2021 17:09:21 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239544.415567; Mon, 06 Dec 2021 17:09:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHUP-0004Oj-Jz; Mon, 06 Dec 2021 17:09:21 +0000 Received: by outflank-mailman (input) for mailman id 239544; Mon, 06 Dec 2021 17:09:20 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPp-0005ta-Md for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:37 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 969b80ed-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:04:36 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 969b80ed-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810276; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6gPon+8ie7LTESQTDwjPUyrtRsfp7PjeTPv6/Lsi+SE=; b=D/nkpGKBvWy0S5AH7X/9jNocRO0JJj6uEEiT7o6Ocs0gHcrbwvJIfbiM qNvmAYFXZySAVYbQPWvAipI4KJAXDlBSpzZwYHQPVHH2bswyo74gKWGmY tdmDetmPnBz7W9rAi9rUslwrQACsizCtQgWOTyvm50KCJGEu4GUW6ao+p g=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: gf5YhVC7b28sGIfSw4cd8CgRx51//9NucJR41a3vpFzAQ5ebjMsz45YTg3KawPEPor0PswS0De tapNmDQgAEUWdo59XVgxyJeBxNTZ/3Wyr0LqArvDOU7mC/8dVQBku1T2FJ93fRt26C2yAW4CQ8 RP76zSV6Ab0TzgTZZOtjYFw9Fcf1pyFB0eastBC+JT6ONtupZj4aUJkAvwzJ/bVKCf9g1/+KRs dgl/lY8FFKtA7iHei6wJMqmTfTCKsZx+sfUA8RP1wUnxMNwdW5pim94Hn6Hijjb3/Qr/4S7Geh TIhkDcYh3UbRnvMtJH+Tfb/Q X-SBRS: 5.1 X-MesageID: 59766556 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:0/hyE6wfouvGd0AEaHZ6t+fGwSrEfRIJ4+MujC+fZmUNrF6WrkUPm jZLUGqDO/2MN2Cgco92YYq290hSvJWBx4RlQABr/yAxQypGp/SeCIXCJC8cHc8zwu4v7q5Dx 59DAjUVBJlsFhcwnvopW1TYhSEUOZugH9IQM8aZfHAuLeNYYH1500s6wbZn2tQAbeWRWGthh /uj+6UzB3f9s9JEGjp8B3Wr8U4HUFza4Vv0j3RmDRx5lAa2e0o9VfrzEZqZPXrgKrS4K8bhL wr1IBNVyUuCl/slIovNfr8W6STmSJaKVeSFoiI+t6RPHnGuD8H9u0o2HKN0VKtZt9mGt/ttx IRSs4aIcwp3JafIuNk5DEIDPS4raMWq+JefSZS+mcmazkmAeHrw2fR+SkoxOOX0+M4uXzsIr 6ZBbmlQMFbT3Ipaw5riIgVors0lMMnsOpJZonx6xCvVJf0nXYrCU+PB4towMDIY25ERQ6iDO pRxhTxHfDebZkRFOg8sDosjvsSxtHCmSxlUgQfAzUYwyzeKl1EguFT3C/LKfvSaSMMTmVyXz krE8H7+GQoyL8GExHyO9XfEru7QnwvrVYQKDrq6+/V2xlqJyQQ7GBAQEFe2v/S9okq/QM5Eb VwZ/DI0qqo//1DtScPyNzWxpmKEuRgNHcJdCeQg5CmCz6PV50CSAW1sc9JaQIV47olsH2Vsj wLX2YOybdByjFGLYVmB+uaLqymKAyVLNmUGRRIgElBezda29enfkSnzZtpkFae0iPj8Fjfx3 y2GoUACulkDsSIY//7lpA6a2lpAsrCMF1dovVuPAgpJ+ysgPNb9D7FE/2Q3+hqpwGyxalCa9 EYJlMGFhAzlJcHczXfdKAnh8VzA2hpkDNE+qQM2d3XC3270k5JGQWy2yGskTKuOGpxbEQIFm GeJ5WtsCGZ7ZRNGl5NfbYOrENgNxqP9D9njXf28RoMQOcguLl7apnswOh74M4XRfK4Ey/tX1 XCzK5nEMJrnIf4/kGreqxk1j9fHORzSNUuMHMumnnxLIJKVZWKPSKdtDbd9RrtR0U9wmy2Mq 4w3H5LTk313CbSiCgGKod97BQ1bdhATWMGpw/G7g8bee2KK7kl6UKSPqV7gEqQ495loehDgo ivgBxQGkQWn3hUq62yiMxheVV8mZr4nxVpTAMDmFQ/AN6ELbdn94aEBWYEweLV7puVvweQtF 6sOetmaA+QJQTPComxPYZ74pY1kVRKqmQPRYHb1PGlhJ8ZtF17T59vpXgrz7y1SXCC5gtQz/ u+73QTBTJtdGwk7VJTKaOiixk+atGQGnL4gRFPBJ9ReIR2+8IVjJyHroOUwJsUAdUfKyjeAj l7EChYEv+jd5YQy9YCR16yDqo6oFcp4H1ZbQDaHverna3GC8zP6k4FaUeuOcTTMb0/O+f2vN bdP0vXxEPwbh1IW4YByJKlmkPAl7Nz1qr4Ekgk9RCfXb06mA69LK2Wd2ZUdrbVEw7JUtFfkW k+L/dUGa7yFNNm8TQwULQshKO+CyesVin/Z6vFseBf24yp+/bymV0ROPkbT1HwBfeUtaI51k /08vMM26hCkjkt4O9mLuSlY6mCQIyFSSK4grJwbXNfmhwdDJouuunAA5vsaOK2yVug= IronPort-HdrOrdr: A9a23:UFpHP6BBoK/VnJ3lHemq55DYdb4zR+YMi2TC1yhKJiC9Ffbo8P xG/c5rrCMc5wxxZJhNo7290ey7MBHhHP1OkO0s1NWZPDUO0VHAROoJ0WKh+UyEJ8SXzJ866U 4KScZD4bPLYWSS9fyKgzWFLw== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59766556" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Juergen Gross Subject: [XEN PATCH 48/57] libs/stat: Fix and rework perl-binding build Date: Mon, 6 Dec 2021 17:02:31 +0000 Message-ID: <20211206170241.13165-49-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 For PERL_FLAGS, use make's shell rather than a backquote. Rather than relying on the VCS to create an empty directory for us, we can create one before generating the *.c file for the bindings. Make use of generic variable names to build a shared library from a source file: CFLAGS, LDFLAGS, and LDLIBS. To build a shared library, we need to build the source file with "-fPIC", which was drop by 6d0ec05390 (tools: split libxenstat into new tools/libs/stat directory). The source file generated by swig seems to be missing many prototype for many functions, so we need "-Wno-missing-prototypes" in order to build it. Also, one of the prototype is deemed malformed, so we also need "-Wno-strict-prototypes". Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/stat/Makefile | 15 +++++++++++---- tools/libs/stat/bindings/swig/perl/.empty | 1 - 2 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 tools/libs/stat/bindings/swig/perl/.empty diff --git a/tools/libs/stat/Makefile b/tools/libs/stat/Makefile index d5d9cb3659..962f02090b 100644 --- a/tools/libs/stat/Makefile +++ b/tools/libs/stat/Makefile @@ -94,13 +94,20 @@ uninstall: uninstall-python-bindings endif # Perl bindings -PERL_FLAGS=`perl -MConfig -e 'print "$$Config{ccflags} -I$$Config{archlib}/CORE";'` +PERL_FLAGS = $(shell $(PERL) -MConfig -e 'print "$$Config{ccflags} -I$$Config{archlib}/CORE";') $(PERLMOD): $(PERLSRC) $(PERLSRC): bindings/swig/xenstat.i - swig -perl $(SWIG_FLAGS) -outdir $(@D) -o $(PERLSRC) $< - + mkdir -p $(@D) + swig -perl $(SWIG_FLAGS) -outdir $(@D) -o $@ $< + +$(PERLLIB): CFLAGS += -fPIC +$(PERLLIB): CFLAGS += -Wno-strict-prototypes +$(PERLLIB): CFLAGS += -Wno-missing-prototypes +$(PERLLIB): LDFLAGS += $(PERL_FLAGS) +$(PERLLIB): LDFLAGS += $(SHLIB_LDFLAGS) +$(PERLLIB): LDLIBS := $(LDLIBS_libxenstat) $(PERLLIB): $(PERLSRC) - $(CC) $(CFLAGS) $(LDFLAGS) $(PERL_FLAGS) $(SHLIB_LDFLAGS) -lxenstat -o $@ $< $(APPEND_LDFLAGS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS) $(APPEND_LDFLAGS) .PHONY: perl-bindings perl-bindings: $(PERLLIB) $(PERLMOD) diff --git a/tools/libs/stat/bindings/swig/perl/.empty b/tools/libs/stat/bindings/swig/perl/.empty deleted file mode 100644 index 2a8dd4274d..0000000000 --- a/tools/libs/stat/bindings/swig/perl/.empty +++ /dev/null @@ -1 +0,0 @@ -This directory is empty; this file is included to prevent version control systems from removing the directory. From patchwork Mon Dec 6 17:02:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659009 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D329DC43217 for ; Mon, 6 Dec 2021 17:07:48 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239482.415223 (Exim 4.92) (envelope-from ) id 1muHSn-0001qP-3l; Mon, 06 Dec 2021 17:07:41 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239482.415223; Mon, 06 Dec 2021 17:07:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHSm-0001lR-HQ; Mon, 06 Dec 2021 17:07:40 +0000 Received: by outflank-mailman (input) for mailman id 239482; Mon, 06 Dec 2021 17:07:36 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPo-0005ta-Kr for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:36 +0000 Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 95c7e7e0-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:04:35 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 95c7e7e0-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810275; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=e1NkHAQPfUnAtHDePdITPlx+ldg10pRV4o24t5c0gJk=; b=O3f6icxWvYVrM0z4Wa29/2DAIPr9tWzzBhN5nxJr/wQTbIL2bCLW/oy4 PdH8VLCD3Dzdp8gm0LHUn/iL9GoKwscHYNWAQLByw7CG9Ghx7LtlLv7Kx qGx690gjq6bsk9z2fSOuI5G0NQRE+RNLaZb2/yONvrO+3VzVtywlKOyfl k=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: YdG7wedAVNPucWIF4lx8DrQU/DiJl0Mh2wZ06U+Eud91fHe24OImndvWB4o7ou1i+MQLJiWHpx QRrJ661YgHjG2u/Nn349JE77F5HGHXN+AByoZGY8hIrKQs8/M6CQGCdTEcN1Obx+hEEJIaATMF hpKEb88BfzPv8VQehCniew98sW2E7uhAonnxPdLbrpmpKSY2E3C6xMZEPGNmat4wPBfSf4hFft 8CdlkXXFgTk0VT8xWGLXXHFLc0gb95C6Yp+MOu5T7zao+qIWZkiE+Cj8DVXkIu/7+D8Wimjtbv ySny5v8Wflm252tJ6klHBA6Z X-SBRS: 5.1 X-MesageID: 59388021 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:OBHA4KKSBFpFt4b6FE+RIJIlxSXFcZb7ZxGr2PjKsXjdYENS1TcPx 2EbCzqBa63eNmD3eNl/YIS//U1U65GBnIIxG1RlqX01Q3x08seUXt7xwmUcns+xwm8vaGo9s q3yv/GZdJhcokcxIn5BC5C5xZVG/fjgqoHUVaiUZUideSc+EH140Eg7xbZj6mJVqYPR7z2l6 IuaT/L3YDdJ6xYsWo7Dw/vewP/HlK2aVAIw5jTSV9gS1LPtvyB94KYkDbOwNxPFrrx8RYZWc QphIIaRpQs19z91Yj+sfy2SnkciGtY+NiDW4pZatjTLbrGvaUXe345iXMfwZ3u7hB2Og4lu4 ttdmaDscjUwBPbSm9kkSUBxRnQW0a1uoNcrIFC6uM2XiUbHb2Ht07NlC0Re0Y8wo7gtRzsUr LpBdW5LPkvra+GemdpXTsFlgNgjK8/6epsSoHh6wRnSDOo8QICFSKLPjTNd9Gph3ZAeRayHD yYfQTxfVhicSQZhBhQeLJ0+wtqi2Sf7LSIN/Tp5ooJoujOOnWSdyoPFL979atGMA8JPkS6wp G3c+H/iKgoHL9HZwj2Amlqtme3njS79QJgVFrCz6rhtmlL77nweDlgaWEW2pdG9i1WiQJRPJ koM4C0soKMuskuxQbHVVhukoHmCr1gEVsBZCeES5wSEy66S6AGcblXoVRYYNoZg7pVvA2V3i BnZxLsFGACDrpWSVSuC3LmEgQ/uAhoMFzQcZhI9V1IstoyLTJ4IsjrDSdNqEaiQh9LzGC3tz z3ikBXSl4n/nuZQifzloAmvbyaE48GQE1Vrvlm/sneNt1shPOaYi5qUBU83BBqqBKKQVRG/s XcNgKByB8heXMjWxERhrAjgdYxFBspp0hWB2DaD/LF7rlxBHkJPm6gKulmSw28zba45lcfBO hO7hO+ozMY70IGWRaF2eZmtLM8h0LLtE9/oPtiNMIEePcIgKVXdon4+DaJ144wLuBJ2+U3YE c3EGftA8F5AUfg3pNZIb7l1PUAXKtAWmjqIGMGTI+WP2ruCfn+FIYrpw3PVBt3VGJis+V2Pm /4GbpPi40wGDIXWP3mGmaZOfAtiBSVqWvjLRzl/K7frzvxOQzp6VZc8ANoJJuRYokiivruSo yzmBBYHkAGXaL+uAVziV02PoYjHBf5XxU/X9wRwVbpx83R8M4up8okFcJ47Iesu+OB5lKYmR PgZYcSQRP9IT22fqTgaaJD8qq1kdQiq2l3Sb3b0PmBncs4yXRHN9//lYhDrqHsEAB2ouJZsu LanzA7aH8YOHlwwEMbMZfuz5FqtpnxByvlqVk7FL4ALKkXh+YRnMQLrifozL51eIBnP3GLCh Q2XHQ0Zta/GpIpsqIvFgqWNroGIFepiHxUFQzmHvOjubSSDpzit245NVuqMbAvxbmKs9fXwf /hRwtH9LOYDwARAvb1jHus51qk5/dbu+eNXl1w2AHXRYl23Ibp8OX3aj9JXv6hAy7IF6wu7X kWDpotTNbmTYZ63FVcQIEwub/iZ1OFSkT7XtKxnLEL/7S5x3byGTUQNYEXc1H0DdON4YNE/3 OMsmM8K8Aju2BMlP+GPgj1Q62nRfGcLVL8qt81CDYLm4ubxJoquvXAI5vfK3ayy IronPort-HdrOrdr: A9a23:6IJ9mKMWWMMOQMBcTsejsMiBIKoaSvp037Eqv3ofdfUzSL3+qy nOpoVj6faaslcssR0b9OxofZPwI080lqQFhbX5X43DYOCOggLBR+tfBMnZsljd8kXFh4hgPM xbHZSWZuedMbEDt7eY3DWF X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59388021" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Juergen Gross Subject: [XEN PATCH 49/57] libs/toolcore: don't install xentoolcore_internal.h anymore Date: Mon, 6 Dec 2021 17:02:32 +0000 Message-ID: <20211206170241.13165-50-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 With "xentoolcore_internal.h" been in LIBHEADER, it was installed. But its dependency "_xentoolcore_list.h" wasn't installed so the header couldn't be used anyway. This patch also mean that the rule "headers.chk" doesn't check it anymore as well. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- tools/libs/toolcore/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libs/toolcore/Makefile b/tools/libs/toolcore/Makefile index 632048c899..360a10e5da 100644 --- a/tools/libs/toolcore/Makefile +++ b/tools/libs/toolcore/Makefile @@ -5,7 +5,7 @@ MAJOR = 1 MINOR = 0 AUTOINCS := $(XEN_INCLUDE)/_xentoolcore_list.h -LIBHEADER := xentoolcore.h xentoolcore_internal.h +LIBHEADER := xentoolcore.h OBJS-y += handlereg.o From patchwork Mon Dec 6 17:02:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659061 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A2876C433F5 for ; Mon, 6 Dec 2021 17:09:09 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239535.415516 (Exim 4.92) (envelope-from ) id 1muHU4-0000D9-O0; Mon, 06 Dec 2021 17:09:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239535.415516; Mon, 06 Dec 2021 17:09:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHU3-00009C-JE; Mon, 06 Dec 2021 17:08:59 +0000 Received: by outflank-mailman (input) for mailman id 239535; Mon, 06 Dec 2021 17:08:57 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPp-0005ti-GG for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:37 +0000 Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 96699ceb-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:04:36 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 96699ceb-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810276; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zPznA+ybTAJl3D8zcQnhTs5UDGVeYxfDltfmGygnLGQ=; b=STIgGQTNlh9jB0/IGPm8JuavQoMZ/tfLLm998++yJRPOYM5rsWUUqf3k m/MOplJNeY0OGxD9GZTCnatGeOwfE3RhSg9Sjj0laJX0RuTH4QZgQasNp poLuEFAf2juiEYddGz6xHvdwV4+Eh/jY56nclM2cN4cr9HYII0sPcsSiX 0=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: gZwrIIIs3fLrpeQ+GGmDbXU+P58vuCi5Hayev4yJSne9H5ciXanMGjY0fP3svhoj80aZfncUS2 WCBeQCInyhrPO8+SJKNNSG0P0FIhMMxYHyXzjocvEyOpvqbV9Mgin3kKEhhoZZf9gHUNNBXlpO /TYODsuZhpcdc3Bq3h27Zt6FM7+f48BW2C8g9TLFteRjHfOCvX9XmpIhkloprMQK21Y6YuPTqU z4SdBaN6pURXCI1svNLy4X6oPeHR200PIvc19ZBQmcRgCyl+h2Dh/62EWcBmWz4Tvxh4JgNIR5 3dep41H4LxF6zQ+SvphuvSX+ X-SBRS: 5.1 X-MesageID: 59388028 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:dn+4VqLhcPaplsttFE+RN5IlxSXFcZb7ZxGr2PjKsXjdYENS12MGz zAdDGHQaaqJamHyeN92Odiy9EIAv5eGy9NiTAJlqX01Q3x08seUXt7xwmUcns+xwm8vaGo9s q3yv/GZdJhcokcxIn5BC5C5xZVG/fjgqoHUVaiUZUideSc+EH140Eg7xbZj6mJVqYPR7z2l6 IuaT/L3YDdJ6xYsWo7Dw/vewP/HlK2aVAIw5jTSV9gS1LPtvyB94KYkDbOwNxPFrrx8RYZWc QphIIaRpQs19z91Yj+sfy2SnkciGtY+NiDW4pZatjTLbrGvaUXe345iXMfwZ3u7hB3OsOtew 9IWj6aiEyUtFK+Px9QRDStXRnQW0a1uoNcrIFC6uM2XiUbHb2Ht07NlC0Re0Y8wo7gtRzsUr LpBdW5LPkvra+GemdpXTsFlgNgjK8/6epsSoHh6wRnSDOo8QICFSKLPjTNd9Gph3ZAeRayOD yYfQSpUaUuZWx9LBls0MpYavNuGhnXteSIN/Tp5ooJoujOOnWSdyoPFMcXXUsyHQ91PmUSVr X6A+H72ajkFMPSPxDzD9Wij7sffkCW+VI8MGbmQ8v9xnEbV1mEVEAcRV1awvb++kEHWc9tZN 0wT/DtotaUo/VanZtb4Vhy85nWDu3Yht8F4SrNgrlvXk+yNvljfVjNsoiN9hMIO8+ANajctj WWzjYnLARZt8+KlRSyv+eLBxd+tAhQ9IWgHbC4CaAIK5dj/vY0+5i7yosZf/L2d1YOsR2ypq 9yehG1n3uhI05ZXv0mu1Qmf22rEm3TfcuIiCuw7tEqB5xgxWoOqbpfABbPzvacZd9bxorVsU RE5dymiAAImUMjleM+lGrxl8FSVCxCtame0bblHRcZJythV0yT/Fb28GRknTKuTDu4KeCXyf GjYsh5L6ZlYMROCNPEsM93rWplwl/a/RbwJs8w4iPIUOPCdkyfdo0lTibO4hTixwCDAb4lhU XtkTSpcJSlDUvk2pNZHb+wczaUq1kgDKZD7HvjGI+Cc+ePGPha9EO5dWHPXN7xRxP7U8W39r ocEX+PXmko3bQELSnSOmWLlBQtRdiZT6FGfg5E/S9Nv1SI6Qjx8UKGInut6E2Gn9owM/tr1E riGchcw4DLCabfvcG1ms1hvN+HiW4hRt3U+MXB+NFqkwSF7M42u8L0eZ908erx+rL5vyvt9T v8kfcScA6sQFmSbqmpFNZSt/pZ/cBmLhB6VO3b3ajYIYJM9FRfC/cXpf1Wz+XBWXDa3r8Y3v 5apyhjfHcgYXw1nAcuPMKCvwlq9sGIzguV3W0eUcNBfdF+1qNphKjDrj+9xKMYJcE2Ryjyf3 geQIBEZueiS/NNlrIiX3fiJ9t77HfF/E0xWG3jgwYy3bSSKrHC+xYJgUfqTeWyPXm3D56j/N /5eyOvxMaNbkQ8S4ZZ8Cbti0Yk3+8Dr++1B1g1hEXjGMwarB7dnLiXU1MVDrPQQlLpQuA/wU UOT4NhKf76OPZq9QlIWIQMkaMWF1O0VxWaOvahkfh2i6X8l5qeDXGVTIwKI2X5UI7ZCOY84x fss5ZwN4Aulhxt2atuLg0i4LYhXwqDsh0n/iqwnPQ== IronPort-HdrOrdr: A9a23:UVriIqyDW1TiTI9jG0rwKrPwKr1zdoMgy1knxilNoRw8SKOlfq eV7ZMmPH7P+U8ssR4b+OxoVJPsfZqYz+8W3WBzB8bHYOCFgguVxehZhOOIqQEIWReOk9K1vZ 0QFZSWY+efMbEVt6rHCXGDYrUd/OU= X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59388028" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu Subject: [XEN PATCH 50/57] tools/Rules.mk: Cleanup %.pc rules Date: Mon, 6 Dec 2021 17:02:33 +0000 Message-ID: <20211206170241.13165-51-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 PKG_CONFIG_VARS isn't used anymore. For "local" pkg-config file, we only have one headers directory now, "tools/include", so there is no need to specify it twice. So remove $(CFLAGS_xeninclude) from "Cflags:". Signed-off-by: Anthony PERARD --- tools/Rules.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 0d3febfbb6..47424935ba 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -184,12 +184,11 @@ $(PKG_CONFIG_DIR)/%.pc: Makefile $(XEN_ROOT)/tools/Rules.mk $(PKG_CONFIG_DIR) echo "prefix=$(PKG_CONFIG_PREFIX)"; \ echo "includedir=$(PKG_CONFIG_INCDIR)"; \ echo "libdir=$(PKG_CONFIG_LIBDIR)"; \ - $(foreach var,$(PKG_CONFIG_VARS),echo $(var);) \ echo ""; \ echo "Name: $(PKG_CONFIG_NAME)"; \ echo "Description: $(PKG_CONFIG_DESC)"; \ echo "Version: $(PKG_CONFIG_VERSION)"; \ - echo "Cflags: -I\$${includedir} $(CFLAGS_xeninclude)"; \ + echo "Cflags: -I\$${includedir}"; \ echo "Libs: -L\$${libdir} $(PKG_CONFIG_USELIBS) -l$(PKG_CONFIG_LIB)"; \ echo "Libs.private: $(PKG_CONFIG_LIBSPRIV)"; \ echo "Requires.private: $(PKG_CONFIG_REQPRIV)"; \ @@ -200,7 +199,6 @@ $(PKG_CONFIG_DIR)/%.pc: Makefile $(XEN_ROOT)/tools/Rules.mk $(PKG_CONFIG_DIR) echo "prefix=$(PKG_CONFIG_PREFIX)"; \ echo "includedir=$(PKG_CONFIG_INCDIR)"; \ echo "libdir=$(PKG_CONFIG_LIBDIR)"; \ - $(foreach var,$(PKG_CONFIG_VARS),echo $(var);) \ echo ""; \ echo "Name: $(PKG_CONFIG_NAME)"; \ echo "Description: $(PKG_CONFIG_DESC)"; \ From patchwork Mon Dec 6 17:02:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659007 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DAF22C433F5 for ; Mon, 6 Dec 2021 17:07:47 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239478.415200 (Exim 4.92) (envelope-from ) id 1muHSk-0001Ak-Ry; Mon, 06 Dec 2021 17:07:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239478.415200; Mon, 06 Dec 2021 17:07:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHSk-00015v-9Q; Mon, 06 Dec 2021 17:07:38 +0000 Received: by outflank-mailman (input) for mailman id 239478; Mon, 06 Dec 2021 17:07:36 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPq-0005ti-Ks for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:38 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 9735eac8-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:04:37 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9735eac8-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810277; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=V6q43yBVZCXzj8p3r41jU3G4+oX+b+ENWb++VEuZ+aU=; b=FMwMRMQdElWlrMQNn7SmLn9RRX08mqbAFdYPyFkhBuZr1BdEA6WFAliz 0LdRcXPA21PRJ3niQmnSSDvY1+hj+deeDVatozF/rwcYusHjUTXeoSlFP 6lbSWk2ytQTM4PtGOWn4BViROTiKq62b6WIwNkKDs1jeCA3ni6rTyN2Cb o=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: 3WMfjEkaPwGHAycu7VCXq3LyrKnRM1dLtKl1FM/AuvZ8zQmJ+6Qs5coSO8fm2xX4e4kA10ZkB9 OmEe5yFOwNwR5mZCsWfg3I/imuaCaeyolTc6sezXRW/i3Jt5JPjaVDdZ/yqO+nMQAff7/X3WBt LQxbn3bGhQJiQP56F1oB1QuyrztdTdgrvaHSpWJYNmIh7MrY6foU8rEuIQIcaSuxIoSNZ0OWCf tz4Qq8FOzMokEMObF7nIK9d1gsNNcvO8a6vlVjMz8mrfU5iI6vk4ICVbYmVxTZET7qTdqWj9sR p66nHAxpYvimm0OZhKUsLcg8 X-SBRS: 5.1 X-MesageID: 58884528 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:IvAgGa+RDRV3dB+CeF4XDrUDG3mTJUtcMsCJ2f8bNWPcYEJGY0x3z GJLCjuEaPjZZTHxKNgnbNvj9ksEvMKBm981HlNs/CE8E34SpcT7XtnIdU2Y0wF+jyHgoOCLy +1EN7Es+ehtFie0Si9AttENlFEkvU2ybuOU5NXsZ2YhGmeIdA970Ug6wrRh3NYy6TSEK1jlV e3a8pW31GCNg1aYAkpMg05UgEoy1BhakGpwUm0WPZinjneH/5UmJMt3yZWKB2n5WuFp8tuSH I4v+l0bElTxpH/BAvv9+lryn9ZjrrT6ZWBigVIOM0Sub4QrSoXfHc/XOdJFAXq7hQllkPhhx ZIXl6WbdzwvL7ORnuAjQgEBTg9HaPguFL/veRBTsOSWxkzCNXDt3+9vHAc9OohwFuRfWD8Us 6ZCcXZUM07F17neLLGTE4GAguwqKtXrO4UO/Glt1zjDAd4tQIzZQrWM7thdtNs1rp0eTaaCO pBJAdZpRAnFMkweIlMVNLU7hvemlFn6SD9XtGvA8MLb5ECMlVcsgdABKuH9eMGORMhTtlaVo CTB5WuRKgoBKNWVxD6B83StruzChyX2XMQVDrLQ3uFuqE2ewCoUEhJ+fVmxrOS9i0W+c8lCM EFS8S0rxYAi+UruQtTjUhmQpH+fogVaS9dWC/c96gyG1uzT+QnxLmECUj5Gbs1grMIsTCYm/ lCMltLtQzdotdW9SG2f3qeZqyuoPioYJnNEYjULJTbp+PG6/tt11EiWCI8+Tujl1bUZBA0c3 RiaoW9kpYw4s/UNxrvm+1T5kir1+7bwG1tdChrsYkqp6QZwZYiAboOu6ETG4fsoELt1XmVtr 1BfxZHAsblm4YWl0XXUHb5TRO3BC+OtaWWE2TZS848dGyNBEpJJVaRZ+3lAKUhgKa7okhe5M RaI6Wu9CHK+VUZGjJObgarsUqzGLoC6TLwJs8w4iPIUOPCdkyfdo0lTiba4hTyFraTVufhX1 W2nWcitF20GLq9s0SC7QewQuZdymHtumjmCGMqhkUv3uVZ7WJJzYe1fWLdpRrpmhJ5oXS2Pq 4oPXyd040s3vBLCjtn/rtdIcAFiwYkTDpHqsc1HHtNv0SI9cFzN/8T5mOt7E6Q8xvw9vr6Ro hmVBx8JoHKi1CavAVjbNRhehEbHAM8XQYQTZnd3Yz5FGhELPO6S0UvoX8dtIOR8qrU8laUco jtsU5zoP8mjgw/vo1w1BaQRZqQ+HPhyrQ7RbSejfhYleJtsG17A9tP+J1O9/ygSFCun88A5p uT4hA/cRJMCQSVkDdrXN63znw/g4yBFlbIgRVbML/lSZF7orNpgJRvug6JlOMoLMxjCmGeXj l7EHRcCqODRiIYp692V17ucpoKkHrImTEpXFmXW95isMize8jbxyINMSr/QLzvcSHn16OOpY uAMl6PwN/gOnVBrtYtgEuk0kfJitoW3/7IDl1ZqBnTGaVivG4hMGHje0JkdrLBJy59YpRCyB hCF9O5FNOjbI8jiClMQelYoN7zRyfEOlzDOxv0pO0GmtjRv9b+KXEgObRmBjCtRcOl8PI8/m LpzvccX70q0iwYwM8bAhSdRrjzeInsFWqQhl5cbHI601VZ7lgAcOcTRWn3s/ZWCS9RQKU17c DabiZ3Li6lY2kefIWE4EmLA3LYFiJkD0PyQIITu+7hddgL5u8IK IronPort-HdrOrdr: A9a23:ycY4K6CqxUfGaX3lHemm55DYdb4zR+YMi2TC1yhKJiC9Ffbo8v xG/c5rsiMc5wxxZJhNo7290cq7MBHhHPxOgbX5VI3KNGKNhILBFvAH0WKI+VPd8kPFmtK1rZ 0QEJRDNA== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="58884528" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Julien Grall , "Stefano Stabellini" , Wei Liu Subject: [XEN PATCH 51/57] .gitignore: Cleanup ignores of tools/libs/*/{headers.chk,*.pc} Date: Mon, 6 Dec 2021 17:02:34 +0000 Message-ID: <20211206170241.13165-52-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Signed-off-by: Anthony PERARD --- .gitignore | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 8fb74a4c94..d494d1125a 100644 --- a/.gitignore +++ b/.gitignore @@ -105,26 +105,10 @@ tools/config.cache config/Tools.mk config/Stubdom.mk config/Docs.mk -tools/libs/toolcore/headers.chk -tools/libs/toolcore/xentoolcore.pc -tools/libs/toollog/headers.chk -tools/libs/toollog/xentoollog.pc -tools/libs/evtchn/headers.chk -tools/libs/evtchn/xenevtchn.pc -tools/libs/gnttab/headers.chk -tools/libs/gnttab/xengnttab.pc -tools/libs/hypfs/headers.chk -tools/libs/hypfs/xenhypfs.pc -tools/libs/call/headers.chk -tools/libs/call/xencall.pc +tools/libs/*/headers.chk +tools/libs/*/*.pc tools/libs/ctrl/libxenctrl.map -tools/libs/ctrl/xencontrol.pc -tools/libs/foreignmemory/headers.chk -tools/libs/foreignmemory/xenforeignmemory.pc -tools/libs/devicemodel/headers.chk -tools/libs/devicemodel/xendevicemodel.pc tools/libs/guest/libxenguest.map -tools/libs/guest/xenguest.pc tools/libs/guest/xc_bitops.h tools/libs/guest/xc_core.h tools/libs/guest/xc_core_arm.h @@ -144,21 +128,13 @@ tools/libs/light/testidl.c tools/libs/light/test_timedereg tools/libs/light/test_fdderegrace tools/libs/light/tmp.* -tools/libs/light/xenlight.pc -tools/libs/stat/headers.chk tools/libs/stat/libxenstat.map -tools/libs/stat/xenstat.pc -tools/libs/store/headers.chk tools/libs/store/list.h tools/libs/store/utils.h -tools/libs/store/xenstore.pc tools/libs/store/xs_lib.c -tools/libs/util/*.pc tools/libs/util/libxlu_cfg_y.output tools/libs/util/libxenutil.map -tools/libs/vchan/headers.chk tools/libs/vchan/libxenvchan.map -tools/libs/vchan/xenvchan.pc tools/console/client/xenconsole tools/console/daemon/xenconsoled tools/debugger/gdb/gdb-6.2.1-linux-i386-xen/* From patchwork Mon Dec 6 17:02:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659057 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 51612C433F5 for ; Mon, 6 Dec 2021 17:09:03 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239531.415490 (Exim 4.92) (envelope-from ) id 1muHTy-0007GB-Am; Mon, 06 Dec 2021 17:08:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239531.415490; Mon, 06 Dec 2021 17:08:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHTx-0007BR-5d; Mon, 06 Dec 2021 17:08:53 +0000 Received: by outflank-mailman (input) for mailman id 239531; Mon, 06 Dec 2021 17:08:51 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPs-0005ta-DY for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:40 +0000 Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 98427bb0-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:04:39 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 98427bb0-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810279; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=17GkR2xfeFdZkqadd7WfridmnTOn9dqn81AQSUR5V8Y=; b=J9ufKmkMFChxQwBbExT+t1+v6uNH19nH/9wxyT1vk3TmQzDidfe3xptB 4578FWxRfZF8cU2R/UgMfdZwmed0OulSXsOKIfr7Xujy+I7wNZ7sGzb3h FtxJTlMm9/sUb5S1sxkwwftLsBPBnT/Cv8PZQW5efIzRk1AyMn3f9QFfC M=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: UhMOe3HRq3IERCXBxThFhYhUOmg/zdsXCCRGZvlVBmcE4BIEchc7diJKsCJYjDbo+jKYCVGa4j xzLpUfxdlwpJiRgjyXY2D6Mfvoehl8Vt3+JBfHvWJt4A05qrNmxtrWi9xEipg0G4Ff491qskY2 xp8vFZbah0Rks6rY2tXprW7h5FZYl8UjOgYmScAOuVi71JLyjp2HT7/4vd4geeqU6RqNEqn9Hi ERIrBwawgstyAyPnHW9Ca75fvBTAyS6WR7VPeC/HEcrNp5mIEL0MGIEEAgFTApyy9GI0/+Z9XC pplvkS2dkKBEgQKpNfb4Vzq/ X-SBRS: 5.1 X-MesageID: 59370747 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:ocw5Oqjh1HCGEWY+22waEaFJX1615BcKZh0ujC45NGQN5FlHY01je htvDT+Eb/aKNmX0Ktl3YYnloBwGv8TczoJgHlZor389QXgb9cadCdqndUqhZCn6wu8v7a5EA 2fyTvGacajYm1eF/k/F3oAMKRCQ7InQLlbGILes1htZGEk0F0/NtTo5w7Rg29Qw34Dja++wk YiaT/P3aQfNNwFcagr424rbwP+4lK2v0N+wlgVWicFj5DcypVFMZH4sDfjZw0/DaptVBoaHq 9Prl9lVyI97EyAFUbtJmp6jGqEDryW70QKm0hK6UID66vROS7BbPg/W+5PwZG8O4whlkeydx /0Wka2pUBUoH5ecgekGf15ZMgFgL5dvreqvzXiX6aR/zmXDenrohf5vEFs3LcsT/eMf7WNmr KJCbmpXN1ba2rzwkOnTpupE36zPKOHiOp8fvXdxiynUF/88TbjIQrnQ5M8e1zA17ixLNauPP JVBNmYwBPjGSyVTOQtUFMIApuCluiHSSSdd9E7J+7VitgA/yyQuieOwYbI5YOeiWsF9jkue4 GXc8AzRGRgfKdGbjyaF83ilm+vTtS79Q8cWBbq+sPlwjzW7x3MRIA0bU0Ohpvu0gVL4XMhQQ 2QE9yxroaUs+UiDStjmQwb+sHOCpgQbWddbD6s98g7l4qPS/waeAHlCVjNbYcYqnMAzTD0uk FSOmrvU6SdH6ePPDyjHr/HN8G30aXN9wXI+iTEsFi80+sDxoaAJ3gvCVfokEY+VkM/PMGSlq 9yVlxQWi7IWhM8N8qy0+1Hbnj6hzqT0oh4JChb/BTz8sF4gDGKxT8nxsAWAs64cRGqMZgDZ5 CBspiSI0AwZ4XhhfgSpSf5FIrym7u3t3Nb00Q82RMlJG9hAFheekWFsDNNWeR4B3iUsI2aBj KrvVeV5vsU70JyCN/AfXm5JI552pZUM7Py8PhwuUvJAY4JqaCiM9zx0aEib0gjFyRZ3wf5la MrBK5jzXR727JiLKhLsHY/xNpdxmUgDKZ77H8inn3xLL5LADJJqdVv1GATXNb1ohE91iA7U7 8xeJ6O3J+Z3C4XDjt3s2ddLdzgidCFjbbiv8pA/XrPTc2JORTB6Y9eMkOxJRmCQt/kM/gs+1 irmAREwJZuWrSCvFDhmnVg/Mu6yBsgm8ipgVcHuVH7xs0UejU+UxP93X/MKkXMProSPFNZ4E KsIfduuGPNKRmiV8jgRd8Cl/odjaA6qlUSFOC/8OGozeJtpRgro/N74f1SwqHlSX3Tv7cZu8 ae90g77QIYYQ1gwBsjhd//ynUi6umIQmbwuUhKQcMVTYkjl7KNjNzf10q0sO8gJJBianmma2 g+aDA02v+7Ip4NpotDFibrd99WiEvdkH1ocFG7etO7kOS7f92ul4IlBTOfXImyNCDKqoP2vP LwHwev9PfsLmEdxn7B9S7s7n7gj49bPpqNBylg2Fnv8cFn2WKhrJWOL3JcTu/QVlKNZowa/R mmG5sJeZeeSIMrgHVMceFglY+CE2a1GkzXe961ockDz5Ssx97ubS0RCeRKLjXUFfrdyNYokx 8YnudIXtFPj2kZ7bI7eg3AG7XmII1wBT74j58MTD4LcgwY2zk1PPM7HASjs7ZDTM9hBPyHG+ NNPaHYuU1iE+nf/Tg== IronPort-HdrOrdr: A9a23:35G8C6MxWg2RDMBcTsejsMiBIKoaSvp037Eqv3ofdfUzSL3+qy nOpoVj6faaslcssR0b9OxofZPwI080lqQFhbX5X43DYOCOggLBR+tfBMnZsljd8kXFh4hgPM xbHZSWZuedMbEDt7eY3DWF X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59370747" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Samuel Thibault Subject: [XEN PATCH 52/57] stubdom: only build libxen*.a from tools/libs/ Date: Mon, 6 Dec 2021 17:02:35 +0000 Message-ID: <20211206170241.13165-53-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Avoid generating *.map files or running headers.chk when all we need is the libxen*.a. Also, allow force make to check again if libxen*.a needs rebuilt by adding a '.PHONY' prerequisite. Also, remove DESTDIR= as we don't do installation in this target, so the value of DESTDIR doesn't matter. Signed-off-by: Anthony PERARD Reviewed-by: Samuel Thibault --- stubdom/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index ccfcf5b75f..5fb5dbc341 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -354,8 +354,8 @@ define BUILD_lib .PHONY: libxen$(1) clean-libxen$(1) libxen$(1): libs-$$(XEN_TARGET_ARCH)/$(1)/libxen$(1).a libs-$$(XEN_TARGET_ARCH)/$(1)/libxen$(1).a: $$(LIBDEPS_$(1)) $$(LIBDEP_$(1)) - libs-$$(XEN_TARGET_ARCH)/$(1)/libxen$(1).a: mk-headers-$$(XEN_TARGET_ARCH) $$(NEWLIB_STAMPFILE) - CPPFLAGS="$$(TARGET_CPPFLAGS)" CFLAGS="$$(TARGET_CFLAGS)" $$(MAKE) DESTDIR= CONFIG_LIBXC_MINIOS=y -C libs-$$(XEN_TARGET_ARCH)/$(1) + libs-$$(XEN_TARGET_ARCH)/$(1)/libxen$(1).a: mk-headers-$$(XEN_TARGET_ARCH) $$(NEWLIB_STAMPFILE) .phony + CPPFLAGS="$$(TARGET_CPPFLAGS)" CFLAGS="$$(TARGET_CFLAGS)" $$(MAKE) CONFIG_LIBXC_MINIOS=y -C $$(@D) $$(@F) clean-libxen$(1): [ ! -e libs-$$(XEN_TARGET_ARCH)/$(1)/Makefile ] || $$(MAKE) DESTDIR= -C libs-$$(XEN_TARGET_ARCH)/$(1) clean From patchwork Mon Dec 6 17:02:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659045 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 12237C433EF for ; Mon, 6 Dec 2021 17:08:51 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239523.415434 (Exim 4.92) (envelope-from ) id 1muHTl-0004eA-KR; Mon, 06 Dec 2021 17:08:41 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239523.415434; Mon, 06 Dec 2021 17:08:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHTl-0004cr-2B; Mon, 06 Dec 2021 17:08:41 +0000 Received: by outflank-mailman (input) for mailman id 239523; Mon, 06 Dec 2021 17:08:38 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHQI-0005ti-Sw for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:05:07 +0000 Received: from esa6.hc3370-68.iphmx.com (esa6.hc3370-68.iphmx.com [216.71.155.175]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id a7d97e8c-56b6-11ec-8a4d-196798b21f7b; Mon, 06 Dec 2021 18:05:05 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: a7d97e8c-56b6-11ec-8a4d-196798b21f7b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810305; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YMeuk4EyZtrq5dKLGLHEQrPw6+SmC/P2I22RLaT9xR0=; b=KG4g3iqiEiPHqkIZjm0b9afwU6Xl3XHjC3EGNhDrfGxo089cQzf3v2nj JiLI9FfkLY1nBgR5lKksl3I3UkfNt7RSxkVtIYyTlwWdXTJ5LMnWLFtsf Mtwyqd2CPZHNwdOs633aRf1t3Qfir7SMmT4uhmh9NkXYZNAGrV6sfZHor M=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: cZS7i5NppI0ZKBWbjhuZdXUvxBO/n20vAk5qiRBhcoYZGSRAFnU8YMVx7THk7K+kyvTv8nQzUJ YmhYF7xk3sUjKNWkf4a0ja6nQPm3CaLTBoZhXCVABD4XPuoeSwz5sZtZEUyB/XLQ7QmPC0s86K wWYG66gocSEaWB+rm7xD+Xnt33ofQKWP3pDGrf18eR2FMhmejZQn7vFben4y4E0t9SgQoPxWsD iL+OgYvGJZfykaRZIXzcTSIT/cJcf71YHxmWDFmJE/36YpxYg+KuZkgq4En2qtpVOZu9toliJi XWPfPJ0R/3KSfKo1UYOGLYry X-SBRS: 5.1 X-MesageID: 59324170 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:g6ctca702jhmC5dxa2011gxRtL/AchMFZxGqfqrLsTDasY5as4F+v jYcCDiCP62Iamf3fIx2bdix/EgGvcCAyYNlGwZtri80Hi5G8cbLO4+Ufxz6V8+wwmwvb67FA +E2MISowBUcFyeEzvuV3zyIQUBUjclkfJKlYAL/En03FVAMpBsJ00o5wrdj2tAw27BVPivW0 T/Mi5yHULOa82Yc3lI8s8pvfzs24ZweEBtB1rAPTagjUG32zhH5P7pGTU2FFFPqQ5E8IwKPb 72rIIdVXI/u10xF5tuNyt4Xe6CRK1LYFVDmZnF+A8BOjvXez8CbP2lS2Pc0MC9qZzu1c99Zx cUQioGpcC4TboaLiM4DDxtoQjFmMvgTkFPHCSDXXc27ykTHdz3nwul0DVFwNoodkgp1KTgQr 7pCcmlLN03dwbLtqF64YrAEasALJc/3PIQZqzd4wCvQF/oOSpHfWaTao9Rf2V/cg+gTTK2EO 5NGMVKDajzMcRpMfWkQAqllt8C2nVfCb3oArQia8P9fD2/7k1UqjemF3MDuUsOObdVYmACfv G2u13/wBwwXMJqDyTuP+2+omsfCmzi+XJMVEvu/7PECqFyMxEQDBRsOT1y5rPKlzEmkVLp3O 0ESvyYjs6U23EiqVcXmGQ21pmaeuRwRUMYWFPc1gCmEzLbU5ACIQHAJVDdbZPQpscY3QXoh0 Vrhoj/yLWUx6vvPEyvbr+rK62PpUcQIEYMcTSIUEDQY+uDKmtEYyQLlUIphIP+lltKgTFkc3 Au2hCQ5grwSi+sC2KO64U3LjlqQm3TZcuImzl6JBzz4t2uVcKbgPtX1sgaDsZ6sOa7AFgHZ1 EXojfRy+wzn4XulsCWWCNsAE7iyjxpuGG2N2AU/d3XNGtnExpJCQWyyyGwnTKuKGpxdEdMMX KM1kVkLjHO0FCH1BZKbm6rrV6wXIVHITLwJrMz8YNtUeYRWfwSa5ixobkP49zmzyxhzy/BiY 83FLpbE4ZMm5UJPlmDeqwA1i+BD+8zD7TmLGcCTI+qPj9Jym0J5uZ9aaQDTP4jVHYuPoRnP8 sY3Cid54043bQEKWQGOqdR7BQlTdRATXMmqw+QKJr/rClc3QwkJVq6OqY7NjqQ4xsy5YM+Tp SrjMqKZoXKi7UD6xfKiNio+NeixBMkn9hrW/0UEZD6V5pTqWq73hI93Snf9VeB5nAC65fIrH fQDZeuaBfFDFmbO9zgHNMGvp41+bhW7wwmJOnP9MjQ4epdhQS3P+8PlIVSzpHVfUHLvuJtsu aCk2yPaXYEHG1ZoAvHJZa/91Fi2p3Ucxr5/BhOaPtlJdUzw24F2MCit3OQvKsQBJEyblDuX3 gqbGzkCouzJr9Nn+dXFn/nc/YyoD/F/DgxRGGyCteS6MizT/2yCx45cUbnXIWCBBT2soKj7P Ldb1fDxNvEDjW1miYskHuY517866vvuu6ReklZuEkLUYgn5EbhnOHSHg5VC7/Uf2r9DtAKqc UuT4d0Ga66RMcboHVNNdgooauOPiaMdljXItKlnJUz74Gl8/aadUFUUNB6J0XQPILxwOYIj4 OEgpM9JtFDv1kt0ao6L3nJO6mCBDn0cSKF25JgVDbjihhcv1lwfM4fXDTX74c3XZthBWqXwz uR4WEYWa2xg+3f/ IronPort-HdrOrdr: A9a23:k09PNqk6F+yEXIqagw+YTEKu2FnpDfIq3DAbv31ZSRFFG/Fxl6 iV88jzsiWE7wr5OUtQ4OxoV5PgfZqxz/NICMwqTNWftWrdyQ+VxeNZjbcKqgeIc0aVygce79 YET0EXMqyXMbEQt6jHCWeDf+rIuOP3k5yVuQ== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59324170" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Samuel Thibault Subject: [XEN PATCH 53/57] stubdom: introduce xenlibs.mk Date: Mon, 6 Dec 2021 17:02:36 +0000 Message-ID: <20211206170241.13165-54-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 This new makefile will be used to build libraries that provides "Makefile.common". At some point, we will be converting Makefile in tools/ to "subdirmk" and stubdom build will not be able to use those new makefiles, so we will put the necessary information for stubdom to build the xen libraries into a new Makefile.common and xenlibs.mk will use it. We only need to build static libraries and don't need anything else. The check for the presence of "Makefile.common" will go aways once there is one for all libraries used by stubdom build. Also remove DESTDIR= from "clean" targets, we don't do installation in this recipe so the value of DESTDIR doesn't matter. Signed-off-by: Anthony PERARD Reviewed-by: Samuel Thibault --- stubdom/xenlibs.mk | 13 +++++++++++++ stubdom/Makefile | 9 +++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 stubdom/xenlibs.mk diff --git a/stubdom/xenlibs.mk b/stubdom/xenlibs.mk new file mode 100644 index 0000000000..5c8742ccf9 --- /dev/null +++ b/stubdom/xenlibs.mk @@ -0,0 +1,13 @@ +include $(XEN_ROOT)/tools/Rules.mk + +include Makefile.common + +LIBNAME := $(notdir $(CURDIR)) +FILENAME_$(LIBNAME) ?= xen$(LIBNAME) +LIB_FILE_NAME = $(FILENAME_$(LIBNAME)) + +lib$(LIB_FILE_NAME).a: $(OBJS-y) + $(AR) rc $@ $^ + +clean:: + rm -f $(OBJS-y) lib$(LIB_FILE_NAME).a diff --git a/stubdom/Makefile b/stubdom/Makefile index 5fb5dbc341..fba4c977ef 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -346,6 +346,7 @@ define do_links cd $(dir $@); \ ln -sf $(dir $<)include/*.h include/; \ ln -sf $(dir $<)*.[ch] .; \ + [ -e $(dir $<)Makefile.common ] && ln -sf $(dir $<)Makefile.common . ||:; \ ln -sf $(dir $<)Makefile . touch $@ endef @@ -355,10 +356,14 @@ define BUILD_lib libxen$(1): libs-$$(XEN_TARGET_ARCH)/$(1)/libxen$(1).a libs-$$(XEN_TARGET_ARCH)/$(1)/libxen$(1).a: $$(LIBDEPS_$(1)) $$(LIBDEP_$(1)) libs-$$(XEN_TARGET_ARCH)/$(1)/libxen$(1).a: mk-headers-$$(XEN_TARGET_ARCH) $$(NEWLIB_STAMPFILE) .phony - CPPFLAGS="$$(TARGET_CPPFLAGS)" CFLAGS="$$(TARGET_CFLAGS)" $$(MAKE) CONFIG_LIBXC_MINIOS=y -C $$(@D) $$(@F) + CPPFLAGS="$$(TARGET_CPPFLAGS)" CFLAGS="$$(TARGET_CFLAGS)" $$(MAKE) CONFIG_LIBXC_MINIOS=y $$(if $$(wildcard $$(@D)/Makefile.common),-f $(CURDIR)/xenlibs.mk) -C $$(@D) $$(@F) clean-libxen$(1): - [ ! -e libs-$$(XEN_TARGET_ARCH)/$(1)/Makefile ] || $$(MAKE) DESTDIR= -C libs-$$(XEN_TARGET_ARCH)/$(1) clean + if [ -e libs-$$(XEN_TARGET_ARCH)/$(1)/Makefile.common ]; then \ + $$(MAKE) -f $(CURDIR)/xenlibs.mk -C libs-$$(XEN_TARGET_ARCH)/$(1) clean; \ + elif [ -e libs-$$(XEN_TARGET_ARCH)/$(1)/Makefile ]; then \ + $$(MAKE) -C libs-$$(XEN_TARGET_ARCH)/$(1) clean; \ + fi libs-$$(XEN_TARGET_ARCH)/$(1)/stamp: $$(XEN_ROOT)/tools/libs/$(1)/Makefile $$(do_links) From patchwork Mon Dec 6 17:02:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12658995 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 28A94C433F5 for ; Mon, 6 Dec 2021 17:07:22 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239455.415149 (Exim 4.92) (envelope-from ) id 1muHSL-0006uM-HX; Mon, 06 Dec 2021 17:07:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239455.415149; Mon, 06 Dec 2021 17:07:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHSL-0006uB-CS; Mon, 06 Dec 2021 17:07:13 +0000 Received: by outflank-mailman (input) for mailman id 239455; Mon, 06 Dec 2021 17:07:12 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHPw-0005ta-LZ for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:44 +0000 Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 9ade9877-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:04:42 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9ade9877-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810282; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=EZdSsjGi/UmXxIGTmBZueTfn63DyjUZHifcM4599pLk=; b=Gp4e483wY3MOy1vbJgAlzXd8J+PI6wdz3V9toqSpuuLD422cc0SHdCGY 8oumqsEmr59EYSQba2+58bcum7Ankx/KHuCatp/CC60jIu710+eAM33tD zQSbhuJkgLn3O3YrPi9ohuepS5bmFK0iyoo3q6q4Puyv6GCiFGkEPd8Up Q=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: BGEtRBNmU1ClXNirFlNE0N5aOIfsaLHkc1Ick+0Tbt5xZEZcFcTkg/dIHu4C2HI3BqUDPPLD26 Jxxf2m18eLRYSrgN2FUS7vbC7zCkP4aBwYU+bHStq3XkiMW/gypfctJpxweymeh8MItr2LiDHh VWNPLcVvR+57nscZNZJI/5QUB4xGH9ofsKM1CP6mcejBXYthvLFAZITpB2kmzmguSwaS0eHsPl gjZtEUTQu9Re/a3vdYuzk7t1DINSUL7CaEj3oviLEL92GgrqeE6GLVHJC3Y0OylJybEU4uAEAi NN8/A4QmF2KSqAekhESBji17 X-SBRS: 5.1 X-MesageID: 59370749 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:N7stm6uA8bt9lpc8pybJL8Fe9ufnVMFZMUV32f8akzHdYApBsoF/q tZmKWGCa66LZWGhLd4lb4ux9E5XvJTXn4VqQVA5qCkzEi8b+JbJXdiXEBz9bniYRiHhoOOLz Cm8hv3odp1coqr0/0/1WlTZQP0VOZigHtIQMsadUsxKbVIiGHhJZS5LwbZj29cy2YbhWWthh PupyyHhEA79s9JLGjp8B5Kr8HuDa9yr5Vv0FnRnDRx6lAe2e0s9VfrzFonoR5fMeaFGH/bSe gr25OrRElU1XfsaIojNfr7TKiXmS1NJVOSEoiI+t6OK2nCuqsGuu0qS2TV1hUp/0l20c95NJ NpluaKbeCsOeff3pN9NVDh3HQA9HbBHweqSSZS/mZT7I0zudnLtx7NlDV0sPJ1e8eFyaY1M3 aVGcnZXNEnF3r/ohuLgIgVvrp1LwM3DNYUDunZm3HfBAOwvW5zrSKTW/95Imjw3g6iiGN6DN pFGMWUzPXwsZTVpa1IOGckno9uTxXLaWGwB9WytlYsotj27IAtZj+G2bYu9lsaxbdpRtlaVo CTB5WuRKgoTMcGSzXyZ8nOmj/LLgQv2XplXEKy/8LhtmlL77m4cEhoNTnOgvOK0zEW5Xrp3O 0ESvyYjs6U23EiqVcXmGQ21pmaeuRwRUMYWFPc1gCmEzLbU5ACIQHAJVDdbZPQpscY3QXoh0 Vrht9L2BxR/vbuNU3Wf+7yI6zSoNkAowXQqPHFeC1Ffup+6/d913kmnostf/LCdguPeKB3Xh GqxkBNugJQ8g+9I97i6xAWS696znaThQgkw7wTRe2uq6AJleYKoD7CVBUjnAeVod9jAEATY1 JQQs43Htb1VU8nR/MCYaLxVROnB2hqTDNHLbbeD9bEF/i/lxXOsdJs4DNpWdBYwaZZsldMEj SbuVeJtCH17YSLCgUxfOdvZ5yEWIU7IT46Nuhf8NIUmX3SJXFXblByCnGbJt4wXrGAikLskJ bCQetu2AHARBMxPlWTtF7hHgOJxnH5hlQs/oKwXKTz9i9Jyg1bPFt843KamNLhlvMtoXi2Lm zqgCyd640oGC7CvCsUm2YUSMUoLPRAG6WPe8KRqmhq4ClM+QgkJUqaJqZt4ItANt/kFx4/go yDmMmcFmQWXuJEyAVjTApyVQOi0BsgXQLNSFXFEAGtELFB/O9vyt/lGKMNsFVTlncQ6pcNJo zA+U53oKpxypv7voVzxtLHx895vcgqFnwWLM3b3aTQzZcc4FQfI5sXlbk3k8yxXVni7ss43o ruB0ALHQMVcG1Q+XZiOMP//nUmsuXU9mf5pWxeaKNdkZ0ixopNhLDb8j6FrLphUewnD3DaTy y2fHQwc+bvWu4Yw/dSQ3fKEoo6lHvFQBE1fG2WHv7+6OTODpjiowJNaUfbOdjfYDTum9KKnb ORT7vf9LPxYwwoa79siS+5mlPts6cHuqrlWyhVfME/KN1n7WKl9JnSm3NVUsvEfzLFupgbrC FmE/cNXOOvVNZq9QkIRPgcscs+KyeoQxmvJ9f0wLUj3uH138b6AXRkANhWAknUAfr58MYdjy uY9os8GrQe4j0NyYNqBiylV8UWKL2ABDPp75s1LXtezh1p50ExGbLzdFjTyscOGZNh7O0U3J iOZ2fjZjLNGy0ueK3c+GBAhBwaGaUjibPyS8GI/Gg== IronPort-HdrOrdr: A9a23:ejS48698lX7bzHjNuZpuk+DeI+orL9Y04lQ7vn2YSXRuHfBw8P re+8jztCWE8Qr5N0tApTntAsS9qDbnhPxICOoqTNOftWvd2FdARbsKheCJ/9SjIVyaygc079 YHT0EUMrPN5DZB4foSmDPIcOod/A== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59370749" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Samuel Thibault , Juergen Gross Subject: [XEN PATCH 54/57] tools/libs: create Makefile.common to be used by stubdom build system Date: Mon, 6 Dec 2021 17:02:37 +0000 Message-ID: <20211206170241.13165-55-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 This new "Makefile.common" is intended to be used by both tools/ and stubdom/ build system without stubdom needed to use tools/ build system. It should contain the necessary list of objects and CFLAGS needed to build a static library. Change stubdom/ to check Makefile.common, for the linkfarm. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- stubdom/Makefile | 2 +- tools/libs/call/Makefile | 7 +- tools/libs/call/Makefile.common | 6 ++ tools/libs/ctrl/Makefile | 45 +----------- tools/libs/ctrl/Makefile.common | 44 ++++++++++++ tools/libs/devicemodel/Makefile | 7 +- tools/libs/devicemodel/Makefile.common | 6 ++ tools/libs/evtchn/Makefile | 7 +- tools/libs/evtchn/Makefile.common | 6 ++ tools/libs/foreignmemory/Makefile | 7 +- tools/libs/foreignmemory/Makefile.common | 6 ++ tools/libs/gnttab/Makefile | 9 +-- tools/libs/gnttab/Makefile.common | 8 +++ tools/libs/guest/Makefile | 90 +----------------------- tools/libs/guest/Makefile.common | 84 ++++++++++++++++++++++ tools/libs/toolcore/Makefile | 8 +-- tools/libs/toolcore/Makefile.common | 9 +++ tools/libs/toollog/Makefile | 3 +- tools/libs/toollog/Makefile.common | 2 + 19 files changed, 182 insertions(+), 174 deletions(-) create mode 100644 tools/libs/call/Makefile.common create mode 100644 tools/libs/ctrl/Makefile.common create mode 100644 tools/libs/devicemodel/Makefile.common create mode 100644 tools/libs/evtchn/Makefile.common create mode 100644 tools/libs/foreignmemory/Makefile.common create mode 100644 tools/libs/gnttab/Makefile.common create mode 100644 tools/libs/guest/Makefile.common create mode 100644 tools/libs/toolcore/Makefile.common create mode 100644 tools/libs/toollog/Makefile.common diff --git a/stubdom/Makefile b/stubdom/Makefile index fba4c977ef..fbc63a5063 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -365,7 +365,7 @@ define BUILD_lib $$(MAKE) -C libs-$$(XEN_TARGET_ARCH)/$(1) clean; \ fi - libs-$$(XEN_TARGET_ARCH)/$(1)/stamp: $$(XEN_ROOT)/tools/libs/$(1)/Makefile + libs-$$(XEN_TARGET_ARCH)/$(1)/stamp: $$(XEN_ROOT)/tools/libs/$(1)/Makefile.common $$(do_links) endef diff --git a/tools/libs/call/Makefile b/tools/libs/call/Makefile index e5cb7c937c..103f5ad360 100644 --- a/tools/libs/call/Makefile +++ b/tools/libs/call/Makefile @@ -4,11 +4,6 @@ include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1 MINOR = 3 -OBJS-y += core.o buffer.o -OBJS-$(CONFIG_Linux) += linux.o -OBJS-$(CONFIG_FreeBSD) += freebsd.o -OBJS-$(CONFIG_SunOS) += solaris.o -OBJS-$(CONFIG_NetBSD) += netbsd.o -OBJS-$(CONFIG_MiniOS) += minios.o +include Makefile.common include $(XEN_ROOT)/tools/libs/libs.mk diff --git a/tools/libs/call/Makefile.common b/tools/libs/call/Makefile.common new file mode 100644 index 0000000000..85e608f8ad --- /dev/null +++ b/tools/libs/call/Makefile.common @@ -0,0 +1,6 @@ +OBJS-y += core.o buffer.o +OBJS-$(CONFIG_Linux) += linux.o +OBJS-$(CONFIG_FreeBSD) += freebsd.o +OBJS-$(CONFIG_SunOS) += solaris.o +OBJS-$(CONFIG_NetBSD) += netbsd.o +OBJS-$(CONFIG_MiniOS) += minios.o diff --git a/tools/libs/ctrl/Makefile b/tools/libs/ctrl/Makefile index df145ba8ec..7bcac0d4b6 100644 --- a/tools/libs/ctrl/Makefile +++ b/tools/libs/ctrl/Makefile @@ -1,50 +1,7 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk -OBJS-y += xc_altp2m.o -OBJS-y += xc_cpupool.o -OBJS-y += xc_domain.o -OBJS-y += xc_evtchn.o -OBJS-y += xc_gnttab.o -OBJS-y += xc_misc.o -OBJS-y += xc_flask.o -OBJS-y += xc_physdev.o -OBJS-y += xc_private.o -OBJS-y += xc_csched.o -OBJS-y += xc_csched2.o -OBJS-y += xc_arinc653.o -OBJS-y += xc_rt.o -OBJS-y += xc_tbuf.o -OBJS-y += xc_pm.o -OBJS-y += xc_cpu_hotplug.o -OBJS-y += xc_vm_event.o -OBJS-y += xc_vmtrace.o -OBJS-y += xc_monitor.o -OBJS-y += xc_mem_paging.o -OBJS-y += xc_mem_access.o -OBJS-y += xc_memshr.o -OBJS-y += xc_hcall_buf.o -OBJS-y += xc_foreign_memory.o -OBJS-y += xc_kexec.o -OBJS-y += xc_resource.o -OBJS-$(CONFIG_X86) += xc_psr.o -OBJS-$(CONFIG_X86) += xc_pagetab.o -OBJS-$(CONFIG_Linux) += xc_linux.o -OBJS-$(CONFIG_FreeBSD) += xc_freebsd.o -OBJS-$(CONFIG_SunOS) += xc_solaris.o -OBJS-$(CONFIG_NetBSD) += xc_netbsd.o -OBJS-$(CONFIG_NetBSDRump) += xc_netbsd.o -OBJS-$(CONFIG_MiniOS) += xc_minios.o -OBJS-y += xc_evtchn_compat.o -OBJS-y += xc_gnttab_compat.o -OBJS-y += xc_devicemodel_compat.o - -CFLAGS += -D__XEN_TOOLS__ -CFLAGS += $(PTHREAD_CFLAGS) -CFLAGS += -include $(XEN_ROOT)/tools/config.h - -# Needed for posix_fadvise64() in xc_linux.c -CFLAGS-$(CONFIG_Linux) += -D_GNU_SOURCE +include Makefile.common LIBHEADER := xenctrl.h xenctrl_compat.h PKG_CONFIG := xencontrol.pc diff --git a/tools/libs/ctrl/Makefile.common b/tools/libs/ctrl/Makefile.common new file mode 100644 index 0000000000..0a09c28fd3 --- /dev/null +++ b/tools/libs/ctrl/Makefile.common @@ -0,0 +1,44 @@ +OBJS-y += xc_altp2m.o +OBJS-y += xc_cpupool.o +OBJS-y += xc_domain.o +OBJS-y += xc_evtchn.o +OBJS-y += xc_gnttab.o +OBJS-y += xc_misc.o +OBJS-y += xc_flask.o +OBJS-y += xc_physdev.o +OBJS-y += xc_private.o +OBJS-y += xc_csched.o +OBJS-y += xc_csched2.o +OBJS-y += xc_arinc653.o +OBJS-y += xc_rt.o +OBJS-y += xc_tbuf.o +OBJS-y += xc_pm.o +OBJS-y += xc_cpu_hotplug.o +OBJS-y += xc_vm_event.o +OBJS-y += xc_vmtrace.o +OBJS-y += xc_monitor.o +OBJS-y += xc_mem_paging.o +OBJS-y += xc_mem_access.o +OBJS-y += xc_memshr.o +OBJS-y += xc_hcall_buf.o +OBJS-y += xc_foreign_memory.o +OBJS-y += xc_kexec.o +OBJS-y += xc_resource.o +OBJS-$(CONFIG_X86) += xc_psr.o +OBJS-$(CONFIG_X86) += xc_pagetab.o +OBJS-$(CONFIG_Linux) += xc_linux.o +OBJS-$(CONFIG_FreeBSD) += xc_freebsd.o +OBJS-$(CONFIG_SunOS) += xc_solaris.o +OBJS-$(CONFIG_NetBSD) += xc_netbsd.o +OBJS-$(CONFIG_NetBSDRump) += xc_netbsd.o +OBJS-$(CONFIG_MiniOS) += xc_minios.o +OBJS-y += xc_evtchn_compat.o +OBJS-y += xc_gnttab_compat.o +OBJS-y += xc_devicemodel_compat.o + +CFLAGS += -D__XEN_TOOLS__ +CFLAGS += $(PTHREAD_CFLAGS) +CFLAGS += -include $(XEN_ROOT)/tools/config.h + +# Needed for posix_fadvise64() in xc_linux.c +CFLAGS-$(CONFIG_Linux) += -D_GNU_SOURCE diff --git a/tools/libs/devicemodel/Makefile b/tools/libs/devicemodel/Makefile index a0a2d24f99..b70dd774e4 100644 --- a/tools/libs/devicemodel/Makefile +++ b/tools/libs/devicemodel/Makefile @@ -4,11 +4,6 @@ include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1 MINOR = 4 -OBJS-y += core.o -OBJS-$(CONFIG_Linux) += common.o -OBJS-$(CONFIG_FreeBSD) += common.o -OBJS-$(CONFIG_SunOS) += compat.o -OBJS-$(CONFIG_NetBSD) += compat.o -OBJS-$(CONFIG_MiniOS) += compat.o +include Makefile.common include $(XEN_ROOT)/tools/libs/libs.mk diff --git a/tools/libs/devicemodel/Makefile.common b/tools/libs/devicemodel/Makefile.common new file mode 100644 index 0000000000..a7bf7c35bb --- /dev/null +++ b/tools/libs/devicemodel/Makefile.common @@ -0,0 +1,6 @@ +OBJS-y += core.o +OBJS-$(CONFIG_Linux) += common.o +OBJS-$(CONFIG_FreeBSD) += common.o +OBJS-$(CONFIG_SunOS) += compat.o +OBJS-$(CONFIG_NetBSD) += compat.o +OBJS-$(CONFIG_MiniOS) += compat.o diff --git a/tools/libs/evtchn/Makefile b/tools/libs/evtchn/Makefile index 8208ecf650..3dad3840c6 100644 --- a/tools/libs/evtchn/Makefile +++ b/tools/libs/evtchn/Makefile @@ -4,11 +4,6 @@ include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1 MINOR = 2 -OBJS-y += core.o -OBJS-$(CONFIG_Linux) += linux.o -OBJS-$(CONFIG_FreeBSD) += freebsd.o -OBJS-$(CONFIG_SunOS) += solaris.o -OBJS-$(CONFIG_NetBSD) += netbsd.o -OBJS-$(CONFIG_MiniOS) += minios.o +include Makefile.common include $(XEN_ROOT)/tools/libs/libs.mk diff --git a/tools/libs/evtchn/Makefile.common b/tools/libs/evtchn/Makefile.common new file mode 100644 index 0000000000..20629f521a --- /dev/null +++ b/tools/libs/evtchn/Makefile.common @@ -0,0 +1,6 @@ +OBJS-y += core.o +OBJS-$(CONFIG_Linux) += linux.o +OBJS-$(CONFIG_FreeBSD) += freebsd.o +OBJS-$(CONFIG_SunOS) += solaris.o +OBJS-$(CONFIG_NetBSD) += netbsd.o +OBJS-$(CONFIG_MiniOS) += minios.o diff --git a/tools/libs/foreignmemory/Makefile b/tools/libs/foreignmemory/Makefile index 4427435932..b70dd774e4 100644 --- a/tools/libs/foreignmemory/Makefile +++ b/tools/libs/foreignmemory/Makefile @@ -4,11 +4,6 @@ include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1 MINOR = 4 -OBJS-y += core.o -OBJS-$(CONFIG_Linux) += linux.o -OBJS-$(CONFIG_FreeBSD) += freebsd.o -OBJS-$(CONFIG_SunOS) += compat.o solaris.o -OBJS-$(CONFIG_NetBSD) += netbsd.o -OBJS-$(CONFIG_MiniOS) += minios.o +include Makefile.common include $(XEN_ROOT)/tools/libs/libs.mk diff --git a/tools/libs/foreignmemory/Makefile.common b/tools/libs/foreignmemory/Makefile.common new file mode 100644 index 0000000000..ff3b1d4f3e --- /dev/null +++ b/tools/libs/foreignmemory/Makefile.common @@ -0,0 +1,6 @@ +OBJS-y += core.o +OBJS-$(CONFIG_Linux) += linux.o +OBJS-$(CONFIG_FreeBSD) += freebsd.o +OBJS-$(CONFIG_SunOS) += compat.o solaris.o +OBJS-$(CONFIG_NetBSD) += netbsd.o +OBJS-$(CONFIG_MiniOS) += minios.o diff --git a/tools/libs/gnttab/Makefile b/tools/libs/gnttab/Makefile index 7d7aeeadff..3dad3840c6 100644 --- a/tools/libs/gnttab/Makefile +++ b/tools/libs/gnttab/Makefile @@ -4,13 +4,6 @@ include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1 MINOR = 2 -OBJS-GNTTAB += gnttab_core.o -OBJS-GNTSHR += gntshr_core.o - -OBJS-$(CONFIG_Linux) += $(OBJS-GNTTAB) $(OBJS-GNTSHR) linux.o -OBJS-$(CONFIG_MiniOS) += $(OBJS-GNTTAB) gntshr_unimp.o minios.o -OBJS-$(CONFIG_FreeBSD) += $(OBJS-GNTTAB) $(OBJS-GNTSHR) freebsd.o -OBJS-$(CONFIG_NetBSD) += $(OBJS-GNTTAB) $(OBJS-GNTSHR) netbsd.o -OBJS-$(CONFIG_SunOS) += gnttab_unimp.o gntshr_unimp.o +include Makefile.common include $(XEN_ROOT)/tools/libs/libs.mk diff --git a/tools/libs/gnttab/Makefile.common b/tools/libs/gnttab/Makefile.common new file mode 100644 index 0000000000..759e36e1cb --- /dev/null +++ b/tools/libs/gnttab/Makefile.common @@ -0,0 +1,8 @@ +OBJS-GNTTAB += gnttab_core.o +OBJS-GNTSHR += gntshr_core.o + +OBJS-$(CONFIG_Linux) += $(OBJS-GNTTAB) $(OBJS-GNTSHR) linux.o +OBJS-$(CONFIG_MiniOS) += $(OBJS-GNTTAB) gntshr_unimp.o minios.o +OBJS-$(CONFIG_FreeBSD) += $(OBJS-GNTTAB) $(OBJS-GNTSHR) freebsd.o +OBJS-$(CONFIG_NetBSD) += $(OBJS-GNTTAB) $(OBJS-GNTSHR) netbsd.o +OBJS-$(CONFIG_SunOS) += gnttab_unimp.o gntshr_unimp.o diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile index 62b8fead86..86b2b59650 100644 --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -1,97 +1,11 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk -ifeq ($(CONFIG_LIBXC_MINIOS),y) -# Save/restore of a domain is currently incompatible with a stubdom environment -override CONFIG_MIGRATE := n -endif - -OBJS-y += xg_private.o -OBJS-y += xg_domain.o -OBJS-y += xg_suspend.o -OBJS-y += xg_resume.o -ifeq ($(CONFIG_MIGRATE),y) -OBJS-y += xg_sr_common.o -OBJS-$(CONFIG_X86) += xg_sr_common_x86.o -OBJS-$(CONFIG_X86) += xg_sr_common_x86_pv.o -OBJS-$(CONFIG_X86) += xg_sr_restore_x86_pv.o -OBJS-$(CONFIG_X86) += xg_sr_restore_x86_hvm.o -OBJS-$(CONFIG_X86) += xg_sr_save_x86_pv.o -OBJS-$(CONFIG_X86) += xg_sr_save_x86_hvm.o -OBJS-y += xg_sr_restore.o -OBJS-y += xg_sr_save.o -OBJS-y += xg_offline_page.o -else -OBJS-y += xg_nomigrate.o -endif -OBJS-y += xg_core.o -OBJS-$(CONFIG_X86) += xg_core_x86.o -OBJS-$(CONFIG_ARM) += xg_core_arm.o - -vpath %.c ../../../xen/common/libelf - -LIBELF_OBJS += libelf-tools.o libelf-loader.o -LIBELF_OBJS += libelf-dominfo.o - -OBJS-y += $(LIBELF_OBJS) - -ifeq ($(CONFIG_X86),y) # Add libx86 to the build -vpath %.c ../../../xen/lib/x86 - -OBJS-y += cpuid.o msr.o policy.o -endif - -# new domain builder -OBJS-y += xg_dom_core.o -OBJS-y += xg_dom_boot.o -OBJS-y += xg_dom_elfloader.o -OBJS-$(CONFIG_X86) += xg_dom_bzimageloader.o -OBJS-$(CONFIG_X86) += xg_dom_decompress_lz4.o -OBJS-$(CONFIG_X86) += xg_dom_hvmloader.o -OBJS-$(CONFIG_ARM) += xg_dom_armzimageloader.o -OBJS-y += xg_dom_binloader.o -OBJS-y += xg_dom_compat_linux.o - -OBJS-$(CONFIG_X86) += xg_dom_x86.o -OBJS-$(CONFIG_X86) += xg_cpuid_x86.o -OBJS-$(CONFIG_ARM) += xg_dom_arm.o - -ifeq ($(CONFIG_LIBXC_MINIOS),y) -OBJS-y += xg_dom_decompress_unsafe.o -OBJS-y += xg_dom_decompress_unsafe_bzip2.o -OBJS-y += xg_dom_decompress_unsafe_lzma.o -OBJS-y += xg_dom_decompress_unsafe_lzo1x.o -OBJS-y += xg_dom_decompress_unsafe_xz.o -OBJS-y += xg_dom_decompress_unsafe_zstd.o -endif - -CFLAGS += -D__XEN_TOOLS__ -CFLAGS += -include $(XEN_ROOT)/tools/config.h -CFLAGS += -iquote ../../../xen/common/libelf - -# To be able to include xc_private.h -CFLAGS += -iquote $(XEN_libxenctrl) - -# Needed for posix_fadvise64() in xc_linux.c -CFLAGS-$(CONFIG_Linux) += -D_GNU_SOURCE - -CFLAGS += $(PTHREAD_CFLAGS) -CFLAGS += $(CFLAGS_libxentoollog) -CFLAGS += $(CFLAGS_libxenevtchn) -CFLAGS += $(CFLAGS_libxendevicemodel) - -# libxenguest includes xc_private.h, so needs this despite not using -# this functionality directly. -CFLAGS += $(CFLAGS_libxencall) $(CFLAGS_libxenforeignmemory) - -ifeq ($(CONFIG_MiniOS),y) -ZLIB_CFLAGS := -ZLIB_LIBS := -endif +include Makefile.common xg_dom_bzimageloader.o xg_dom_bzimageloader.opic: CFLAGS += $(ZLIB_CFLAGS) -$(LIBELF_OBJS) $(LIBELF_OBJS:.o=.opic): CFLAGS += -Wno-pointer-sign +$(LIBELF_OBJS:.o=.opic): CFLAGS += -Wno-pointer-sign LIBHEADER := xenguest.h diff --git a/tools/libs/guest/Makefile.common b/tools/libs/guest/Makefile.common new file mode 100644 index 0000000000..a026a2f662 --- /dev/null +++ b/tools/libs/guest/Makefile.common @@ -0,0 +1,84 @@ +ifeq ($(CONFIG_LIBXC_MINIOS),y) +# Save/restore of a domain is currently incompatible with a stubdom environment +override CONFIG_MIGRATE := n +endif + +OBJS-y += xg_private.o +OBJS-y += xg_domain.o +OBJS-y += xg_suspend.o +OBJS-y += xg_resume.o +ifeq ($(CONFIG_MIGRATE),y) +OBJS-y += xg_sr_common.o +OBJS-$(CONFIG_X86) += xg_sr_common_x86.o +OBJS-$(CONFIG_X86) += xg_sr_common_x86_pv.o +OBJS-$(CONFIG_X86) += xg_sr_restore_x86_pv.o +OBJS-$(CONFIG_X86) += xg_sr_restore_x86_hvm.o +OBJS-$(CONFIG_X86) += xg_sr_save_x86_pv.o +OBJS-$(CONFIG_X86) += xg_sr_save_x86_hvm.o +OBJS-y += xg_sr_restore.o +OBJS-y += xg_sr_save.o +OBJS-y += xg_offline_page.o +else +OBJS-y += xg_nomigrate.o +endif +OBJS-y += xg_core.o +OBJS-$(CONFIG_X86) += xg_core_x86.o +OBJS-$(CONFIG_ARM) += xg_core_arm.o + +vpath %.c ../../../xen/common/libelf + +LIBELF_OBJS += libelf-tools.o libelf-loader.o +LIBELF_OBJS += libelf-dominfo.o + +OBJS-y += $(LIBELF_OBJS) + +ifeq ($(CONFIG_X86),y) # Add libx86 to the build +vpath %.c ../../../xen/lib/x86 + +OBJS-y += cpuid.o msr.o policy.o +endif + +# new domain builder +OBJS-y += xg_dom_core.o +OBJS-y += xg_dom_boot.o +OBJS-y += xg_dom_elfloader.o +OBJS-$(CONFIG_X86) += xg_dom_bzimageloader.o +OBJS-$(CONFIG_X86) += xg_dom_decompress_lz4.o +OBJS-$(CONFIG_X86) += xg_dom_hvmloader.o +OBJS-$(CONFIG_ARM) += xg_dom_armzimageloader.o +OBJS-y += xg_dom_binloader.o +OBJS-y += xg_dom_compat_linux.o + +OBJS-$(CONFIG_X86) += xg_dom_x86.o +OBJS-$(CONFIG_X86) += xg_cpuid_x86.o +OBJS-$(CONFIG_ARM) += xg_dom_arm.o + +ifeq ($(CONFIG_LIBXC_MINIOS),y) +OBJS-y += xg_dom_decompress_unsafe.o +OBJS-y += xg_dom_decompress_unsafe_bzip2.o +OBJS-y += xg_dom_decompress_unsafe_lzma.o +OBJS-y += xg_dom_decompress_unsafe_lzo1x.o +OBJS-y += xg_dom_decompress_unsafe_xz.o +OBJS-y += xg_dom_decompress_unsafe_zstd.o +endif + +CFLAGS += -D__XEN_TOOLS__ +CFLAGS += -include $(XEN_ROOT)/tools/config.h +CFLAGS += -iquote ../../../xen/common/libelf + +# To be able to include xc_private.h +CFLAGS += -iquote $(XEN_libxenctrl) + +# Needed for posix_fadvise64() in xc_linux.c +CFLAGS-$(CONFIG_Linux) += -D_GNU_SOURCE + +CFLAGS += $(PTHREAD_CFLAGS) +CFLAGS += $(CFLAGS_libxentoollog) +CFLAGS += $(CFLAGS_libxenevtchn) +CFLAGS += $(CFLAGS_libxendevicemodel) + +# libxenguest includes xc_private.h, so needs this despite not using +# this functionality directly. +CFLAGS += $(CFLAGS_libxencall) $(CFLAGS_libxenforeignmemory) + +$(LIBELF_OBJS): CFLAGS += -Wno-pointer-sign diff --git a/tools/libs/toolcore/Makefile b/tools/libs/toolcore/Makefile index 360a10e5da..5b81814e52 100644 --- a/tools/libs/toolcore/Makefile +++ b/tools/libs/toolcore/Makefile @@ -3,19 +3,13 @@ include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1 MINOR = 0 -AUTOINCS := $(XEN_INCLUDE)/_xentoolcore_list.h LIBHEADER := xentoolcore.h -OBJS-y += handlereg.o +include Makefile.common include $(XEN_ROOT)/tools/libs/libs.mk PKG_CONFIG_DESC := Central support for Xen Hypervisor userland libraries -$(OBJS-y): $(AUTOINCS) $(PIC_OBJS): $(AUTOINCS) - -$(XEN_INCLUDE)/_xentoolcore_list.h: $(XEN_INCLUDE)/xen-external/bsd-sys-queue-h-seddery $(XEN_INCLUDE)/xen-external/bsd-sys-queue.h - $(PERL) $^ --prefix=xentoolcore >$(notdir $@).new - $(call move-if-changed,$(notdir $@).new,$@) diff --git a/tools/libs/toolcore/Makefile.common b/tools/libs/toolcore/Makefile.common new file mode 100644 index 0000000000..4d6c7687f8 --- /dev/null +++ b/tools/libs/toolcore/Makefile.common @@ -0,0 +1,9 @@ +OBJS-y += handlereg.o + +AUTOINCS := $(XEN_INCLUDE)/_xentoolcore_list.h + +$(OBJS-y): $(AUTOINCS) + +$(XEN_INCLUDE)/_xentoolcore_list.h: $(XEN_INCLUDE)/xen-external/bsd-sys-queue-h-seddery $(XEN_INCLUDE)/xen-external/bsd-sys-queue.h + $(PERL) $^ --prefix=xentoolcore >$(notdir $@).new + $(call move-if-changed,$(notdir $@).new,$@) diff --git a/tools/libs/toollog/Makefile b/tools/libs/toollog/Makefile index c09aa02ba5..2361b8cbf1 100644 --- a/tools/libs/toollog/Makefile +++ b/tools/libs/toollog/Makefile @@ -4,7 +4,6 @@ include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1 MINOR = 0 -OBJS-y += xtl_core.o -OBJS-y += xtl_logger_stdio.o +include Makefile.common include $(XEN_ROOT)/tools/libs/libs.mk diff --git a/tools/libs/toollog/Makefile.common b/tools/libs/toollog/Makefile.common new file mode 100644 index 0000000000..c053ac6a73 --- /dev/null +++ b/tools/libs/toollog/Makefile.common @@ -0,0 +1,2 @@ +OBJS-y += xtl_core.o +OBJS-y += xtl_logger_stdio.o From patchwork Mon Dec 6 17:02:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659067 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6D274C433FE for ; Mon, 6 Dec 2021 17:09:14 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239538.415536 (Exim 4.92) (envelope-from ) id 1muHU9-0001Dw-ES; Mon, 06 Dec 2021 17:09:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239538.415536; Mon, 06 Dec 2021 17:09:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHU7-00015k-Vb; Mon, 06 Dec 2021 17:09:03 +0000 Received: by outflank-mailman (input) for mailman id 239538; Mon, 06 Dec 2021 17:09:00 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHQ2-0005ta-19 for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:50 +0000 Received: from esa1.hc3370-68.iphmx.com (esa1.hc3370-68.iphmx.com [216.71.145.142]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 9de2d1a9-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:04:49 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9de2d1a9-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810288; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TRgfprArJiMn7DHfVSl2ZO32FkfcY3fIM9au9u7h+C8=; b=Ae7pEEwaDCij3PCSLcwxgt/gbCox+XhaoJ1tATux5kxoxLJi9AONo16b TctbhNcLMvX85LPRmf1f1nYldCRQW7b+DNByLWAzmAxgSQbRHOM3xQsZ4 0Ix6XvVy44Cdpsd2yRpwboTrbQ8sbZOogvnNrL1DIDJEGTmkbdq+gtbpd s=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: AG/RYGxOdGeT1KPb7BH6o2MK689W9LDGxCwOyK2xPWwW1dFft0tUVE1q8fB6mslsLNYg7nzv9F R1bKxMymAgmlc7/k8SCO0ShxIeglfqvAcP7PwapiVpU+iWL1LvC5C8deF5WDlwPwCPmClpO+96 3DCy2APEQNJDgwSZy5iyY/AfROnQ/ac/F6K1VpGIktLSbDhZ9YVf13t5DCwCC5GiJ7XWqO1IrR XuaKT5RUj/uvRN0tn39ERJuTmb4WvrDY5SgxMZ6MKbNzxckewEpzgWx3VhUoyW9pNAbde7UdVL VCOEhIHrp78XrUTzXcuRpNuu X-SBRS: 5.1 X-MesageID: 59766580 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:c917V67A+5WdjtjNkNlUSwxRtK/AchMFZxGqfqrLsTDasY5as4F+v mVNXDuGOKmNazT9c4x+bY63pkkB7MOAxtNhGVY6/yAwHi5G8cbLO4+Ufxz6V8+wwmwvb67FA +E2MISowBUcFyeEzvuV3zyIQUBUjclkfJKlYAL/En03FVAMpBsJ00o5wrdj2tAw27BVPivW0 T/Mi5yHULOa82Yc3lI8s8pvfzs24ZweEBtB1rAPTagjUG32zhH5P7pGTU2FFFPqQ5E8IwKPb 72rIIdVXI/u10xF5tuNyt4Xe6CRK1LYFVDmZnF+A8BOjvXez8CbP2lS2Pc0MC9qZzu1c99Zj +9v7sKtYiEQBqycne9eXjcFLjwjFPgTkFPHCSDXXc27ykTHdz3nwul0DVFwNoodkgp1KTgQr 7pCcmlLN03dwbLtqF64YrAEasALJc/3PIQZqzd4wCvQF/oOSpHfWaTao9Rf2V/cg+gTTKmAO ZdJMVKDajyQQQIIAlhOJ6glkeazg0v6dzRbg1Oa8P9fD2/7k1UqjemF3MDuUsOObdVYmACfv G2u13/wBwwXMJqDyTuP+2+omsfCmzi+XJMVEvu/7PECqF+c3GsIEzUNSEC25/K+jyaWS99Zb kAZ5Ccqhawz71CwCMnwWQWip3yJtQJaXMBfe8Uz7h2NzazFpR6UHGEeQhZObdUnsIk9QjlC/ l6Wnfv5CDp3qrqXRHmBsLCOoluP1TM9dDFYI3VeFE1cvoel8NpbYg/zoshLV5SX1YPoMhfJ+ zHaqSN9iptOsNNW/vDulbzYuA6Eqp/MRw8zwwzYWGO58w90DLKYi5yUBUvztqgZctvAJrWVl D1dwpXFsrhSZX2YvHXVGL1lIV2/2xqS3NQwa3ZLFoJpyTmi8mXLkWt4sGAnfxcB3irplFbUj K7vVeF5ucY70JiCN/Yfj2eN5yICl/KI+TPNDK+8Uza2SsItHDJrBQk3DaJq40jjkVI3jYY0M oqBfMCnAB4yUPo8nGXsFrpHi+F0lkjSIF8/o7ihlXxLNpLEOxaopUotagPSPojVEovayOkqz zqvH5TTkEgOOAEPSiLW7ZQSPTg3wYsTXvjLRzhsXrfbeGJOQTh5Y9eImO9JU9E1zsx9y7aTl lngCxAw9bYKrSCeQel8Qis4M+2HsFcWhS9TABHAyn70gSV+Otj2s/9EH3b1FJF+nNFeITdPZ 6FtU6297j5nE1wrIhwRMsvwqpJMbhOuiV7cNiapemFnLZVhWxbI6pnveQ62rHsCCS++tM0fp by811yEHcpfFlo6VMuGOuiyy16RvGQGnL4gVUX/PdQOKl7n95JnKnKtg6Zvcd0MMxjK2hCTy x2SXUUDveDIroJsqIvJiKmIop2HCex7GkYGTWDX4azvbXvR/3a5wJ8GW+GNJGiPWGTx8aSkR ONU0/Cjb6FXwAcU69JxSu85w7g/6t3jo65h4j5lRHibPU62Dr5AI2Wd2ZUdvKN62bIE6xC9X ViC+4cGNOzRat/lClMYOCEscv+HiaMPgjDX4Pk4fBf66Stw8ObVWEleJUDR2ilULb8zO4I52 +Yx/sUR7lXn2BYtN9+HiAFS9niNcSNcA/l26MlCDd+5kBcvx3FDfYfYW33/75y4YtlRNlUnf 22Pj63YirUAnkfPfhLfz5QWMTaxUXjWhC138Q== IronPort-HdrOrdr: A9a23:qUHjW6vrVHF9h3RKqsW01J8X7skDcNV00zEX/kB9WHVpmszxra +TdZMgpHjJYVcqKQgdcL+7WZVoLUmwyXcx2/hyAV7AZniDhILLFuFfBOLZqlWKcREWtNQtsJ uIG5IObuEYZmIVsS+V2mWF+q4bsbq6zJw= X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59766580" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Samuel Thibault , Juergen Gross Subject: [XEN PATCH 55/57] tools/xenstore: introduce Makefile.common to be used by stubdom Date: Mon, 6 Dec 2021 17:02:38 +0000 Message-ID: <20211206170241.13165-56-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Also change stubdom to depends on Makefile.common. Signed-off-by: Anthony PERARD Reviewed-by: Juergen Gross --- stubdom/Makefile | 4 ++-- tools/xenstore/Makefile | 34 +++------------------------------- tools/xenstore/Makefile.common | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 33 deletions(-) create mode 100644 tools/xenstore/Makefile.common diff --git a/stubdom/Makefile b/stubdom/Makefile index fbc63a5063..6b804824ba 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -371,10 +371,10 @@ endef $(foreach lib,$(STUB_LIBS),$(eval $(call BUILD_lib,$(lib)))) -xenstore/stamp: $(XEN_ROOT)/tools/xenstore/Makefile +xenstore/stamp: $(XEN_ROOT)/tools/xenstore/Makefile.common $(do_links) -xenstorepvh/stamp: $(XEN_ROOT)/tools/xenstore/Makefile +xenstorepvh/stamp: $(XEN_ROOT)/tools/xenstore/Makefile.common $(do_links) LINK_DIRS := xenstore xenstorepvh $(foreach dir,$(STUB_LIBS),libs-$(XEN_TARGET_ARCH)/$(dir)) diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 7fe1d9c1e2..a6fc917b81 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -1,36 +1,11 @@ XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk +include Makefile.common + MAJOR = 3.0 MINOR = 3 -CFLAGS += -Werror -# Include configure output (config.h) -CFLAGS += -include $(XEN_ROOT)/tools/config.h -CFLAGS += -I./include -CFLAGS += $(CFLAGS_libxenevtchn) -CFLAGS += $(CFLAGS_libxenctrl) -CFLAGS += $(CFLAGS_libxenguest) -CFLAGS += $(CFLAGS_libxentoolcore) -CFLAGS += -DXEN_LIB_STORED="\"$(XEN_LIB_STORED)\"" -CFLAGS += -DXEN_RUN_STORED="\"$(XEN_RUN_STORED)\"" - -ifdef CONFIG_STUBDOM -CFLAGS += -DNO_SOCKETS=1 -endif - -XENSTORED_OBJS-y := xenstored_core.o xenstored_watch.o xenstored_domain.o -XENSTORED_OBJS-y += xenstored_transaction.o xenstored_control.o -XENSTORED_OBJS-y += xs_lib.o talloc.o utils.o tdb.o hashtable.o - -XENSTORED_OBJS-$(CONFIG_Linux) += xenstored_posix.o -XENSTORED_OBJS-$(CONFIG_SunOS) += xenstored_solaris.o xenstored_posix.o xenstored_probes.o -XENSTORED_OBJS-$(CONFIG_NetBSD) += xenstored_posix.o -XENSTORED_OBJS-$(CONFIG_FreeBSD) += xenstored_posix.o -XENSTORED_OBJS-$(CONFIG_MiniOS) += xenstored_minios.o - -$(XENSTORED_OBJS-y): CFLAGS += $(CFLAGS_libxengnttab) - xenstored: LDLIBS += $(LDLIBS_libxenevtchn) xenstored: LDLIBS += $(LDLIBS_libxengnttab) xenstored: LDLIBS += $(LDLIBS_libxenctrl) @@ -81,9 +56,6 @@ endif xenstored: $(XENSTORED_OBJS-y) $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ $(APPEND_LDFLAGS) -xenstored.a: $(XENSTORED_OBJS-y) - $(AR) cr $@ $^ - $(CLIENTS): xenstore ln -f xenstore $@ @@ -97,7 +69,7 @@ xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o $(CC) $(LDFLAGS) $^ -o $@ $(APPEND_LDFLAGS) .PHONY: clean -clean: +clean:: rm -f *.a *.o xenstored_probes.h rm -f $(TARGETS) $(RM) $(DEPS_RM) diff --git a/tools/xenstore/Makefile.common b/tools/xenstore/Makefile.common new file mode 100644 index 0000000000..49002651a1 --- /dev/null +++ b/tools/xenstore/Makefile.common @@ -0,0 +1,34 @@ +# Makefile shared with stubdom + +XENSTORED_OBJS-y := xenstored_core.o xenstored_watch.o xenstored_domain.o +XENSTORED_OBJS-y += xenstored_transaction.o xenstored_control.o +XENSTORED_OBJS-y += xs_lib.o talloc.o utils.o tdb.o hashtable.o + +XENSTORED_OBJS-$(CONFIG_Linux) += xenstored_posix.o +XENSTORED_OBJS-$(CONFIG_SunOS) += xenstored_solaris.o xenstored_posix.o xenstored_probes.o +XENSTORED_OBJS-$(CONFIG_NetBSD) += xenstored_posix.o +XENSTORED_OBJS-$(CONFIG_FreeBSD) += xenstored_posix.o +XENSTORED_OBJS-$(CONFIG_MiniOS) += xenstored_minios.o + +CFLAGS += -Werror +# Include configure output (config.h) +CFLAGS += -include $(XEN_ROOT)/tools/config.h +CFLAGS += -I./include +CFLAGS += $(CFLAGS_libxenevtchn) +CFLAGS += $(CFLAGS_libxenctrl) +CFLAGS += $(CFLAGS_libxenguest) +CFLAGS += $(CFLAGS_libxentoolcore) +CFLAGS += -DXEN_LIB_STORED="\"$(XEN_LIB_STORED)\"" +CFLAGS += -DXEN_RUN_STORED="\"$(XEN_RUN_STORED)\"" + +ifdef CONFIG_STUBDOM +CFLAGS += -DNO_SOCKETS=1 +endif + +$(XENSTORED_OBJS-y): CFLAGS += $(CFLAGS_libxengnttab) + +xenstored.a: $(XENSTORED_OBJS-y) + $(AR) cr $@ $^ + +clean:: + rm -f *.a *.o From patchwork Mon Dec 6 17:02:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659043 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4A29DC433FE for ; Mon, 6 Dec 2021 17:08:46 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239522.415422 (Exim 4.92) (envelope-from ) id 1muHTi-00044A-Nn; Mon, 06 Dec 2021 17:08:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239522.415422; Mon, 06 Dec 2021 17:08:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHTi-00042d-E0; Mon, 06 Dec 2021 17:08:38 +0000 Received: by outflank-mailman (input) for mailman id 239522; Mon, 06 Dec 2021 17:08:37 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHQ3-0005ta-1G for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:51 +0000 Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 9dfbc2af-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:04:49 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9dfbc2af-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810288; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gMyekfXDcNGsX/CAW1bRg9GKSv3KBjGtY1LOz0Cm4h8=; b=XZDnVTNGfvU0yHyLfSFnHg3kJhwyBz0/FrVDHR0671U7CSBF0P6F8al1 SVWXh3Jk9LjDAJ9DqGrWDLwNtQ8QeWgfM43UGXqyL7dqZMCICNtyKAMvH NVAPQT8rxJhm8xVTGjniswl9VypA/wCxKdJ0IYHHXyGjFZhhcoAQWm9hC E=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: ugtc2Lghlgyvw+rhhLlTfiB9+xuEkNj3nNyDf6h/3r+8Jt0zdMzq0hqm5gt+q9edMT8tzqeOKc xKbZo3AteLb6eQae8rcjZhLjOJPJ/v1OvLYRP+vy5kL2eOYuO22FB/y23Kw5YfkSvyCTl8uiJz q+Lo55CZaY4uRHDNyy4cCPfAsh05eVPXkDtfVtBuYTWPPwymD4t3M1whOpYsF8E52CVybJJlN1 keynlX72wBfcdUMStaZF/x659LKdtEjXFgjSszAA+Lm+jAmGHwWR9bTyLz5E/N4UGbnWEPMgIf T8z8YN0xqZFzkyvtIlQvJEvt X-SBRS: 5.1 X-MesageID: 59388058 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:9vOAfK3CqD9bG5ysQPbD5Vd2kn2cJEfYwER7XKvMYLTBsI5bp2APn GQWWmyDb/3eYzb0L4ojPdyx/B5XuZaHyoBnTgFrpC1hF35El5HIVI+TRqvS04J+DSFhoGZPt Zh2hgzodZhsJpPkS5PE3oHJ9RGQ74nRLlbHILOCan8ZqTNMEn970Es5w7Bh2OaEvPDia++zk YKqyyHgEAfNNw5cagr4PIra9XuDFNyr0N8plgRWicJj5TcypFFMZH4rHomjLmOQf2VhNrXSq 9Avbl2O1jixEx8FUrtJm1tgG6EAaua60QOm0hK6V0U+6/TrS+NbPqsTbZIhhUlrZzqhoN1j2 N8X6ZOJeTwyEoOVwsgZSyRFHHQrVUFG0OevzXmXtMWSywvNcmf2wuUoB0YzVWEa0r8pWycUr 6VecW1TKEDY7w616OvTpu1Ej8I/LM7tLcUHt2tp1z3xBvc6W5HTBa7N4Le02R9t15seTa6DN 6L1bxJmN0XkUxxkeWwqAYkOpMijwUCgUCZh/Qf9Sa0fvDGIkV0ZPKLWGMXRUsyHQ4NShEnwj nnP+nn0BlcGNN2VwCeB7lqhgPSKmTL8XsQVDrLQ3v91gnWDy2oLEhoUWFCn5/6jhSaWS99Zb kAZ5Ccqhawz71CwCMnwWQWip3yJtQJaXMBfe8Uz7h2NzazFpR6UHGEeQhZObdUnsIk9QjlC6 7OSt4q3X3o16uTTEC/DsOfPxd+vBcQLBVAPdz8OF1cK2unYu60d10jjSs5eDaHg27UZBgrM6 zyNqSE/gZAagsgKy7i38Dj7vt68mnTaZlVrv1uKBwpJ+is8Pdf4PNLwtTA3+N4ZdN7BJmRtq kTojCR3AAomKZiW3BKAT+wWdF1Cz6bUaWaM6bKD8nRIythMx5JBVd0JiN2dDB0wWirhRdMPS BWJ0e+2zMUMVEZGlYctP+qM5z0ClMAM7+jNWPHOdcZpaZNsbgKB9ywGTRfOhDCyyhlxy/thZ sfznSOQ4ZAyU/4PIN2eHbh17FPW7npmmTO7qW7TkXxLLoZylFbKEOxYYTNin8gy7b+eoRW9z jqsH5Di9vmra8WnOnO/2ddKdTgidCFnbbir+50/XrPSeWJORTB+Y8I9NJt8IuSJaYwOzbyWl px8M2cFoGfCaYrvdV/XNys9Mey3Bv6SbxsTZEQRALph4FB7Ca7H0UvVX8FfkWAP+LMxwPhqY eMCfsncUP1DRi6eo2YWbIXnrZwkfxOu3FrcMy2gaTk5XphhWw2WpYO0IlqxrHEDXnitqM8zg 7y8zQeHE5ANcBtvUZTNY/W1wlLv4XVEwLBuX1HFK8V4cVn39NQ4MDT4i/I6epleKRjKyjaA+ RyRBBMU+bvEr4MvqYGbjqGYtYa5VeB5GxMCTWXc6L+3Mwjc/3aintAcALrZI2iFWTqtqqu4Z OhTw/XtC9E9nQ5H49hmDrJm7aMi/N+z9bVU+RtpQSfQZFOxB7I+fnTfhZtTtrdAz6NysBetX h7d4cFTPLiENZ+3EFMVIwZ5PO2P2etNx2vX5PUxZk77+DV27PyMVkALZ0uAjylULb1UNoI5w Lh+5J5KulLn0hd6YMybii109niXKi1SWqoqgZgWHYv3h1d50VpFe5HdVnf77Zznhw+g6aX2z ut4XJb/uok= IronPort-HdrOrdr: A9a23:hiF2la1wElSBYvc6naLsFwqjBIokLtp133Aq2lEZdPRUGvb3qy nIpoV86faUskdoZJhOo7C90cW7LU80sKQFhLX5Xo3SOzUO2lHYT72KhLGKq1aLdhEWtNQtsZ uIG5IOceEYZmIasS+V2maF+q4bsbu6zJw= X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="59388058" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Samuel Thibault Subject: [XEN PATCH 56/57] stubdom: build xenstore*-stubdom using new Makefile.common Date: Mon, 6 Dec 2021 17:02:39 +0000 Message-ID: <20211206170241.13165-57-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 Makefile.common have everything needed by stubdom, when used with xenlibs.mk, so we don't need "Makefile" anymore. Also, remove DESTDIR for "xenstore" related targets, "xenlibs.mk" doesn't use DESTDIR so its value doesn't matter. Signed-off-by: Anthony PERARD Reviewed-by: Samuel Thibault --- stubdom/Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index 6b804824ba..1fa075b9ad 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -346,8 +346,7 @@ define do_links cd $(dir $@); \ ln -sf $(dir $<)include/*.h include/; \ ln -sf $(dir $<)*.[ch] .; \ - [ -e $(dir $<)Makefile.common ] && ln -sf $(dir $<)Makefile.common . ||:; \ - ln -sf $(dir $<)Makefile . + ln -sf $(dir $<)Makefile.common . touch $@ endef @@ -356,13 +355,11 @@ define BUILD_lib libxen$(1): libs-$$(XEN_TARGET_ARCH)/$(1)/libxen$(1).a libs-$$(XEN_TARGET_ARCH)/$(1)/libxen$(1).a: $$(LIBDEPS_$(1)) $$(LIBDEP_$(1)) libs-$$(XEN_TARGET_ARCH)/$(1)/libxen$(1).a: mk-headers-$$(XEN_TARGET_ARCH) $$(NEWLIB_STAMPFILE) .phony - CPPFLAGS="$$(TARGET_CPPFLAGS)" CFLAGS="$$(TARGET_CFLAGS)" $$(MAKE) CONFIG_LIBXC_MINIOS=y $$(if $$(wildcard $$(@D)/Makefile.common),-f $(CURDIR)/xenlibs.mk) -C $$(@D) $$(@F) + CPPFLAGS="$$(TARGET_CPPFLAGS)" CFLAGS="$$(TARGET_CFLAGS)" $$(MAKE) CONFIG_LIBXC_MINIOS=y -f $(CURDIR)/xenlibs.mk -C $$(@D) $$(@F) clean-libxen$(1): if [ -e libs-$$(XEN_TARGET_ARCH)/$(1)/Makefile.common ]; then \ $$(MAKE) -f $(CURDIR)/xenlibs.mk -C libs-$$(XEN_TARGET_ARCH)/$(1) clean; \ - elif [ -e libs-$$(XEN_TARGET_ARCH)/$(1)/Makefile ]; then \ - $$(MAKE) -C libs-$$(XEN_TARGET_ARCH)/$(1) clean; \ fi libs-$$(XEN_TARGET_ARCH)/$(1)/stamp: $$(XEN_ROOT)/tools/libs/$(1)/Makefile.common @@ -494,7 +491,7 @@ xenstore-minios-config.mk: $(CURDIR)/xenstore-minios.cfg .PHONY: xenstore xenstore: $(CROSS_ROOT) xenstore-minios-config.mk - CPPFLAGS="$(TARGET_CPPFLAGS) $(shell cat xenstore-minios-config.mk)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= -C $@ xenstored.a CONFIG_STUBDOM=y + CPPFLAGS="$(TARGET_CPPFLAGS) $(shell cat xenstore-minios-config.mk)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) -f $(CURDIR)/xenlibs.mk -C $@ xenstored.a CONFIG_STUBDOM=y ############# # xenstorepvh @@ -505,7 +502,7 @@ xenstorepvh-minios-config.mk: $(CURDIR)/xenstorepvh-minios.cfg .PHONY: xenstorepvh xenstorepvh: $(CROSS_ROOT) xenstorepvh-minios-config.mk - CPPFLAGS="$(TARGET_CPPFLAGS) $(shell cat xenstorepvh-minios-config.mk)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= -C $@ xenstored.a CONFIG_STUBDOM=y + CPPFLAGS="$(TARGET_CPPFLAGS) $(shell cat xenstorepvh-minios-config.mk)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) -f $(CURDIR)/xenlibs.mk -C $@ xenstored.a CONFIG_STUBDOM=y ######## # minios @@ -657,8 +654,8 @@ clean: rm -f *-minios-config.mk rm -fr pkg-config -[ ! -d ioemu ] || $(MAKE) DESTDIR= -C ioemu clean - -[ ! -d xenstore ] || $(MAKE) DESTDIR= -C xenstore clean - -[ ! -d xenstorepvh ] || $(MAKE) DESTDIR= -C xenstorepvh clean + -[ ! -d xenstore ] || $(MAKE) -f $(CURDIR)/xenlibs.mk -C xenstore clean + -[ ! -d xenstorepvh ] || $(MAKE) -f $(CURDIR)/xenlibs.mk -C xenstorepvh clean # clean the cross-compilation result .PHONY: crossclean From patchwork Mon Dec 6 17:02:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12659029 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B3625C433EF for ; Mon, 6 Dec 2021 17:08:22 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239510.415331 (Exim 4.92) (envelope-from ) id 1muHTL-0008DV-2k; Mon, 06 Dec 2021 17:08:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239510.415331; Mon, 06 Dec 2021 17:08:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHTK-0008Bh-QC; Mon, 06 Dec 2021 17:08:14 +0000 Received: by outflank-mailman (input) for mailman id 239510; Mon, 06 Dec 2021 17:08:13 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muHQ4-0005ta-1N for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 17:04:52 +0000 Received: from esa4.hc3370-68.iphmx.com (esa4.hc3370-68.iphmx.com [216.71.155.144]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 9ea6bac9-56b6-11ec-a5e1-b9374ead2679; Mon, 06 Dec 2021 18:04:50 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9ea6bac9-56b6-11ec-a5e1-b9374ead2679 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1638810290; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=H1pWpWC+QbCQo3x/OTxy8zwavbLBTT32ayVn9iwZfeQ=; b=avbsSRoktxCkSjZxujgOZN7JBhS//EEnNM2GWvXQjdN6Hfsajc7kGTga 9zfK35AR5exboGp3F7UclZKROfAkgqzFRrWgWCLJSdIJv05JU+tJ9ov0f JTCZz45kUvjbAXnlgJnmAu95Jefi1OvO3eTAGzgQU60TTQGvGifsL8utW g=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: r+J7dNGSsVG/yNJLfBDMBjLnynN8OtCkf/pc8yKPV2Ay0uLBPM3fYM/ytpLczoxpqek3QJThef bxpGAxzoT1Kx94nkLF7+12ypCWeQBAovU1o6sghBVPcsWoY2R0HzHFL7eUjy2w7PXZ26xsfEUn s+2O2CYhhIBi2bfwhLJtguxeoGe9aRIP3LTj2Y4AjjHpg6oK09d4TvXCwa+qNjNO12zRetlvti EiicT2q4lJWg1yMtQCQ554P+3e9L1AqaxSxD67ywBcz87Uos0/tUeuAOamWdHUn4kD8lypVnKF qnL65K1+m6JLmvJIF0eVSgE8 X-SBRS: 5.1 X-MesageID: 61420896 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:w06y9q9QxQDZ1/Um8g9zDrUDBHmTJUtcMsCJ2f8bNWPcYEJGY0x3y WAYXzuHOqyJZ2ukKop0PI60pEhQ7JSBydMwGlBpqHs8E34SpcT7XtnIdU2Y0wF+jyHgoOCLy +1EN7Es+ehtFie0Si9AttENlFEkvU2ybuOU5NXsZ2YhGmeIdA970Ug6wrRh3NYy6TSEK1jlV e3a8pW31GCNg1aYAkpMg05UgEoy1BhakGpwUm0WPZinjneH/5UmJMt3yZWKB2n5WuFp8tuSH I4v+l0bElTxpH/BAvv9+lryn9ZjrrT6ZWBigVIOM0Sub4QrSoXfHc/XOdJFAXq7hQllkPggl osTlJKXZD1yJ+6UgsANCQNaLgBHaPguFL/veRBTsOSWxkzCNXDt3+9vHAc9OohwFuRfWD8Us 6ZCcXZUM07F17neLLGTE4GAguwqKtXrO4UO/Glt1zjDAd4tQIzZQrWM7thdtNs1rp4XQayGN 5tHAdZpRA/GQAAROk8FM4ARtv2xrWH4KDdCmmvA8MLb5ECMlVcsgdABKuH9ZdiiVchT2EGCq Qru5G38HxwecsCfyDCM73awruLJhmb/SYUUUrqi+ZZCgUKR7nweDgUMUlm2quX/jVSxM/pPJ kpR9icwoKwa8E2wUsK7TxC+uGSDvBMXR5xXCeJSwAiL1qrT5RffHmUeRyRNQNMjvc4yAzct0 ze0c8jBXGI19ufPEDTEq+nS/Wja1TUpwXEqNHFaEyoLxPTZ+5hw1gjrXox5EpOUt4igcd3v+ AyioC87jrQVqMcE0aSn4FzK6w6RSoj1oh0dvVuOAD/8hu9tTMv8PtHztwCHhRpVBN/BFgHpg ZQSpySJAAni57mpnTfFfugCFarBCx2tYGyF2g4H83XMGl2QF5+fkWJ4vWgWyKRBaJ9sldrVj Kn741k5CHh7ZiTCUEOPS9jtY/nGNIC5fTgfatjab8BVfr96fxKd8SdlaCa4hj62wBd2wPxlY 8nEIa5A6Er274w9llJaoM9HjtcWKt0WnzuPFfgXMTz5uVZhWJJlYehcawbfBgzIxKiFvB/U4 75i2ziikH1ivBnFSnCPq+Y7dAlSRVBiXMyeg5EHJ4arf1s9cEl8WqC5/F/UU9E890ijvryTp S/Vt44x4AeXuEAr3i3WMC0+M+22As4kxZ/5VAR1VWuVN7EYSd7HxM8im1EfJtHLLcRvkqx5S ecrYcKFDqgdQzjL4W1FP5L8sJZjZFKgggfXZ3ipZz02fphBQQ3V+4C7IluzpXdWVifn59Ejp 7CA1x/ARcZRTQpVE8uLOumkyEm8vCZBlbsqDVfIONRaZG7l7JNud37qlvYyLsxVcUfDyzKW2 hy4GxAdoeWR8YY5/MOQ3fKPrpuzEvs4FU1fRjGJ4bGzPCjc32yi3Y4fD7rYIWGDDDv5ofzwa /9UwvfwNOw8sGxL64csQax2ya8e5sf0o+MIxApTA3iWPU+gDaltIyfa0JAX5LFN3LJQpSC/R lmLpotBIbyMNc7oTAwRKQ4iYrjR3P0YgGCPv/E8IUG87y5r5ruXF05VOkDU2iBaKbJ0NqIjw Psg55FKu1Du1EJyP4bUlD1Q+kSNMmcEAvcuuZwtCYP2jhYmlwNZapvGBy6quJyCZr2g6KXxz uN4UEYau4lh+w== IronPort-HdrOrdr: A9a23:ILF63arvXBiiqAt6UhSp/a0aV5oheYIsimQD101hICG8cqSj+P xG+85rsCMc6QxhP03I9urgBEDtex7hHP1OkOss1NWZPDUO0VHAROoJ0WKL+UyFJ8SUzIBgPM lbH5SWcOeAbmRHsQ== X-IronPort-AV: E=Sophos;i="5.87,292,1631592000"; d="scan'208";a="61420896" From: Anthony PERARD To: CC: Anthony PERARD , Anthony PERARD , Ian Jackson , Wei Liu , Samuel Thibault Subject: [XEN PATCH 57/57] stubdom: xenlibs linkfarm, ignore non-regular files Date: Mon, 6 Dec 2021 17:02:40 +0000 Message-ID: <20211206170241.13165-58-anthony.perard@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206170241.13165-1-anthony.perard@citrix.com> References: <20211206170241.13165-1-anthony.perard@citrix.com> MIME-Version: 1.0 When we will convert tools/ build system, their will be a need to replace some use of "vpath". This will done making symbolic links. Those symlinks are not wanted by stubdom build system when making a linkfarm for the Xen libraries. To avoid them, we will use `find` instead of plain shell globbing. For example, there will be a link to "xen/lib/x86/cpuid.o" in "tools/libs/guest/". Signed-off-by: Anthony PERARD Reviewed-by: Samuel Thibault --- stubdom/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index 1fa075b9ad..b312f710cd 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -345,7 +345,7 @@ define do_links mkdir -p $(dir $@)include cd $(dir $@); \ ln -sf $(dir $<)include/*.h include/; \ - ln -sf $(dir $<)*.[ch] .; \ + find $(dir $<) -maxdepth 1 -type f -name '*.[ch]' -exec ln -sf {} . \; ; \ ln -sf $(dir $<)Makefile.common . touch $@ endef