From patchwork Mon Jul 9 22:31:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Schiffer X-Patchwork-Id: 941718 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=universe-factory.net Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="mQGn1UpW"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::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 41Pg7T0ndDz9rxs for ; Tue, 10 Jul 2018 08:32:21 +1000 (AEST) 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=NWhcmlQOMLQC/adbuJV/Ny0BEflb/KqMOOBf6w8Zr/8=; b=mQGn1UpWDebme9 V36W6FZPUeLJkT3S4YaUcz5j3YMn8/Gv4wMC8I6CLzAOqwr8D//P2wMGNnS2x0sKIJQ9aQjlBa67Y qT5845YQtwIhL4Ul5/t4C4ewgN3W0Pu7jT48kjPI1o8o+klGscqw9hVwCl+GtsA7ZrmVbRtMGJmYR jWoed6kVfSsP/BDCSMZdO8zvY+Fy8ZAoQ83BZ/fN6MQ7HBGLJ84lHJRV+MB3ApWDBL8WcRt5LEcho XUG8qrpajfMWg7LxTzR2IN0uUU9Im8eiQXxWiqfad27IKoocFlr1MXnc/eFW27nzSY4+Zp4IJlRa2 gibYams7gfPAR39Zf4FA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fcehZ-0001hd-NQ; Mon, 09 Jul 2018 22:32:13 +0000 Received: from orthanc.universe-factory.net ([2001:19f0:6c01:100::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fcegw-0000lq-Ql for openwrt-devel@lists.openwrt.org; Mon, 09 Jul 2018 22:31:37 +0000 Received: from localhost.localdomain (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 2AB4F1F40F for ; Tue, 10 Jul 2018 00:31:21 +0200 (CEST) From: Matthias Schiffer To: openwrt-devel@lists.openwrt.org Date: Tue, 10 Jul 2018 00:31:20 +0200 Message-Id: X-Mailer: git-send-email 2.18.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180709_153135_121560_3C62B17A X-CRM114-Status: UNSURE ( 9.24 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record Subject: [OpenWrt-Devel] [PATCH 0/4] Overhaul distfeeds.conf generation X-BeenThere: openwrt-devel@lists.openwrt.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: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Hi, I've been annoyed with the way we handle distfeeds.conf generation for quite some time, as the feeds that are used to build and the feeds that end up in the opkg config always had to be the same (disabling some of the CONFIG_FEED_... symbols would also disable the feed for rootfs creation, making these options basically useless - the result was usually a broken build). This patchset implements a way to add additional distfeeds.conf entries (src-dummy method), makes rootfs creation independent of feed enable status, and moves from global ADD_DISABLED and ADD_COMMENTED symbols to per-feed configuration. I would like to add this patchset to 18.06 as well, as we require these changes for Gluon, and we obviously want to avoid adding downstream patches as much as possible. The same patchset can also be found in my staging tree at https://git.openwrt.org/?p=openwrt/staging/neoraider.git;a=summary Regards, Matthias Matthias Schiffer (4): scripts/feeds: add src-dummy method include/feeds.mk: always add available feeds to PACKAGE_SUBDIRS base-files: fix feed list in PKG_CONFIG_DEPENDS include/feeds.mk: rework generation of opkg distfeeds.conf include/feeds.mk | 17 ++++++----------- package/base-files/Makefile | 4 +--- package/base-files/image-config.in | 14 -------------- scripts/feeds | 12 +++++++++--- 4 files changed, 16 insertions(+), 31 deletions(-) Acked-by: Jo-Philipp Wich