[make-initrd] [PATCH 0/2] make-initrd: E2K ftbfs workaround; minor spec cleanup

[make-initrd] [PATCH 0/2] make-initrd: E2K ftbfs workaround; minor spec cleanup

[Michael Shigorin]

These patches are what I'm keeping in sisyphus_e2k for now;
the latter one is going to be gone when mcst#6061 is fixed
in toolchain, I can live with keeping it forked until then.

Michael Shigorin (2):
  spec: minor cleanup
  [e2k] ftbfs workaround (disable TLS)

 make-initrd.spec | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

-- 
2.25.4

[make-initrd] [PATCH 1/2] spec: minor cleanup

[Michael Shigorin]

---
 make-initrd.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/make-initrd.spec b/make-initrd.spec
index daf61fd..bc48e97 100644
--- a/make-initrd.spec
+++ b/make-initrd.spec
@@ -6,6 +6,7 @@ Summary: Creates an initramfs image
 License: GPL-3.0
 Group: System/Base
 
+Url: http://altlinux.org/make-initrd
 Packager: Alexey Gladkov <legion@altlinux.ru>
 
 BuildRequires: autoconf
@@ -58,7 +59,7 @@ AutoReq: noshell, noshebang
 Source0: %name-%version.tar
 
 %description
-make-initrd is a new, uevent-driven initramfs infrastructure based around udev.
+make-initrd is an uevent-driven initramfs infrastructure based around udev.
 
 %package devmapper
 Summary: device-mapper module for %name
@@ -139,7 +140,7 @@ Requires: mdadm
 AutoReq: noshell, noshebang
 
 %description mdadm
-Mdadm module for %name
+mdadm module for %name
 
 %package ucode
 Summary: CPU microcode module for %name
@@ -202,7 +203,7 @@ Feature adds smart card daemon and smart card utilities.
 %define _libexecdir %_prefix/libexec
 
 %prep
-%setup -q
+%setup
 
 %build
 ./autogen.sh
@@ -221,7 +222,7 @@ Feature adds smart card daemon and smart card utilities.
 make
 
 %install
-%make_install DESTDIR=%buildroot install
+%makeinstall_std
 
 sed -i \
 	-e 's@\.\./features/@%_datadir/%name/features/@g' \
-- 
2.25.4

Re: [make-initrd] [PATCH 1/2] spec: minor cleanup

[Alexey Gladkov]

On Wed, Aug 18, 2021 at 07:21:14PM +0300, Michael Shigorin wrote:
> ---
>  make-initrd.spec | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/make-initrd.spec b/make-initrd.spec
> index daf61fd..bc48e97 100644
> --- a/make-initrd.spec
> +++ b/make-initrd.spec
> @@ -6,6 +6,7 @@ Summary: Creates an initramfs image
>  License: GPL-3.0
>  Group: System/Base
>  
> +Url: http://altlinux.org/make-initrd

Нет. Не http точно. Кроме того, это не страница проекта. Это довольно
устаревшая страница на wiki. Если ты считаешь, что стоит добавить урл, то:

https://github.com/osboot/make-initrd

>  Packager: Alexey Gladkov <legion@altlinux.ru>
>  
>  BuildRequires: autoconf
> @@ -58,7 +59,7 @@ AutoReq: noshell, noshebang
>  Source0: %name-%version.tar
>  
>  %description
> -make-initrd is a new, uevent-driven initramfs infrastructure based around udev.
> +make-initrd is an uevent-driven initramfs infrastructure based around udev.
>  
>  %package devmapper
>  Summary: device-mapper module for %name
> @@ -139,7 +140,7 @@ Requires: mdadm
>  AutoReq: noshell, noshebang
>  
>  %description mdadm
> -Mdadm module for %name
> +mdadm module for %name
>  
>  %package ucode
>  Summary: CPU microcode module for %name
> @@ -202,7 +203,7 @@ Feature adds smart card daemon and smart card utilities.
>  %define _libexecdir %_prefix/libexec
>  
>  %prep
> -%setup -q
> +%setup
>  
>  %build
>  ./autogen.sh
> @@ -221,7 +222,7 @@ Feature adds smart card daemon and smart card utilities.
>  make
>  
>  %install
> -%make_install DESTDIR=%buildroot install
> +%makeinstall_std
>  
>  sed -i \
>  	-e 's@\.\./features/@%_datadir/%name/features/@g' \
> -- 
> 2.25.4
> 

-- 
Rgrds, legion

Re: [make-initrd] [PATCH 1/2] spec: minor cleanup

[Michael Shigorin]

On Wed, Aug 18, 2021 at 07:05:49PM +0200, Alexey Gladkov wrote:
> > +Url: http://altlinux.org/make-initrd
> Нет. Не http точно.

Как по мне так ссылки http:// более универсальны.

> Кроме того, это не страница проекта. Это довольно устаревшая
> страница на wiki. Если ты считаешь, что стоит добавить урл, то:
> https://github.com/osboot/make-initrd

Думаю, стоит -- в том числе это помогает различным анализаторам
вроде http://repology.org в выяснении, что это один и тот же
проект.

Поправить/переслать или сам просто amend'нешь?

-- 
 ---- WBR, Michael Shigorin / http://altlinux.org
  ------ http://opennet.ru / http://anna-news.info

Re: [make-initrd] [PATCH 1/2] spec: minor cleanup

[Alexey Gladkov]

On Wed, Aug 18, 2021 at 08:10:08PM +0300, Michael Shigorin wrote:
> On Wed, Aug 18, 2021 at 07:05:49PM +0200, Alexey Gladkov wrote:
> > > +Url: http://altlinux.org/make-initrd
> > Нет. Не http точно.
> 
> Как по мне так ссылки http:// более универсальны.

Эм. Чем же https не универсален ?

> > Кроме того, это не страница проекта. Это довольно устаревшая
> > страница на wiki. Если ты считаешь, что стоит добавить урл, то:
> > https://github.com/osboot/make-initrd
> 
> Думаю, стоит -- в том числе это помогает различным анализаторам
> вроде http://repology.org в выяснении, что это один и тот же
> проект.
> 
> Поправить/переслать или сам просто amend'нешь?

Хорошо. Я в следующем релизе приложу этот патч с другим Url.

-- 
Rgrds, legion

[make-initrd] [PATCH 2/2] [e2k] ftbfs workaround (disable TLS)

[Michael Shigorin]

The problem looks like this:

lcc: "/usr/include/bits/byteswap.h", line 105: error #1348: declaration hides
          variable "__x" (declared at line 706 of
          "/usr/src/RPM/BUILD/make-initrd-2.20.1/external/busybox/upstream/networking/tls.c")
          [-Werror=shadow=global]
        ({ register __uint64_t __v, __x = (x);                                \
                                    ^
 in expansion of macro "__bswap_64" at line 37 of "/usr/include/byteswap.h"
 in expansion of macro "bswap_64" at line 198 of
           "/usr/src/RPM/BUILD/make-initrd-2.20.1/external/busybox/upstream/include/platform.h"
 in expansion of macro "bb_bswap_64" at line 214 of
           "/usr/src/RPM/BUILD/make-initrd-2.20.1/external/busybox/upstream/include/platform.h"
 in expansion of macro "SWAP_BE64" at line 706 of
           "/usr/src/RPM/BUILD/make-initrd-2.20.1/external/busybox/upstream/networking/tls.c"
 in expansion of macro "SWAP_BE64" at line 706 of
           "/usr/src/RPM/BUILD/make-initrd-2.20.1/external/busybox/upstream/networking/tls.c"
        tls->write_seq64_be = SWAP_BE64(1 + SWAP_BE64(tls->write_seq64_be));
                              ^

We think it's improper for toolchain to define
quite common single-character symbols like this,
thus I've filed mcst bug #6061.
---
 make-initrd.spec | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/make-initrd.spec b/make-initrd.spec
index bc48e97..907d3ed 100644
--- a/make-initrd.spec
+++ b/make-initrd.spec
@@ -204,6 +204,11 @@ Feature adds smart card daemon and smart card utilities.
 
 %prep
 %setup
+%ifarch %e2k
+# avoid ftbfs due to __v shadowing in /usr/include/bits/byteswap.h (mcst#6061)
+sed -i -r 's,^CONFIG_(TLS|SSL_CLIENT|FEATURE_WGET_HTTPS)=y,CONFIG_\1=n,' \
+	external/busybox/config
+%endif
 
 %build
 ./autogen.sh
-- 
2.25.4

Re: [make-initrd] [PATCH 2/2] [e2k] ftbfs workaround (disable TLS)

[Alexey Gladkov]

On Wed, Aug 18, 2021 at 07:21:15PM +0300, Michael Shigorin wrote:
> The problem looks like this:
> 
> lcc: "/usr/include/bits/byteswap.h", line 105: error #1348: declaration hides
>           variable "__x" (declared at line 706 of
>           "/usr/src/RPM/BUILD/make-initrd-2.20.1/external/busybox/upstream/networking/tls.c")
>           [-Werror=shadow=global]
>         ({ register __uint64_t __v, __x = (x);                                \
>                                     ^
>  in expansion of macro "__bswap_64" at line 37 of "/usr/include/byteswap.h"
>  in expansion of macro "bswap_64" at line 198 of
>            "/usr/src/RPM/BUILD/make-initrd-2.20.1/external/busybox/upstream/include/platform.h"
>  in expansion of macro "bb_bswap_64" at line 214 of
>            "/usr/src/RPM/BUILD/make-initrd-2.20.1/external/busybox/upstream/include/platform.h"
>  in expansion of macro "SWAP_BE64" at line 706 of
>            "/usr/src/RPM/BUILD/make-initrd-2.20.1/external/busybox/upstream/networking/tls.c"
>  in expansion of macro "SWAP_BE64" at line 706 of
>            "/usr/src/RPM/BUILD/make-initrd-2.20.1/external/busybox/upstream/networking/tls.c"
>         tls->write_seq64_be = SWAP_BE64(1 + SWAP_BE64(tls->write_seq64_be));
>                               ^
> 
> We think it's improper for toolchain to define
> quite common single-character symbols like this,
> thus I've filed mcst bug #6061.

Это что, шутка ?

> ---
>  make-initrd.spec | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/make-initrd.spec b/make-initrd.spec
> index bc48e97..907d3ed 100644
> --- a/make-initrd.spec
> +++ b/make-initrd.spec
> @@ -204,6 +204,11 @@ Feature adds smart card daemon and smart card utilities.
>  
>  %prep
>  %setup
> +%ifarch %e2k
> +# avoid ftbfs due to __v shadowing in /usr/include/bits/byteswap.h (mcst#6061)
> +sed -i -r 's,^CONFIG_(TLS|SSL_CLIENT|FEATURE_WGET_HTTPS)=y,CONFIG_\1=n,' \
> +	external/busybox/config
> +%endif

Миш, это неправильно и я не могу с этим согласиться даже с %ifarch.

Выключать tls только из-за глючнсти /usr/include/bits/byteswap.h в
какой-то закрытой реализации libc я не буду. Почините byteswap.h.

-- 
Rgrds, legion