From patchwork Sun Aug 23 08:23:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Spooren X-Patchwork-Id: 1349810 X-Patchwork-Delegate: mail@aparcar.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.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=aparcar.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=IKG6oVPH; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BZ7cb4cHgz9sPf for ; Sun, 23 Aug 2020 18:25:50 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject: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=UIQSLRW+aeJHzOR1pZqolbciZkOR9CHwI+c9PHtAUxA=; b=IKG6oVPHa/1tMlJTkBuRITSA0l sEJvGzBhdJFR0+wLzWVh/QghqcPQt7KNHCLY10A+MU8ndHAPIN5Gpfg7JCQOcLZZQvXV/ai139Xk1 TB31dX01uioo0VuszriOK32INsbV3cS4AG41DFfJvhvHTRLv7JGzsjCwWrplOLDPDiklZFAAvsivT yTE7rlyUxU0QYlIRrkBnnZbDBcktrZVt7cYPKZExXjDu1x6Qxn0mE56fY7Wkjt0JR/S22ZezReimV M5ZAUf+B4hJ9zBWXVtcaPIPtu6i5+jzp3FmW9/MmFuGabxOg5mK8DAGzW/h3puPiOGyTDJG3GaUZF 1RJ9Xs6w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9lHg-000300-Gz; Sun, 23 Aug 2020 08:23:24 +0000 Received: from relay7-d.mail.gandi.net ([217.70.183.200]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9lHd-0002zN-IO for openwrt-devel@lists.openwrt.org; Sun, 23 Aug 2020 08:23:23 +0000 X-Originating-IP: 72.234.141.215 Received: from dawn.lan (udp224251uds.hawaiiantel.net [72.234.141.215]) (Authenticated sender: mail@aparcar.org) by relay7-d.mail.gandi.net (Postfix) with ESMTPA id C72EF20004; Sun, 23 Aug 2020 08:23:15 +0000 (UTC) From: Paul Spooren To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2] build: optionally disable target name in filenames Date: Sat, 22 Aug 2020 22:23:00 -1000 Message-Id: <20200823082300.915092-1-mail@aparcar.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200823_042321_805785_8D70BAF1 X-CRM114-Status: GOOD ( 11.95 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [217.70.183.200 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Spooren Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The target/subtarget is included in all image filenames by default. This is useful if the same profile exists in multiple targets or developers/users want an obvious related of images to targets. However this information can also be confusing at it adds a lengthy string to sysupgrade images containing an information which is likely unknown to regular users: The target/subtarget. This commit therefore adds the new image option called CONFIG_TARGET_FILENAMES to make the target/subtarget filename part optional. It is ENABLED by default. To archive this the target/subtarget is added if CONFIG_VERSIONOPT is disabled and CONFIG_TARGET_FILENAMES default to `y`. This keeps the current behaviour for OpenWrt & downstream projects while making the target/subtarget inclusion still optional. Newly produced files would with enabled CONFIG_VERSIONOPT and disabled CONFIG_TARGET_FILENAMES look like the following: * openwrt-linksys_wrt3200acm-initramfs-kernel.bin * openwrt-linksys_wrt3200acm.manifest * openwrt-linksys_wrt3200acm-squashfs-factory.img * openwrt-linksys_wrt3200acm-squashfs-sysupgrade.bin ImageBuilder and SDK archive file names are generated individually and not influenced by the option. Signed-off-by: Paul Spooren --- v2: Make it optional and keep everything as it is right now by default. include/image.mk | 13 +++++++++---- package/base-files/image-config.in | 11 +++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/include/image.mk b/include/image.mk index e8c2cf7100..989cc44699 100644 --- a/include/image.mk +++ b/include/image.mk @@ -37,11 +37,16 @@ KDIR=$(KERNEL_BUILD_DIR) KDIR_TMP=$(KDIR)/tmp DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts +ifdef CONFIG_VERSIONOPT + IMG_PREFIX_TARGET:=$(if $(CONFIG_TARGET_FILENAMES),$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))-) +else + IMG_PREFIX_TARGET:=$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))- +endif IMG_PREFIX_EXTRA:=$(if $(EXTRA_IMAGE_NAME),$(call sanitize,$(EXTRA_IMAGE_NAME))-) IMG_PREFIX_VERNUM:=$(if $(CONFIG_VERSION_FILENAMES),$(call sanitize,$(VERSION_NUMBER))-) IMG_PREFIX_VERCODE:=$(if $(CONFIG_VERSION_CODE_FILENAMES),$(call sanitize,$(VERSION_CODE))-) -IMG_PREFIX:=$(VERSION_DIST_SANITIZED)-$(IMG_PREFIX_VERNUM)$(IMG_PREFIX_VERCODE)$(IMG_PREFIX_EXTRA)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)) +IMG_PREFIX:=$(VERSION_DIST_SANITIZED)-$(IMG_PREFIX_VERNUM)$(IMG_PREFIX_VERCODE)$(IMG_PREFIX_EXTRA)$(IMG_PREFIX_TARGET) IMG_ROOTFS:=$(IMG_PREFIX)-rootfs IMG_COMBINED:=$(IMG_PREFIX)-combined IMG_PART_SIGNATURE:=$(shell echo $(SOURCE_DATE_EPOCH)$(LINUX_VERMAGIC) | mkhash md5 | cut -b1-8) @@ -293,7 +298,7 @@ endef define Image/Manifest $(call opkg,$(TARGET_DIR_ORIG)) list-installed > \ - $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest + $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),$(PROFILE_SANITIZED)).manifest endef define Image/gzip-ext4-padded-squashfs @@ -317,7 +322,7 @@ ifdef CONFIG_TARGET_ROOTFS_TARGZ define Image/Build/targz $(TAR) -cp --numeric-owner --owner=0 --group=0 --mode=a-s --sort=name \ $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \ - -C $(TARGET_DIR)/ . | gzip -9n > $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))-rootfs.tar.gz + -C $(TARGET_DIR)/ . | gzip -9n > $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),$(PROFILE_SANITIZED))-rootfs.tar.gz endef endif @@ -385,7 +390,7 @@ define Device/Init IMAGES := ARTIFACTS := - IMAGE_PREFIX := $(IMG_PREFIX)-$(1) + IMAGE_PREFIX := $(IMG_PREFIX)$(1) IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1)-$$(2) IMAGE_SIZE := KERNEL_PREFIX = $$(IMAGE_PREFIX) diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in index 3432db525a..4bace77db0 100644 --- a/package/base-files/image-config.in +++ b/package/base-files/image-config.in @@ -256,6 +256,7 @@ if VERSIONOPT Enable this to include the version number in firmware image, SDK- and Image Builder archive file names + config VERSION_CODE_FILENAMES bool prompt "Revision code in filenames" @@ -264,6 +265,16 @@ if VERSIONOPT Enable this to include the revision identifier or the configured version code into the firmware image, SDK- and Image Builder archive file names + + config TARGET_FILENAMES + bool + prompt "Target and subtarget in filenames" + default y + help + Enable this to include the target (and subtarget) in firmware image + filenames. SDK and ImageBuilder archive filenames are not influenced + by this option. + endif