From patchwork Tue Jun 4 05:55:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Crispin X-Patchwork-Id: 1109627 X-Patchwork-Delegate: blogic@openwrt.org 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=phrozen.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dAtDlexq"; 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 45J1Q24Q0gz9s3Z for ; Tue, 4 Jun 2019 15:56:26 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=bQehyRZHn8sUC1KW11OCU4sAeDTW2ZYQHssHtzgsDbk=; b=dAtDlexq5kd2WN CQcCrdYn6tZVqjpuz/FP/lxBw0cTSQfDr65k4AdfT+CMnwXLoRpg79tWz0Dr/ovESWhU9wLNAFZYO c0rWzP0EwOgXHQsTbiJwai8uXN5yqRuMwlJSMbj+rpeWoDhlQCDaK5OOHL4ikVpADkf3B2zuIrSFH DBPAnbOy3fO91L7Wr65RjYfVyO7XrTSDnq/iK7cUKRuHdhuBXVLgOvg4/8dunOPgaLpIvL9h63gZa 35b/8j5ABw8dgz2LShH/5uFgUloCYlIjiCNdO/erWDOB2RjXSXrcUTws00e4Hu94/vjLQMYMMBdzX jurHqQ4sUBPbAiRwa5wg==; 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 1hY2QY-0004v2-HV; Tue, 04 Jun 2019 05:56:06 +0000 Received: from nbd.name ([2a01:4f8:221:3d45::2]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hY2QV-0004uK-Ky for openwrt-devel@lists.openwrt.org; Tue, 04 Jun 2019 05:56:05 +0000 Received: from pd95fd026.dip0.t-ipconnect.de ([217.95.208.38] helo=bertha.fritz.box) by ds12 with esmtpa (Exim 4.89) (envelope-from ) id 1hY2QQ-00074J-67; Tue, 04 Jun 2019 07:55:58 +0200 From: John Crispin To: openwrt-devel@lists.openwrt.org Date: Tue, 4 Jun 2019 07:55:51 +0200 Message-Id: <20190604055552.17850-1-john@phrozen.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190603_225603_846782_850ACAAA X-CRM114-Status: UNSURE ( 9.01 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record Subject: [OpenWrt-Devel] [PATCH 1/2] image: make the folder that gets included intot he RootFS configurable 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: , Cc: John Crispin Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This allows managing several different folder for varying env profiles. Signed-off-by: John Crispin --- config/Config-images.in | 6 ++++++ package/Makefile | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/config/Config-images.in b/config/Config-images.in index 8548c7cd24..a618da1b6c 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -286,4 +286,10 @@ menu "Target Images" it will be mounted by PARTUUID which makes the kernel find the appropriate disk automatically. + config TARGET_ROOTFS_INCLUDE_FOLDER + string "RootFS include folder" + default "files" + help + Override the folder that is included into the RootFS by default. + endmenu diff --git a/package/Makefile b/package/Makefile index abbf5f91f2..054e5b5820 100644 --- a/package/Makefile +++ b/package/Makefile @@ -76,7 +76,7 @@ $(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(if $(CONFIG_TARGET_PER_DE $(CP) $(TARGET_DIR) $(TARGET_DIR_ORIG) - $(call prepare_rootfs,$(TARGET_DIR),$(TOPDIR)/files) + $(call prepare_rootfs,$(TARGET_DIR),$(TOPDIR)/$(if ifeq "$(CONFIG_TARGET_ROOTFS_INCLUDE_FOLDER)" "",files,$(CONFIG_TARGET_ROOTFS_INCLUDE_FOLDER))) $(curdir)/index: FORCE @echo Generating package index...