From patchwork Mon Jan 8 14:52:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Schiffer X-Patchwork-Id: 856843 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dcU7GzEf"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zFdmX6jZWz9s0g for ; Tue, 9 Jan 2018 02:02:36 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id:Date:To: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=ftA+22SqN6S74lPVCLDFYm4s1sXYJ7Z88H46pL2jCuk=; b=dcU7GzEfvYbGBR mttJlFZ3urh/diLaZmAWAEHmKGmnSq0NxDDI0lkWDdotOqGcIdFBVNl4A6x3KAGb/u6Ozaxc1boqt qkDdTZehOckxSAS/Yld2ghtFP5ZJfF2ccEDjMOFlo4x+Cu6l6ZCPDJ2iJsYqUWZh236bQoso78rbO i5gR793L+xNmymMPlu/DQoh1DJktwhZoCkG5xgomoUIkB0K2w90R56vJ/cjseQZbg/PvVrqtgm+SD x3RyniRXq3uO48EmA4raKkBr7449VEL0Z27KCClIq5iVyR0P0oGyEGSQfx53fsTsVBGQ/ne+G38Gk pyYRXqOARigzjXDu0E3A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eYYwS-0005Ny-J5; Mon, 08 Jan 2018 15:02:24 +0000 Received: from orthanc.universe-factory.net ([2001:19f0:6c01:100::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eYYtr-0002yU-MH for lede-dev@lists.infradead.org; Mon, 08 Jan 2018 15:00:26 +0000 Received: from avalon.lan (unknown [IPv6:2001:19f0:6c01:100::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by orthanc.universe-factory.net (Postfix) with ESMTPSA id 848692045F; Mon, 8 Jan 2018 15:52:45 +0100 (CET) From: Matthias Schiffer To: lede-dev@lists.infradead.org, openwrt-devel@lists.openwrt.org, jo@mein.io, nbd@nbd.name Date: Mon, 8 Jan 2018 15:52:13 +0100 Message-Id: X-Mailer: git-send-email 2.15.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180108_065944_597338_B4F63128 X-CRM114-Status: UNSURE ( 8.62 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Subject: [LEDE-DEV] [PATCH 00/15] Metadata generator refactoring, cleanup and PROVIDES improvements X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org When attempting to fix FS#837, I decided to treat our metadata generator to a greater refactoring, which resulted in this patchset. FS#837 is fixed in patch 13. I also removed two seemingly obsolete features, "preconfig" and "package features", which are not used by any package in the OpenWrt/LEDE base or our default feeds. The changes in this patchset also improve dependency diagnostics and clearly separate between build depends (on source packages) and runtime depends (on binary packages, implying build depends). This requires some fixes in package Makefiles with broken dependencies (patch 10, [1], [2]). There are also broken runtime depends in many feed packages, which I did not fix, but which will be shown more prominently during prepare-tmpinfo now. I'm not sure what the best way to handle such broken dependencies is, as they might also be caused by missing feeds, e.g. LuCI depending on telephony packages. - Keep the warning, but try to build the packages as before (current solution in this patchset)? - Hide the warning again (old state)? - Ignore packages with missing build dependencies altogether (just show a warning in the metadata generators)? As hinted in patch 15, I have further refactoring in mind, but let's try to get this set reviewed and committed first... Regards, Matthias [1] https://github.com/openwrt/packages/pull/5370 [2] https://github.com/openwrt-routing/packages/pull/345 Matthias Schiffer (15): metadata: remove 'base-files' special case metadata: make srcpackage extensible metadata: move 'buildtypes' from binary to source packages metadata: move 'builddepends' from binary to source packages metadata: interate over source packages when generating Makefile metadata: change pkg->{src} field to hold a reference metadata: replace %subdir hash with a path field in source packages metadata: remove redundant fields from package hash build: remove package preconfig feature treewide: fix build depends to refer to source package names metadata: handle target build depends together with host build depends metadata: simplify generation of build depends from runtime depends metadata: always resolve dependencies through provides list build: remove obsolete "package feature" feature include/package-dumpinfo.mk: don't duplicate source package information for every binary package include/autotools.mk | 4 +- include/nls.mk | 2 +- include/package-dumpinfo.mk | 53 +---- package/Makefile | 3 - package/network/config/ltq-adsl-app/Makefile | 2 +- package/network/config/ltq-vdsl-app/Makefile | 2 +- scripts/feeds | 28 +-- scripts/metadata.pm | 101 +++------ scripts/package-metadata.pl | 299 +++++++++------------------ 9 files changed, 158 insertions(+), 336 deletions(-)