ALT Linux Distributions development
 help / color / mirror / Atom feed
* [devel-distro] [PATCH] lib/boot.mk: do not define BOOTLOADER type for e2k
@ 2023-08-04 20:42 Gleb Fotengauer-Malinovskiy
  2023-08-05  2:48 ` Антон Мидюков
  0 siblings, 1 reply; 4+ messages in thread
From: Gleb Fotengauer-Malinovskiy @ 2023-08-04 20:42 UTC (permalink / raw)
  To: devel-distro

It is unnecessary to define the BOOTLOADER type for e2k in this context.
The reason is that images for e2k use the mkimage isodata pack method,
which is unaffected by any value of the BOOTLOADER variable (BOOT_TYPE
in the mkimage).  Therefore, defining the BOOTLOADER type does not make
any sense.

Fixes: e8fcdaf8 ("lib/boot.mk: Set IMAGE_PACKTYPE to isodata for e2k")
---
 lib/boot.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/boot.mk b/lib/boot.mk
index 2c58f378..e8940dc7 100644
--- a/lib/boot.mk
+++ b/lib/boot.mk
@@ -13,7 +13,6 @@ ifeq (,$(filter-out aarch64 riscv64 loongarch64,$(ARCH)))
 	@$(call try,BOOTLOADER,efiboot)
 endif
 ifeq (,$(filter-out e2k%,$(ARCH)))
-	@$(call try,BOOTLOADER,e2kboot)
 	@$(call set,IMAGE_PACKTYPE,isodata)
 endif
 ifeq (,$(filter-out ppc64le,$(ARCH)))
-- 
glebfm



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [devel-distro] [PATCH] lib/boot.mk: do not define BOOTLOADER type for e2k
  2023-08-04 20:42 [devel-distro] [PATCH] lib/boot.mk: do not define BOOTLOADER type for e2k Gleb Fotengauer-Malinovskiy
@ 2023-08-05  2:48 ` Антон Мидюков
  2023-08-05  9:49   ` Gleb Fotengauer-Malinovskiy
  0 siblings, 1 reply; 4+ messages in thread
From: Антон Мидюков @ 2023-08-05  2:48 UTC (permalink / raw)
  To: devel-distro

05.08.2023 03:42, Gleb Fotengauer-Malinovskiy пишет:
> It is unnecessary to define the BOOTLOADER type for e2k in this context.
> The reason is that images for e2k use the mkimage isodata pack method,
> which is unaffected by any value of the BOOTLOADER variable (BOOT_TYPE
> in the mkimage).  Therefore, defining the BOOTLOADER type does not make
> any sense.
> 

Этот коммит ломает сборку на e2k, так как в sub.in/stage1/Makefile:
ifeq (,$(BOOTLOADER))
$(error BOOTLOADER not defined)
endif

Но скорее всего эта проверка стала излишней после упразднения в этом Makefile
copy-$(BOOTLOADER)

> Fixes: e8fcdaf8 ("lib/boot.mk: Set IMAGE_PACKTYPE to isodata for e2k")
> ---
>  lib/boot.mk | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/lib/boot.mk b/lib/boot.mk
> index 2c58f378..e8940dc7 100644
> --- a/lib/boot.mk
> +++ b/lib/boot.mk
> @@ -13,7 +13,6 @@ ifeq (,$(filter-out aarch64 riscv64 loongarch64,$(ARCH)))
>  	@$(call try,BOOTLOADER,efiboot)
>  endif
>  ifeq (,$(filter-out e2k%,$(ARCH)))
> -	@$(call try,BOOTLOADER,e2kboot)
>  	@$(call set,IMAGE_PACKTYPE,isodata)
>  endif
>  ifeq (,$(filter-out ppc64le,$(ARCH)))

-- 
С уважением, Антон Мидюков <antohami@altlinux.org>



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [devel-distro] [PATCH] lib/boot.mk: do not define BOOTLOADER type for e2k
  2023-08-05  2:48 ` Антон Мидюков
@ 2023-08-05  9:49   ` Gleb Fotengauer-Malinovskiy
  2023-08-07  4:52     ` Антон Мидюков
  0 siblings, 1 reply; 4+ messages in thread
From: Gleb Fotengauer-Malinovskiy @ 2023-08-05  9:49 UTC (permalink / raw)
  To: Distributions development

[-- Attachment #1: Type: text/plain, Size: 1987 bytes --]

On Sat, Aug 05, 2023 at 09:48:33AM +0700, Антон Мидюков wrote:
> 05.08.2023 03:42, Gleb Fotengauer-Malinovskiy пишет:
> > It is unnecessary to define the BOOTLOADER type for e2k in this context.
> > The reason is that images for e2k use the mkimage isodata pack method,
> > which is unaffected by any value of the BOOTLOADER variable (BOOT_TYPE
> > in the mkimage).  Therefore, defining the BOOTLOADER type does not make
> > any sense.
> > 
> 
> Этот коммит ломает сборку на e2k, так как в sub.in/stage1/Makefile:
> ifeq (,$(BOOTLOADER))
> $(error BOOTLOADER not defined)
> endif

Ну тут получается, что либо туда, либо сюда.  Либо нужно сделать чтобы
BOOTLOADER=e2kboot и IMAGE_PACKTYPE=boot имели смысл вместе, либо не
считать, что отсутствие BOOTLOADER на что-то влияет.

> Но скорее всего эта проверка стала излишней после упразднения в этом Makefile
> copy-$(BOOTLOADER)
> 
> > Fixes: e8fcdaf8 ("lib/boot.mk: Set IMAGE_PACKTYPE to isodata for e2k")
> > ---
> >  lib/boot.mk | 1 -
> >  1 file changed, 1 deletion(-)
> > 
> > diff --git a/lib/boot.mk b/lib/boot.mk
> > index 2c58f378..e8940dc7 100644
> > --- a/lib/boot.mk
> > +++ b/lib/boot.mk
> > @@ -13,7 +13,6 @@ ifeq (,$(filter-out aarch64 riscv64 loongarch64,$(ARCH)))
> >  	@$(call try,BOOTLOADER,efiboot)
> >  endif
> >  ifeq (,$(filter-out e2k%,$(ARCH)))
> > -	@$(call try,BOOTLOADER,e2kboot)
> >  	@$(call set,IMAGE_PACKTYPE,isodata)
> >  endif
> >  ifeq (,$(filter-out ppc64le,$(ARCH)))
> 
> -- 
> С уважением, Антон Мидюков <antohami@altlinux.org>
> 
> _______________________________________________
> devel-distro mailing list
> devel-distro@lists.altlinux.org
> https://lists.altlinux.org/mailman/listinfo/devel-distro

-- 
glebfm

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [devel-distro] [PATCH] lib/boot.mk: do not define BOOTLOADER type for e2k
  2023-08-05  9:49   ` Gleb Fotengauer-Malinovskiy
@ 2023-08-07  4:52     ` Антон Мидюков
  0 siblings, 0 replies; 4+ messages in thread
From: Антон Мидюков @ 2023-08-07  4:52 UTC (permalink / raw)
  To: devel-distro

05.08.2023 16:49, Gleb Fotengauer-Malinovskiy пишет:
> On Sat, Aug 05, 2023 at 09:48:33AM +0700, Антон Мидюков wrote:
>> 05.08.2023 03:42, Gleb Fotengauer-Malinovskiy пишет:
>>> It is unnecessary to define the BOOTLOADER type for e2k in this context.
>>> The reason is that images for e2k use the mkimage isodata pack method,
>>> which is unaffected by any value of the BOOTLOADER variable (BOOT_TYPE
>>> in the mkimage).  Therefore, defining the BOOTLOADER type does not make
>>> any sense.
>>>
>>
>> Этот коммит ломает сборку на e2k, так как в sub.in/stage1/Makefile:
>> ifeq (,$(BOOTLOADER))
>> $(error BOOTLOADER not defined)
>> endif
> 
> Ну тут получается, что либо туда, либо сюда.  Либо нужно сделать чтобы
> BOOTLOADER=e2kboot и IMAGE_PACKTYPE=boot имели смысл вместе, либо не
> считать, что отсутствие BOOTLOADER на что-то влияет.
> 

Сделал, чтобы проверка не отрабатывала, если IMAGE_PACKTYPE=isodata.
И затем принял патч.
В e2k просто конфиг. Смысл его генерировать в mkimage, если в mkimage-profiles
генерируется другой конфиг, я не вижу.

>> Но скорее всего эта проверка стала излишней после упразднения в этом Makefile
>> copy-$(BOOTLOADER)
>>
>>> Fixes: e8fcdaf8 ("lib/boot.mk: Set IMAGE_PACKTYPE to isodata for e2k")
>>> ---
>>>  lib/boot.mk | 1 -
>>>  1 file changed, 1 deletion(-)
>>>
>>> diff --git a/lib/boot.mk b/lib/boot.mk
>>> index 2c58f378..e8940dc7 100644
>>> --- a/lib/boot.mk
>>> +++ b/lib/boot.mk
>>> @@ -13,7 +13,6 @@ ifeq (,$(filter-out aarch64 riscv64 loongarch64,$(ARCH)))
>>>  	@$(call try,BOOTLOADER,efiboot)
>>>  endif
>>>  ifeq (,$(filter-out e2k%,$(ARCH)))
>>> -	@$(call try,BOOTLOADER,e2kboot)
>>>  	@$(call set,IMAGE_PACKTYPE,isodata)
>>>  endif
>>>  ifeq (,$(filter-out ppc64le,$(ARCH)))
>>
>> -- 
>> С уважением, Антон Мидюков <antohami@altlinux.org>
>>
>> _______________________________________________
>> devel-distro mailing list
>> devel-distro@lists.altlinux.org
>> https://lists.altlinux.org/mailman/listinfo/devel-distro
> 
> 
> _______________________________________________
> devel-distro mailing list
> devel-distro@lists.altlinux.org
> https://lists.altlinux.org/mailman/listinfo/devel-distro

-- 
С уважением, Антон Мидюков <antohami@altlinux.org>



^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-08-07  4:52 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-04 20:42 [devel-distro] [PATCH] lib/boot.mk: do not define BOOTLOADER type for e2k Gleb Fotengauer-Malinovskiy
2023-08-05  2:48 ` Антон Мидюков
2023-08-05  9:49   ` Gleb Fotengauer-Malinovskiy
2023-08-07  4:52     ` Антон Мидюков

ALT Linux Distributions development

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://lore.altlinux.org/devel-distro/0 devel-distro/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 devel-distro devel-distro/ http://lore.altlinux.org/devel-distro \
		devel-distro@lists.altlinux.org devel-distro@lists.altlinux.ru devel-distro@lists.altlinux.com
	public-inbox-index devel-distro

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://lore.altlinux.org/org.altlinux.lists.devel-distro


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git