From patchwork Thu Sep 14 10:10:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naohiro Aota X-Patchwork-Id: 9952679 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BD6D8602C9 for ; Thu, 14 Sep 2017 10:11:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BDC5028E48 for ; Thu, 14 Sep 2017 10:11:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B147928E58; Thu, 14 Sep 2017 10:11:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A75E28E49 for ; Thu, 14 Sep 2017 10:11:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751465AbdINKLt (ORCPT ); Thu, 14 Sep 2017 06:11:49 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:31602 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751268AbdINKLs (ORCPT ); Thu, 14 Sep 2017 06:11:48 -0400 X-IronPort-AV: E=Sophos;i="5.42,392,1500912000"; d="scan'208";a="153367280" Received: from mail-co1nam03lp0015.outbound.protection.outlook.com (HELO NAM03-CO1-obe.outbound.protection.outlook.com) ([216.32.181.15]) by ob1.hgst.iphmx.com with ESMTP; 14 Sep 2017 18:10:52 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=pr1YNHscX3aA8BQyRyXxZdBndLkrX5oSk13yeQ8FiGw=; b=H3SoNtEKgNhzI+KrB3b+f4EG1vVXvmGz5olIDbk9wcK7wN6l/OnXbFp4KMUIBYB3QPKJ/8zOcIXvfJWzl6eKHqSBpxeYLx3NknWKFEAFMpxFp6KaFHTk9IKpqMkUdFXO+TxyxizirnlmH1a21esZxM6Draz+SngXLKa0TjW2T/4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Naohiro.Aota@wdc.com; Received: from naota.dhcp.fujisawa.hgst.com (199.255.44.171) by CY4PR04MB0662.namprd04.prod.outlook.com (10.172.136.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.35.12; Thu, 14 Sep 2017 10:10:50 +0000 Subject: [PATCH 1/2] btrfs-progs: build: generate all dependency files From: Naohiro Aota To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.com Date: Thu, 14 Sep 2017 19:10:46 +0900 Message-ID: <150538384653.24503.41288304442819820.stgit@naota.dhcp.fujisawa.hgst.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: MWHPR2201CA0035.namprd22.prod.outlook.com (10.174.164.48) To CY4PR04MB0662.namprd04.prod.outlook.com (10.172.136.147) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eaae768f-08e8-480c-d82f-08d4fb58e0d3 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(48565401081)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY4PR04MB0662; X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0662; 3:Z/N+Kf2/VEew/bwsUbSgKee8GSpjihHbqheyOJYMKz9N5/728ToDRdiRz6tgpFXjbn28Cpfxv0ggkdgddrjxi5OKv6ayliXijeKOmg4akzBRMDnB4UokmfNPsBhpam23ewJodyZmBCry0KTh8ec9GZV2xJOf2ZMIPxF1z7HWGlJugZ1xYTjtMzkUGegLa+ln/XITqs+Cq/51GZ6083Ang8ccRmosF+Vu/tVYdm9AndOVv/U5x8dH/hbDifWTUhOU; 25:EwTLs3nMrwHu4tgLhnw8pi1+DUdSPBKoi7bSOxMGbZ4BNBpsneYTIFuZQzR0TWv82eiiu3t/p+qTVzozl/HN95mBWr9yZbzJCmH31DGkS9/iaG3eFXnH2GHeEXpMRibljJV/7u80Om16H9IVSmaumwDlbWT5G1p9LCCZ3hfptlGJiGB2X3zF+bqgatXLn91QWjKcPo1b8X5rhdcpiePRumb+GV02+Uxy+TDbCGbIRyiJYielj4nLVIX/JORmQjfk0GWLhIy9/yR1E5GOP86XIHkHCXxsb43wLnyGFEwgjHo80SSzrRLQSjKufjJDlW5OMXZR7a7yZuDeF9O2z1Rh9Q==; 31:Ohx18hJpLe7tY484qqxyx473uOvA3f2ku3yMerPnLeiZeIjt0LHzK1b0fIMftdyufBawE4NqCv/uP1xxdClxijG0wuBfwv/bqhXxqKb8twzSZGW4nkmbpyIHJfztMdcx2oKXWo2m5GwBezlDH6hTLVzJ77RlTiLwHqYcRulvV21mJKoQQNrwee5NGCVZGmkzjKainTIAk/tw5bjtSUhDhrQpMkq4ty/MWAOMeZlP3ng= X-MS-TrafficTypeDiagnostic: CY4PR04MB0662: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0662; 20:3V0Z5YQin5RLNHWSdi9INlbe5YlGeBDcivnSCyVkdZ5vOdMV1GlZeB6dr1KRAricnQrpoHdfslEm8PV/9/ATaJX7M5YNjhudQbaH2XEdk74/yQzCKsi1VW/ZY3Xb35rw9TrLZohOJCC3Gzur+Rm53n5g8pSnmkBv4axOeTDjq+qvTLOguDcKb011CTTP13AAReYTGDT27hCkyOtlFq6yxYVn3+lNmQCTUXmIFPqR1yNuoAgHmH/EOkve6Wz5AJ/NxWX3l7OWZVpqlX85UJgjjk9g3qk4gajhHNF5nnX7I3g9k/vbgW6cuID53Toc18f5A4Nj7PqcPIG34HkK4IVmMlcMkODLCMmM602mEypQ/8aj3N9rKzIKyVBj5kc57XVtZpna1+KQs6/cfW3fh06Wg3iziN0kG7h24bdzYkq+p70yduGv/M8EGLwqRBzX0xKLBcVYD7zdusLyEHFyMQJFrfAA6QHsgf/WA3yvT06dp55CCiQVI4ra3drGqnPRyflj; 4:jwCh92XclnnuFMSS5n48z8QOyDWAmlk4iA5/OdAfa875UYAgvxR34csP3JbRJ+L3Yq4K0yewEoTga51jY39vHJRBX7tBY426HrjH4L0tBfgRqNzkKtR/7fMfnV2QZgpDSKnreLL/I+NKC8K70wqqONrCLzPYisxWiB8wiN1FnRnshG3T8pUMVB+fXrVkFLJ7dOqDbuLTP3fjIpv4QR+Vc68ngqOsQZ2EdeZONgeLWOW4tQLDfawICNI96kbWVn8g X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(100000703101)(100105400095)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123560025)(20161123555025)(20161123564025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR04MB0662; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR04MB0662; X-Forefront-PRVS: 0430FA5CB7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(39860400002)(346002)(376002)(377424004)(199003)(189002)(86362001)(81166006)(2361001)(81156014)(50466002)(8676002)(230700001)(7736002)(53936002)(5660300001)(55016002)(6506006)(305945005)(103116003)(9686003)(4001350100001)(110136004)(68736007)(33646002)(4326008)(23676002)(478600001)(189998001)(6116002)(3846002)(25786009)(83506001)(8936002)(97736004)(54356999)(50986999)(101416001)(2351001)(105586002)(6916009)(66066001)(47776003)(16526017)(72206003)(316002)(6666003)(106356001)(2906002); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR04MB0662; H:naota.dhcp.fujisawa.hgst.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: wdc.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTRQUjA0TUIwNjYyOzIzOjhoRy9TaDYwRUl0L0tacXBTVlVaOUxQTWlG?= =?utf-8?B?NDRBWVJXWjNEdFhwSFFvdlljWTV4SmFaR1l3YlV5NmF3TVZneUNDUEc1blBF?= =?utf-8?B?dTZvMkxCS1hMZW1Fb1FWVWt3ckVnNDR2YXFQR3dLdGhtRVNSR0hlNnVpNWVJ?= =?utf-8?B?aXhwQ2tHSC9ReDQwdW5peERDU2VIcFVWWjBoS0pPa1pTYTljZzluZjQ2dzIx?= =?utf-8?B?bWtYSFY2bVRWc1FtNkpDdWpmdlBsM2N2T1hWNU5wTjY2bFhmZ1Q5eWJRc2Vl?= =?utf-8?B?NFN3L0t5YVNVZ3RjRFdvaGluS1lDdVY1UkI1aytnaU93QzZ6WjVQVzNVMXc2?= =?utf-8?B?UVBBc2RZRXNnaEVOU080Q0xLUmU5dkRwdlphNWZBME9ldDZzTDk4bVg5MFEx?= =?utf-8?B?UldmWjEvRElQUzVVR1lRbU1JUXpTc0ZLeFR3Rm9XMGZZVTBBYnVkWC9DM2d0?= =?utf-8?B?N3hIbkVHSnppT2lacVl6ejY3RjRLemZpemN0Y0R6SmZrVkRXKzdha29HWXZZ?= =?utf-8?B?Y1dDbk5yYUZZUGc1QTZtTTB4Z2toZ2V2Unp5cFBTdGxsQUQxeXlOMDJKSW83?= =?utf-8?B?UjJReXU1Qkl5bEtPdCtLYUxldWhLS0pyMjk5V0p6Tm1sdkRGQlp2dDA5TVlJ?= =?utf-8?B?cjdkNXo4UmlGV1dDQXlUd3ZTcXNBaFpXWWVsZFRTWHhMdFpWUE9pWEtXTklj?= =?utf-8?B?cXk3ODZxQTNEVlU5UDFLcWJMdDBzSW5tZzl2TEJXMmMzY2lZNVRtd1RjWVJM?= =?utf-8?B?UjIrZVU3dmlZbHlxUXAyZU1yNEQ2bXN1dXc2M2p0UWh4UDAyVFlzWERCT05K?= =?utf-8?B?UW1temJXcHc0Ym11dFg0YVNCeEtWWlU1d2YwWUR3YkN1cDBteDFENzd4RHJm?= =?utf-8?B?YVFuWFk3Mkx3MU9NT3M1Sk1Dbk1kbW80Y1cyRU9VMWszTGppWmtyUFo0K1FV?= =?utf-8?B?a0dqU0ZhY3Nvd25vMytBNU1SRmJ5RnJYYmJON1dIYXQ5YTBLUXQyU2k4UktH?= =?utf-8?B?N3d4OHQ4Nnc0MlhaWE5YQWx0WnRVbU5vRHBKZ1pFNVZkQkhtYm1taFFOcFgv?= =?utf-8?B?M2VMbEhTUytPd0xvYllGZmRHY3A2ZnNhbzAyK2MxcTQzSXVtdEpVMGlGU2Vy?= =?utf-8?B?b1BuekZlOVRQTi9uZGJvVTlPcEZnN2lTVmdZbEpia0k2YlJ2OVFOMDRGVW1I?= =?utf-8?B?ZExIZE1BSXY1ZUpvNUFMblNFUTlGNkFjL01uVks5N2cyZ0kyZTZ0ZHQ1UUZ3?= =?utf-8?B?MGZ5YzRieGVwbkRSdXdIR3YyMHcrckdCNGpBVmNTUHZuZmhXOWQvbkUzNTFz?= =?utf-8?B?UnJJejFEcjJmcVdpNGpKTjYrQzlYclRzUVA2K0JUbEdkV1dPMDRZYjF0QUpI?= =?utf-8?B?UUMyV3ZNOTY0Y29zUTF6V2duanlFQVNtRUJQSUtqc2FYMmN2TG0xUFJzWTBH?= =?utf-8?B?OGVBenRRWksxOXJOM2FmcU04MGwzZEYwbCtDeWNucmR5VyswSHlFMFZjVjVE?= =?utf-8?B?N2pWR3hKay93ZWhHUSszSlRJMXRrSXh0VENrQmdoVjRGTTZhY3p0Q00rQWlE?= =?utf-8?Q?vYekV9kavVLoojciUr0EmKlnwId5GsFUL1guxDOzOOyI=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0662; 6:Nf6Foi4XZdqSpbKQXPh8EMyDmFtTNoBpmuUX5i2KrrlwpPOASKAX+YftmNMJm+d/kXeZc2FOqdlZIjO45GrZL4D6qAfatltwSGKiGRgID/SvSokTMwhlYzAgnJYr0v2SRuI9YmLlCq2sMf6zv9iidGgD2fIHXrHa895MCPrZfrGlXgZ0CoI04TAVeVy/XrtXX8yWzEIdFVOE7TCObWffdolzw/lcB5Gqe43c8p7RfWFrm7NyCpPIszgDwx3ccuy6KIeiwUPMBp0+0tt9w1q0mjRHnYMtKsZuOBFRAgVBNYbyAj531CrHLWxyVklmnlCUBqSD+wQePXiWdXsk7c9YEg==; 5:656EdRamsNEl9kcT4K7FRpsGBCGVNv9otL5znpbP4nN8x2XbPdpqwrP4MVIn7TDkQNCm3BYo7axFrGY5ztfSZ/i/8AC7eHHZUMeaYYSOmGgUFsw34WXVy/B6mxYpunNkFlVkDxqbh58CAlhM4ASRgQ==; 24:Z599arGItfAulnvAvbX8W6wvSfH7lcM6+NFvhJQjUs1o47P9fTpsb5H7k1mVEdQdWhTrOnrOpwu755sRpusEfYysIPYjEdGnoXbt00SCZg0=; 7:kIjUTr6+qtDFmFrkuGUX3g2YMpitAft+2Q/a1LKi5S/+pSHuM2qCXElRUojKwWrSY8F8o9XQAP0KvUC6qprUWrxis2HZ8bq86BahYaHgxO8ZbaaWLVJdN5RYd/1xJpiSNmv+dEFEnz2GiH3ciMb63iDXc0/RhQpUTokai4yDX5sKZDFqd/HJFvwJIfFhHicIYbP0VId7pAUbraTT/MZBl0L2dJmb2Cos0mavKQ1UzZU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0662; 20:TxIDG4VUga7nZavg8vf447+LgRJ28eWuOtH3ENe1MdPApMk6X9l8woRsg3aRvIlej3Cl7Vz/Dbhlfg/hoCn9/0Ksh/lH3GmwXByYQz1Wplz9jyCH80kiioaLjG+kGcX+4nj25PQmef5ftwVp5yf2aHYjn3Q9WY5VSBdF1FgNR60= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2017 10:10:50.6870 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB0662 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We're missing several dependency files like: $ diff -u <(find -name '*.o'|cut -d. -f2|sort) <(find -name '*.o.d'|cut -d. -f2|sort) --- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- /proc/self/fd/11 2017-09-14 18:17:44.460564620 +0900 +++ /proc/self/fd/12 2017-09-14 18:17:44.460564620 +0900 @@ -3,7 +3,6 @@ /btrfs-corrupt-block /btrfs-debug-tree /btrfs-find-root -/btrfs-list /btrfs-map-logical /btrfs-select-super /btrfstune @@ -29,11 +28,6 @@ /cmds-scrub /cmds-send /cmds-subvolume -/convert/common -/convert/main -/convert/source-ext2 -/convert/source-fs -/convert/source-reiserfs /ctree /dir-item /disk-io This is due to moving things out of objects and cmds_objects variables. Such missing dependency files cause mis-building of some source files (try touch utils.h; make mkfs/main.o). This patch introduce a new variable "all_objects" to keep all the objects and use the variable to generate proper dependency file building rules. Signed-off-by: Naohiro Aota --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a114eca..c00dff6 100644 --- a/Makefile +++ b/Makefile @@ -121,6 +121,9 @@ libbtrfs_headers = send-stream.h send-utils.h send.h kernel-lib/rbtree.h btrfs-l convert_objects = convert/main.o convert/common.o convert/source-fs.o \ convert/source-ext2.o convert/source-reiserfs.o mkfs_objects = mkfs/main.o mkfs/common.o +image_objects = image/main.o +all_objects = $(objects) $(cmds_objects) $(libbtrfs_objects) $(convert_objects) \ + $(mkfs_objects) $(image_objects) TESTS = fsck-tests.sh convert-tests.sh @@ -591,5 +594,5 @@ uninstall: cd $(DESTDIR)$(bindir); $(RM) -f -- btrfsck fsck.btrfs $(progs_install) ifneq ($(MAKECMDGOALS),clean) --include $(objects:.o=.o.d) $(cmds_objects:.o=.o.d) $(subst .btrfs,, $(filter-out btrfsck.o.d, $(progs:=.o.d))) +-include $(all_objects:.o=.o.d) $(subst .btrfs,, $(filter-out btrfsck.o.d, $(progs:=.o.d))) endif