From patchwork Mon Apr 1 10:36:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ali Alnubani X-Patchwork-Id: 51973 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5F8BC343C; Mon, 1 Apr 2019 12:36:37 +0200 (CEST) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10062.outbound.protection.outlook.com [40.107.1.62]) by dpdk.org (Postfix) with ESMTP id 8519A316B for ; Mon, 1 Apr 2019 12:36:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RlVnxitQYuBaWAlXY65JjR5AhSrjGIcHcai7tcLhqAE=; b=ThpvA/HK5xFxaLYHytMr5v1AisvurOrc+JWkny39pwRsZnA6wjvkAq61li7L1oZ+yvhdEGkZdKgAC7CruMZpeRa6M8XHaBPKKByIuaAyei0pjpxOJzWHgmrDVujxDjZdtPzBPF2+ytACVnq4IT5e31LU5TV/7xF4TAJwZY0zhc8= Received: from AM6PR05MB4405.eurprd05.prod.outlook.com (52.135.163.23) by AM6PR05MB4504.eurprd05.prod.outlook.com (52.135.163.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1750.15; Mon, 1 Apr 2019 10:36:35 +0000 Received: from AM6PR05MB4405.eurprd05.prod.outlook.com ([fe80::edb9:6ee3:cd08:b3f2]) by AM6PR05MB4405.eurprd05.prod.outlook.com ([fe80::edb9:6ee3:cd08:b3f2%6]) with mapi id 15.20.1750.017; Mon, 1 Apr 2019 10:36:35 +0000 From: Ali Alnubani To: "dev@dpdk.org" CC: "bruce.richardson@intel.com" , Thomas Monjalon , "ferruh.yigit@intel.com" Thread-Topic: [PATCH] build: use cat instead of more Thread-Index: AQHU6HbHY7GA6N1YFESzZ72uogVrYw== Date: Mon, 1 Apr 2019 10:36:34 +0000 Message-ID: <20190401103551.28909-1-alialnu@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.19.2 x-clientproxiedby: LO2P265CA0374.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a3::26) To AM6PR05MB4405.eurprd05.prod.outlook.com (2603:10a6:209:44::23) authentication-results: spf=none (sender IP is ) smtp.mailfrom=alialnu@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [37.142.13.130] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 051428d7-2f5b-4326-31a8-08d6b68de9a9 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600139)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB4504; x-ms-traffictypediagnostic: AM6PR05MB4504: x-ms-exchange-purlcount: 1 x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr x-microsoft-antispam-prvs: x-forefront-prvs: 0994F5E0C5 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(396003)(346002)(366004)(376002)(39860400002)(189003)(199004)(106356001)(2501003)(386003)(6116002)(26005)(186003)(102836004)(52116002)(71190400001)(6486002)(2616005)(476003)(2906002)(1076003)(6306002)(486006)(14454004)(68736007)(256004)(966005)(99286004)(305945005)(6506007)(5660300002)(54906003)(4326008)(66066001)(6916009)(6512007)(5640700003)(478600001)(8676002)(97736004)(81156014)(7736002)(81166006)(50226002)(86362001)(8936002)(105586002)(1730700003)(2351001)(6436002)(71200400001)(3846002)(36756003)(53936002)(316002)(25786009); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB4504; H:AM6PR05MB4405.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: prZ/2WMLfrPjA56cUTAwhCmlyM1PIwcbhWLBHfsw0Phl7QY0/qxl2L4SMg8pVW1Odf/r/FAnYnvqvspDhZWNWu7gRVUOglGE9kFYlbzr79VJgxS+0n6WZC/j7oQAe9esEe0Jt98UPyfK4GlKwCLwdf9HAV0EIIh43dEZ75SejmvNzYXBgXejS3JVskuOertIS0dY5f0vxQWHOnzBJeYJoB0WZdO2wsUqvoD6dD3ywH090Pf31rxfNk+DjtsTV24iOY2rE63oiWYCo17dTqrR2lCKXD1QewYBZpN5gY2bsO4JgLxNUaYFCH6OYLdFWwdvrHmW0qlINe7A6XQVJlIEDtzKThfZosYxCmnLQV+3XY7Vfs4TebAQPzBTIb2AbVK84O/CAwos31l8npSb+CNoliatEPhPA3b2KNwn6VKaneA= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 051428d7-2f5b-4326-31a8-08d6b68de9a9 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Apr 2019 10:36:34.9699 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB4504 Subject: [dpdk-dev] [PATCH] build: use cat instead of more X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This is to fix a build error with meson that is caused by using the 'more' command to read the VERSION file. The error: config/meson.build:10:10: ERROR: String '::::::::::::::\nVERSION\n::::::::::::::\n19' cannot be converted to int The command 'more' prints the file name before the actual contents of the file when it's being run without a controlling terminal. This could happen in CI environments. Please refer to: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/tree/text-utils/more.c The cat command can still be found on Windows if the ports of GNU utilities are installed. Fixes: c04172b5f031 ("build: add single source of DPDK version number") Fixes: d320fe56bd51 ("build: use version number from config file") Signed-off-by: Ali Alnubani Acked-by: Thomas Monjalon --- meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meson.build b/meson.build index fa6bf3d07..55aa7c46d 100644 --- a/meson.build +++ b/meson.build @@ -3,8 +3,7 @@ project('DPDK', 'C', # Get version number from file. - # Use "more" rather than "cat" for windows compatibility. - version: run_command('more', files('VERSION')).stdout().strip(), + version: run_command('cat', files('VERSION')).stdout().strip(), license: 'BSD', default_options: ['buildtype=release', 'default_library=static'], meson_version: '>= 0.47.1'