util-linux: Do not ship broken symlink "/usr/bin/x86_64"

  This file points to /usr/bin/setarch, which we do not ship on any
architecture. As it serves no obvious purpose on IPFire installations,
we may as well not ship it entirely.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---
 config/rootfiles/common/x86_64/util-linux | 2 +-
 config/rootfiles/core/170/update.sh       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
  

Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>

On 09/07/2022 14:37, Peter Müller wrote:
> This file points to /usr/bin/setarch, which we do not ship on any
> architecture. As it serves no obvious purpose on IPFire installations,
> we may as well not ship it entirely.
>
> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
> ---
>   config/rootfiles/common/x86_64/util-linux | 2 +-
>   config/rootfiles/core/170/update.sh       | 1 +
>   2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/config/rootfiles/common/x86_64/util-linux b/config/rootfiles/common/x86_64/util-linux
> index bd862b557..de78f65c2 100644
> --- a/config/rootfiles/common/x86_64/util-linux
> +++ b/config/rootfiles/common/x86_64/util-linux
> @@ -103,7 +103,7 @@ usr/bin/uclampset
>   usr/bin/uuidgen
>   usr/bin/uuidparse
>   #usr/bin/whereis
> -usr/bin/x86_64
> +#usr/bin/x86_64
>   #usr/include/blkid
>   #usr/include/blkid/blkid.h
>   #usr/include/libfdisk
> diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/170/update.sh
> index e3f93df57..5d8903189 100644
> --- a/config/rootfiles/core/170/update.sh
> +++ b/config/rootfiles/core/170/update.sh
> @@ -57,6 +57,7 @@ rm -rvf \
>   	/sbin/ifcfg \
>   	/sbin/routef \
>   	/sbin/rtpr \
> +	/usr/bin/x86_64 \
>   	/usr/lib/libbfd-2.36.* \
>   	/usr/lib/libbind9-9.16.2* \
>   	/usr/lib/libdnet* \
  

Hello *,

for the records, this causes a rather ugly warning at the end of the distributions'
build procedure:

> Checking Logfiles for new Files                                                                                                                                                                                                       
> Error! '/x86_64' in rootfiles files found!
> ./config/rootfiles/core/170/update.sh:	/usr/bin/x86_64 \
> Replace by xxxMACHINExxx !

Can be safely ignored, but may cause some confusion at the first glance.

Thanks, and best regards,
Peter Müller


> This file points to /usr/bin/setarch, which we do not ship on any
> architecture. As it serves no obvious purpose on IPFire installations,
> we may as well not ship it entirely.
> 
> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
> ---
>  config/rootfiles/common/x86_64/util-linux | 2 +-
>  config/rootfiles/core/170/update.sh       | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/config/rootfiles/common/x86_64/util-linux b/config/rootfiles/common/x86_64/util-linux
> index bd862b557..de78f65c2 100644
> --- a/config/rootfiles/common/x86_64/util-linux
> +++ b/config/rootfiles/common/x86_64/util-linux
> @@ -103,7 +103,7 @@ usr/bin/uclampset
>  usr/bin/uuidgen
>  usr/bin/uuidparse
>  #usr/bin/whereis
> -usr/bin/x86_64
> +#usr/bin/x86_64
>  #usr/include/blkid
>  #usr/include/blkid/blkid.h
>  #usr/include/libfdisk
> diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/170/update.sh
> index e3f93df57..5d8903189 100644
> --- a/config/rootfiles/core/170/update.sh
> +++ b/config/rootfiles/core/170/update.sh
> @@ -57,6 +57,7 @@ rm -rvf \
>  	/sbin/ifcfg \
>  	/sbin/routef \
>  	/sbin/rtpr \
> +	/usr/bin/x86_64 \
>  	/usr/lib/libbfd-2.36.* \
>  	/usr/lib/libbind9-9.16.2* \
>  	/usr/lib/libdnet* \
  

Hello,

Err, yes, but what do we gain from dropping this?

Does it hurt us to be compatible with any general purpose distribution?

-Michael

> On 9 Jul 2022, at 14:37, Peter Müller <peter.mueller@ipfire.org> wrote:
> 
> This file points to /usr/bin/setarch, which we do not ship on any
> architecture. As it serves no obvious purpose on IPFire installations,
> we may as well not ship it entirely.
> 
> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
> ---
> config/rootfiles/common/x86_64/util-linux | 2 +-
> config/rootfiles/core/170/update.sh       | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/config/rootfiles/common/x86_64/util-linux b/config/rootfiles/common/x86_64/util-linux
> index bd862b557..de78f65c2 100644
> --- a/config/rootfiles/common/x86_64/util-linux
> +++ b/config/rootfiles/common/x86_64/util-linux
> @@ -103,7 +103,7 @@ usr/bin/uclampset
> usr/bin/uuidgen
> usr/bin/uuidparse
> #usr/bin/whereis
> -usr/bin/x86_64
> +#usr/bin/x86_64
> #usr/include/blkid
> #usr/include/blkid/blkid.h
> #usr/include/libfdisk
> diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/170/update.sh
> index e3f93df57..5d8903189 100644
> --- a/config/rootfiles/core/170/update.sh
> +++ b/config/rootfiles/core/170/update.sh
> @@ -57,6 +57,7 @@ rm -rvf \
> 	/sbin/ifcfg \
> 	/sbin/routef \
> 	/sbin/rtpr \
> +	/usr/bin/x86_64 \
> 	/usr/lib/libbfd-2.36.* \
> 	/usr/lib/libbind9-9.16.2* \
> 	/usr/lib/libdnet* \
> -- 
> 2.35.3
  

Hello Michael,

thanks for your reply.

> Hello,
> 
> Err, yes, but what do we gain from dropping this?

Well, shipping a broken symlink did not seem to serve any purpose to me. Or were
you referring to not shipping /usr/bin/setarch?

Thanks, and best regards,
Peter Müller

> 
> Does it hurt us to be compatible with any general purpose distribution?
> 
> -Michael
> 
>> On 9 Jul 2022, at 14:37, Peter Müller <peter.mueller@ipfire.org> wrote:
>>
>> This file points to /usr/bin/setarch, which we do not ship on any
>> architecture. As it serves no obvious purpose on IPFire installations,
>> we may as well not ship it entirely.
>>
>> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
>> ---
>> config/rootfiles/common/x86_64/util-linux | 2 +-
>> config/rootfiles/core/170/update.sh       | 1 +
>> 2 files changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/config/rootfiles/common/x86_64/util-linux b/config/rootfiles/common/x86_64/util-linux
>> index bd862b557..de78f65c2 100644
>> --- a/config/rootfiles/common/x86_64/util-linux
>> +++ b/config/rootfiles/common/x86_64/util-linux
>> @@ -103,7 +103,7 @@ usr/bin/uclampset
>> usr/bin/uuidgen
>> usr/bin/uuidparse
>> #usr/bin/whereis
>> -usr/bin/x86_64
>> +#usr/bin/x86_64
>> #usr/include/blkid
>> #usr/include/blkid/blkid.h
>> #usr/include/libfdisk
>> diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/170/update.sh
>> index e3f93df57..5d8903189 100644
>> --- a/config/rootfiles/core/170/update.sh
>> +++ b/config/rootfiles/core/170/update.sh
>> @@ -57,6 +57,7 @@ rm -rvf \
>> 	/sbin/ifcfg \
>> 	/sbin/routef \
>> 	/sbin/rtpr \
>> +	/usr/bin/x86_64 \
>> 	/usr/lib/libbfd-2.36.* \
>> 	/usr/lib/libbind9-9.16.2* \
>> 	/usr/lib/libdnet* \
>> -- 
>> 2.35.3
>
  

Oh no, we should of course ship setarch or drop x86_64. Either or the other.

I missed that we were talking about a *broken* symlink here.

> On 12 Jul 2022, at 11:44, Peter Müller <peter.mueller@ipfire.org> wrote:
> 
> Hello Michael,
> 
> thanks for your reply.
> 
>> Hello,
>> 
>> Err, yes, but what do we gain from dropping this?
> 
> Well, shipping a broken symlink did not seem to serve any purpose to me. Or were
> you referring to not shipping /usr/bin/setarch?
> 
> Thanks, and best regards,
> Peter Müller
> 
>> 
>> Does it hurt us to be compatible with any general purpose distribution?
>> 
>> -Michael
>> 
>>> On 9 Jul 2022, at 14:37, Peter Müller <peter.mueller@ipfire.org> wrote:
>>> 
>>> This file points to /usr/bin/setarch, which we do not ship on any
>>> architecture. As it serves no obvious purpose on IPFire installations,
>>> we may as well not ship it entirely.
>>> 
>>> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
>>> ---
>>> config/rootfiles/common/x86_64/util-linux | 2 +-
>>> config/rootfiles/core/170/update.sh       | 1 +
>>> 2 files changed, 2 insertions(+), 1 deletion(-)
>>> 
>>> diff --git a/config/rootfiles/common/x86_64/util-linux b/config/rootfiles/common/x86_64/util-linux
>>> index bd862b557..de78f65c2 100644
>>> --- a/config/rootfiles/common/x86_64/util-linux
>>> +++ b/config/rootfiles/common/x86_64/util-linux
>>> @@ -103,7 +103,7 @@ usr/bin/uclampset
>>> usr/bin/uuidgen
>>> usr/bin/uuidparse
>>> #usr/bin/whereis
>>> -usr/bin/x86_64
>>> +#usr/bin/x86_64
>>> #usr/include/blkid
>>> #usr/include/blkid/blkid.h
>>> #usr/include/libfdisk
>>> diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/170/update.sh
>>> index e3f93df57..5d8903189 100644
>>> --- a/config/rootfiles/core/170/update.sh
>>> +++ b/config/rootfiles/core/170/update.sh
>>> @@ -57,6 +57,7 @@ rm -rvf \
>>> 	/sbin/ifcfg \
>>> 	/sbin/routef \
>>> 	/sbin/rtpr \
>>> +	/usr/bin/x86_64 \
>>> 	/usr/lib/libbfd-2.36.* \
>>> 	/usr/lib/libbind9-9.16.2* \
>>> 	/usr/lib/libdnet* \
>>> -- 
>>> 2.35.3
>>
  

Okay, then I'll vote for dropping the broken symlink, as nobody has asked for "setarch" in years.

> Oh no, we should of course ship setarch or drop x86_64. Either or the other.
> 
> I missed that we were talking about a *broken* symlink here.
> 
>> On 12 Jul 2022, at 11:44, Peter Müller <peter.mueller@ipfire.org> wrote:
>>
>> Hello Michael,
>>
>> thanks for your reply.
>>
>>> Hello,
>>>
>>> Err, yes, but what do we gain from dropping this?
>>
>> Well, shipping a broken symlink did not seem to serve any purpose to me. Or were
>> you referring to not shipping /usr/bin/setarch?
>>
>> Thanks, and best regards,
>> Peter Müller
>>
>>>
>>> Does it hurt us to be compatible with any general purpose distribution?
>>>
>>> -Michael
>>>
>>>> On 9 Jul 2022, at 14:37, Peter Müller <peter.mueller@ipfire.org> wrote:
>>>>
>>>> This file points to /usr/bin/setarch, which we do not ship on any
>>>> architecture. As it serves no obvious purpose on IPFire installations,
>>>> we may as well not ship it entirely.
>>>>
>>>> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
>>>> ---
>>>> config/rootfiles/common/x86_64/util-linux | 2 +-
>>>> config/rootfiles/core/170/update.sh       | 1 +
>>>> 2 files changed, 2 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/config/rootfiles/common/x86_64/util-linux b/config/rootfiles/common/x86_64/util-linux
>>>> index bd862b557..de78f65c2 100644
>>>> --- a/config/rootfiles/common/x86_64/util-linux
>>>> +++ b/config/rootfiles/common/x86_64/util-linux
>>>> @@ -103,7 +103,7 @@ usr/bin/uclampset
>>>> usr/bin/uuidgen
>>>> usr/bin/uuidparse
>>>> #usr/bin/whereis
>>>> -usr/bin/x86_64
>>>> +#usr/bin/x86_64
>>>> #usr/include/blkid
>>>> #usr/include/blkid/blkid.h
>>>> #usr/include/libfdisk
>>>> diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/170/update.sh
>>>> index e3f93df57..5d8903189 100644
>>>> --- a/config/rootfiles/core/170/update.sh
>>>> +++ b/config/rootfiles/core/170/update.sh
>>>> @@ -57,6 +57,7 @@ rm -rvf \
>>>> 	/sbin/ifcfg \
>>>> 	/sbin/routef \
>>>> 	/sbin/rtpr \
>>>> +	/usr/bin/x86_64 \
>>>> 	/usr/lib/libbfd-2.36.* \
>>>> 	/usr/lib/libbind9-9.16.2* \
>>>> 	/usr/lib/libdnet* \
>>>> -- 
>>>> 2.35.3
>>>
>
  

Agreed.

> On 12 Jul 2022, at 12:42, Peter Müller <peter.mueller@ipfire.org> wrote:
> 
> Okay, then I'll vote for dropping the broken symlink, as nobody has asked for "setarch" in years.
> 
>> Oh no, we should of course ship setarch or drop x86_64. Either or the other.
>> 
>> I missed that we were talking about a *broken* symlink here.
>> 
>>> On 12 Jul 2022, at 11:44, Peter Müller <peter.mueller@ipfire.org> wrote:
>>> 
>>> Hello Michael,
>>> 
>>> thanks for your reply.
>>> 
>>>> Hello,
>>>> 
>>>> Err, yes, but what do we gain from dropping this?
>>> 
>>> Well, shipping a broken symlink did not seem to serve any purpose to me. Or were
>>> you referring to not shipping /usr/bin/setarch?
>>> 
>>> Thanks, and best regards,
>>> Peter Müller
>>> 
>>>> 
>>>> Does it hurt us to be compatible with any general purpose distribution?
>>>> 
>>>> -Michael
>>>> 
>>>>> On 9 Jul 2022, at 14:37, Peter Müller <peter.mueller@ipfire.org> wrote:
>>>>> 
>>>>> This file points to /usr/bin/setarch, which we do not ship on any
>>>>> architecture. As it serves no obvious purpose on IPFire installations,
>>>>> we may as well not ship it entirely.
>>>>> 
>>>>> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
>>>>> ---
>>>>> config/rootfiles/common/x86_64/util-linux | 2 +-
>>>>> config/rootfiles/core/170/update.sh       | 1 +
>>>>> 2 files changed, 2 insertions(+), 1 deletion(-)
>>>>> 
>>>>> diff --git a/config/rootfiles/common/x86_64/util-linux b/config/rootfiles/common/x86_64/util-linux
>>>>> index bd862b557..de78f65c2 100644
>>>>> --- a/config/rootfiles/common/x86_64/util-linux
>>>>> +++ b/config/rootfiles/common/x86_64/util-linux
>>>>> @@ -103,7 +103,7 @@ usr/bin/uclampset
>>>>> usr/bin/uuidgen
>>>>> usr/bin/uuidparse
>>>>> #usr/bin/whereis
>>>>> -usr/bin/x86_64
>>>>> +#usr/bin/x86_64
>>>>> #usr/include/blkid
>>>>> #usr/include/blkid/blkid.h
>>>>> #usr/include/libfdisk
>>>>> diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/170/update.sh
>>>>> index e3f93df57..5d8903189 100644
>>>>> --- a/config/rootfiles/core/170/update.sh
>>>>> +++ b/config/rootfiles/core/170/update.sh
>>>>> @@ -57,6 +57,7 @@ rm -rvf \
>>>>> 	/sbin/ifcfg \
>>>>> 	/sbin/routef \
>>>>> 	/sbin/rtpr \
>>>>> +	/usr/bin/x86_64 \
>>>>> 	/usr/lib/libbfd-2.36.* \
>>>>> 	/usr/lib/libbind9-9.16.2* \
>>>>> 	/usr/lib/libdnet* \
>>>>> -- 
>>>>> 2.35.3
>>>> 
>>