Patchwork test-container: Install with $(sorted-subdirs) [BZ #24794]

login
register
mail settings
Submitter Tulio Magno Quites Machado Filho
Date July 25, 2019, 12:03 a.m.
Message ID <20190725000323.15612-1-tuliom@linux.ibm.com>
Download mbox | patch
Permalink /patch/33793/
State New
Headers show

Comments

Tulio Magno Quites Machado Filho - July 25, 2019, 12:03 a.m.
Commit 35e038c1d2ccb3a75395662f9c4f28d85a61444f started to use an
incomplete list of subdirs based on $(all-subdirs) causing
testroot.pristine to miss files from nss.

Tested if the list of files in testroot.pristine remains the same.

2019-07-24  Tulio Magno Quites Machado Filho  <tuliom@linux.ibm.com>

	[BZ #24794]
	* Makeconfig (all-subdirs): Improved source comments.
	* Makefile (testroot.pristine/install.stamp): Pass
	subdirs='$(sorted-subdirs)' to make install.
---
 Makeconfig | 6 +++---
 Makefile   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
Szabolcs Nagy - July 25, 2019, 12:46 p.m.
On 25/07/2019 01:03, Tulio Magno Quites Machado Filho wrote:
> Commit 35e038c1d2ccb3a75395662f9c4f28d85a61444f started to use an

> incomplete list of subdirs based on $(all-subdirs) causing

> testroot.pristine to miss files from nss.

> 

> Tested if the list of files in testroot.pristine remains the same.


fwiw with this patch aarch64 buildbot would go back to green.

> 

> 2019-07-24  Tulio Magno Quites Machado Filho  <tuliom@linux.ibm.com>

> 

> 	[BZ #24794]

> 	* Makeconfig (all-subdirs): Improved source comments.

> 	* Makefile (testroot.pristine/install.stamp): Pass

> 	subdirs='$(sorted-subdirs)' to make install.

> ---

>  Makeconfig | 6 +++---

>  Makefile   | 2 +-

>  2 files changed, 4 insertions(+), 4 deletions(-)

> 

> diff --git a/Makeconfig b/Makeconfig

> index 0e386fbc19..fd36c58c04 100644

> --- a/Makeconfig

> +++ b/Makeconfig

> @@ -1267,9 +1267,9 @@ else

>  libsupport = $(common-objpfx)support/libsupport.a

>  endif

>  

> -# These are the subdirectories containing the library source.  The order

> -# is more or less arbitrary.  The sorting step will take care of the

> -# dependencies.

> +# This is a partial list of subdirectories containing the library source.

> +# The order is more or less arbitrary.  The sorting step will take care of the

> +# dependencies and generate sorted-subdirs dynamically.

>  all-subdirs = csu assert ctype locale intl catgets math setjmp signal	    \

>  	      stdlib stdio-common libio malloc string wcsmbs time dirent    \

>  	      grp pwd posix io termios resource misc socket sysvipc gmon    \

> diff --git a/Makefile b/Makefile

> index 9fbf705200..ac1125853b 100644

> --- a/Makefile

> +++ b/Makefile

> @@ -402,7 +402,7 @@ ifeq ($(run-built-tests),yes)

>  	  done

>  endif

>  	$(MAKE) install DESTDIR=$(objpfx)testroot.pristine \

> -	  subdirs='$(all-subdirs)'

> +	  subdirs='$(sorted-subdirs)'

>  	touch $(objpfx)testroot.pristine/install.stamp

>  

>  tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special))

>
Carlos O'Donell - July 25, 2019, 12:56 p.m.
On 7/25/19 8:46 AM, Szabolcs Nagy wrote:
> On 25/07/2019 01:03, Tulio Magno Quites Machado Filho wrote:
>> Commit 35e038c1d2ccb3a75395662f9c4f28d85a61444f started to use an
>> incomplete list of subdirs based on $(all-subdirs) causing
>> testroot.pristine to miss files from nss.
>>
>> Tested if the list of files in testroot.pristine remains the same.
> 
> fwiw with this patch aarch64 buildbot would go back to green.

This is good enough confirmation for me.

Please install the fix so we can get clean builds for the release.

>>
>> 2019-07-24  Tulio Magno Quites Machado Filho  <tuliom@linux.ibm.com>
>>
>> 	[BZ #24794]
>> 	* Makeconfig (all-subdirs): Improved source comments.
>> 	* Makefile (testroot.pristine/install.stamp): Pass
>> 	subdirs='$(sorted-subdirs)' to make install.
>> ---
>>   Makeconfig | 6 +++---
>>   Makefile   | 2 +-
>>   2 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/Makeconfig b/Makeconfig
>> index 0e386fbc19..fd36c58c04 100644
>> --- a/Makeconfig
>> +++ b/Makeconfig
>> @@ -1267,9 +1267,9 @@ else
>>   libsupport = $(common-objpfx)support/libsupport.a
>>   endif
>>   
>> -# These are the subdirectories containing the library source.  The order
>> -# is more or less arbitrary.  The sorting step will take care of the
>> -# dependencies.
>> +# This is a partial list of subdirectories containing the library source.
>> +# The order is more or less arbitrary.  The sorting step will take care of the
>> +# dependencies and generate sorted-subdirs dynamically.
>>   all-subdirs = csu assert ctype locale intl catgets math setjmp signal	    \
>>   	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
>>   	      grp pwd posix io termios resource misc socket sysvipc gmon    \
>> diff --git a/Makefile b/Makefile
>> index 9fbf705200..ac1125853b 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -402,7 +402,7 @@ ifeq ($(run-built-tests),yes)
>>   	  done
>>   endif
>>   	$(MAKE) install DESTDIR=$(objpfx)testroot.pristine \
>> -	  subdirs='$(all-subdirs)'
>> +	  subdirs='$(sorted-subdirs)'
>>   	touch $(objpfx)testroot.pristine/install.stamp
>>   
>>   tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special))
>>
>
Stefan Liebler - July 25, 2019, 1:23 p.m.
Hi Tulio,

with this patch, testroot.pristine contains the missing getent / makedb 
executables and libnss_* libraries.
Now nss/tst-nss-files-hosts-long and all other container tests are passing.

Thanks,
Stefan

On 7/25/19 2:03 AM, Tulio Magno Quites Machado Filho wrote:
> Commit 35e038c1d2ccb3a75395662f9c4f28d85a61444f started to use an
> incomplete list of subdirs based on $(all-subdirs) causing
> testroot.pristine to miss files from nss.
> 
> Tested if the list of files in testroot.pristine remains the same.
> 
> 2019-07-24  Tulio Magno Quites Machado Filho  <tuliom@linux.ibm.com>
> 
> 	[BZ #24794]
> 	* Makeconfig (all-subdirs): Improved source comments.
> 	* Makefile (testroot.pristine/install.stamp): Pass
> 	subdirs='$(sorted-subdirs)' to make install.
> ---
>   Makeconfig | 6 +++---
>   Makefile   | 2 +-
>   2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/Makeconfig b/Makeconfig
> index 0e386fbc19..fd36c58c04 100644
> --- a/Makeconfig
> +++ b/Makeconfig
> @@ -1267,9 +1267,9 @@ else
>   libsupport = $(common-objpfx)support/libsupport.a
>   endif
>   
> -# These are the subdirectories containing the library source.  The order
> -# is more or less arbitrary.  The sorting step will take care of the
> -# dependencies.
> +# This is a partial list of subdirectories containing the library source.
> +# The order is more or less arbitrary.  The sorting step will take care of the
> +# dependencies and generate sorted-subdirs dynamically.
>   all-subdirs = csu assert ctype locale intl catgets math setjmp signal	    \
>   	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
>   	      grp pwd posix io termios resource misc socket sysvipc gmon    \
> diff --git a/Makefile b/Makefile
> index 9fbf705200..ac1125853b 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -402,7 +402,7 @@ ifeq ($(run-built-tests),yes)
>   	  done
>   endif
>   	$(MAKE) install DESTDIR=$(objpfx)testroot.pristine \
> -	  subdirs='$(all-subdirs)'
> +	  subdirs='$(sorted-subdirs)'
>   	touch $(objpfx)testroot.pristine/install.stamp
>   
>   tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special))
>
Tulio Magno Quites Machado Filho - July 29, 2019, 1:36 p.m.
Carlos O'Donell <carlos@redhat.com> writes:

> On 7/25/19 8:46 AM, Szabolcs Nagy wrote:
>> On 25/07/2019 01:03, Tulio Magno Quites Machado Filho wrote:
>>> Commit 35e038c1d2ccb3a75395662f9c4f28d85a61444f started to use an
>>> incomplete list of subdirs based on $(all-subdirs) causing
>>> testroot.pristine to miss files from nss.
>>>
>>> Tested if the list of files in testroot.pristine remains the same.
>> 
>> fwiw with this patch aarch64 buildbot would go back to green.
>
> This is good enough confirmation for me.
>
> Please install the fix so we can get clean builds for the release.

I've just pushed it to master.

DJ,
I took the freedom to add your name to the ChangeLog file too as you proposed
the same fix.  ;-)

Pushed as 354e4c1adddb1.

Patch

diff --git a/Makeconfig b/Makeconfig
index 0e386fbc19..fd36c58c04 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -1267,9 +1267,9 @@  else
 libsupport = $(common-objpfx)support/libsupport.a
 endif
 
-# These are the subdirectories containing the library source.  The order
-# is more or less arbitrary.  The sorting step will take care of the
-# dependencies.
+# This is a partial list of subdirectories containing the library source.
+# The order is more or less arbitrary.  The sorting step will take care of the
+# dependencies and generate sorted-subdirs dynamically.
 all-subdirs = csu assert ctype locale intl catgets math setjmp signal	    \
 	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
 	      grp pwd posix io termios resource misc socket sysvipc gmon    \
diff --git a/Makefile b/Makefile
index 9fbf705200..ac1125853b 100644
--- a/Makefile
+++ b/Makefile
@@ -402,7 +402,7 @@  ifeq ($(run-built-tests),yes)
 	  done
 endif
 	$(MAKE) install DESTDIR=$(objpfx)testroot.pristine \
-	  subdirs='$(all-subdirs)'
+	  subdirs='$(sorted-subdirs)'
 	touch $(objpfx)testroot.pristine/install.stamp
 
 tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special))