From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 25 Mar 2024 19:45:43 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1ropKJ-0047vE-0G for lore@lore.pengutronix.de; Mon, 25 Mar 2024 19:45:43 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ropKI-0003QF-Hb; Mon, 25 Mar 2024 19:45:42 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ropKD-0003Pt-CC; Mon, 25 Mar 2024 19:45:37 +0100 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1ropKC-008TPg-Qt; Mon, 25 Mar 2024 19:45:36 +0100 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1ropKC-00CaDN-2W; Mon, 25 Mar 2024 19:45:36 +0100 From: Roland Hieber To: distrokit@pengutronix.de Date: Mon, 25 Mar 2024 19:45:09 +0100 Message-Id: <20240325184509.2999082-1-rhi@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240321-deserve-preteen-03741fad9b85@thorsis.com> References: <20240321-deserve-preteen-03741fad9b85@thorsis.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH] blspec-entry: remove superfluous file X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexander Dahl , Ahmad Fatoum , Roland Hieber Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false After upstreaming our changes, the file in PTXdist 2024.02.0 is now the same as ours, so we can remove it here. Suggested-by: Alexander Dahl Signed-off-by: Roland Hieber --- rules/blspec-entry.make | 73 ----------------------------------------- 1 file changed, 73 deletions(-) delete mode 100644 rules/blspec-entry.make diff --git a/rules/blspec-entry.make b/rules/blspec-entry.make deleted file mode 100644 index 4421594016e1..000000000000 --- a/rules/blspec-entry.make +++ /dev/null @@ -1,73 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2014 by Michael Olbrich -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_ENTRY) += blspec-entry - -BLSPEC_ENTRY_VERSION := $(KERNEL_VERSION) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -BLSPEC_ENTRY_TITLE := PTXdist - $(call remove_quotes,$(PTXCONF_PROJECT_VENDOR)-$(PTXCONF_PROJECT)) -ifdef PTXCONF_BLSPEC_ENTRY_DEVICETREE -BLSPEC_ENTRY_NAMES = $(basename $(notdir $(KERNEL_DTS))) -blspec/title = $(BLSPEC_ENTRY_TITLE) $(strip $(1)) -blspec/devicetree = devicetree\t/boot/$(strip $(1)).dtb -else -BLSPEC_ENTRY_NAMES = default -blspec/title = $(BLSPEC_ENTRY_TITLE) -blspec/devicetree = -endif -BLSPEC_ENTRY_LICENSE = ignore - -ifdef PTXCONF_KERNEL_FIT -BLSPEC_KERNEL_IMAGE = linux.fit -else -BLSPEC_KERNEL_IMAGE = $(KERNEL_IMAGE) -endif - -ifdef PTXCONF_BLSPEC_ENTRY_APPENDROOT -BLSPEC_APPENDROOT = linux-appendroot\ttrue -else -BLSPEC_APPENDROOT = -endif - -$(STATEDIR)/blspec-entry.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-entry) - @$(call install_fixup,blspec-entry,PRIORITY,optional) - @$(call install_fixup,blspec-entry,SECTION,base) - @$(call install_fixup,blspec-entry,AUTHOR,"Michael Olbrich ") - @$(call install_fixup,blspec-entry,DESCRIPTION,missing) - - @$(foreach name, $(BLSPEC_ENTRY_NAMES), \ - $(call install_alternative, blspec-entry, 0, 0, 0644, \ - /loader/entries/default.conf,n,/loader/entries/$(name).conf)$(ptx/nl) \ - $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \ - @TITLE@,'$(call blspec/title,$(name))')$(ptx/nl) \ - $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \ - @VERSION@,'$(BLSPEC_ENTRY_VERSION)')$(ptx/nl) \ - $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \ - @CMDLINE@,$(PTXCONF_BLSPEC_ENTRY_CMDLINE))$(ptx/nl) \ - $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \ - @KERNEL@,'/boot/$(BLSPEC_KERNEL_IMAGE)')$(ptx/nl) \ - $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \ - @DEVICETREE@,'$(call blspec/devicetree,$(name))')$(ptx/nl) \ - $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \ - @LINUXAPPENDROOT@,'$(BLSPEC_APPENDROOT)')$(ptx/nl)) - - @$(call install_finish,blspec-entry) - - @$(call touch) - -# vim: syntax=make -- 2.39.2