Re: [DistroKit] [PATCH] blspec-entry: remove superfluous file

[Robert Schwebel <r.schwebel@pengutronix.de>]

Applied to next.

On Mon, Mar 25, 2024 at 07:45:09PM +0100, Roland Hieber wrote:
> 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 <ada@thorsis.com>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  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 <m.olbrich@pengutronix.de>
> -#
> -# 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 <m.olbrich@pengutronix.de>")
> -	@$(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
> 
> 
> 

-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |