[meta-arago,oe-layersetup,3/6] Remove image-prelink from sample USER_CLASSES

Message ID 20220426200251.19417-3-afd@ti.com
State Superseded
Delegated to: Ryan Eatmon
Headers show
Series [meta-arago,oe-layersetup,1/6] Remove unused sample-file bblayers-zeus-browser.conf.sample | expand

Commit Message

Andrew Davis April 26, 2022, 8:02 p.m. UTC
Prelinking hasn't worked on ARM in a while so this class was
removed in the latests core master. Remove it here.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 sample-files/local-arago64-v2.conf.sample | 4 +---
 sample-files/local-poky-v2.conf.sample    | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

Comments

Denys Dmytriyenko April 26, 2022, 9:11 p.m. UTC | #1
On Tue, Apr 26, 2022 at 03:02:48PM -0500, Andrew F. Davis via lists.yoctoproject.org wrote:
> Prelinking hasn't worked on ARM in a while so this class was
> removed in the latests core master. Remove it here.

This file is used for both dunfell and master. Maybe this change calls for v3 
of the corresponding sample files?


> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
>  sample-files/local-arago64-v2.conf.sample | 4 +---
>  sample-files/local-poky-v2.conf.sample    | 4 +---
>  2 files changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/sample-files/local-arago64-v2.conf.sample b/sample-files/local-arago64-v2.conf.sample
> index 9549e8a..13585cb 100644
> --- a/sample-files/local-arago64-v2.conf.sample
> +++ b/sample-files/local-arago64-v2.conf.sample
> @@ -112,11 +112,9 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks"
>  # enable extra features. Some available options which can be included in this variable 
>  # are:
>  #   - 'buildstats' collect build statistics
> -#   - 'image-prelink' in order to prelink the filesystem image
>  #   - 'image-swab' to perform host system intrusion detection
> -# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
>  # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
> -USER_CLASSES ?= "buildstats image-prelink"
> +USER_CLASSES ?= "buildstats"
>  
>  # By default disable interactive patch resolution (tasks will just fail instead):
>  PATCHRESOLVE = "noop"
> diff --git a/sample-files/local-poky-v2.conf.sample b/sample-files/local-poky-v2.conf.sample
> index 5cbe6ef..a958055 100644
> --- a/sample-files/local-poky-v2.conf.sample
> +++ b/sample-files/local-poky-v2.conf.sample
> @@ -109,11 +109,9 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks"
>  # enable extra features. Some available options which can be included in this variable 
>  # are:
>  #   - 'buildstats' collect build statistics
> -#   - 'image-prelink' in order to prelink the filesystem image
>  #   - 'image-swab' to perform host system intrusion detection
> -# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
>  # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
> -USER_CLASSES ?= "buildstats image-prelink"
> +USER_CLASSES ?= "buildstats"
>  
>  # By default disable interactive patch resolution (tasks will just fail instead):
>  PATCHRESOLVE = "noop"
> -- 
> 2.17.1
Andrew Davis April 26, 2022, 9:20 p.m. UTC | #2
On 4/26/22 4:11 PM, Denys Dmytriyenko wrote:
> On Tue, Apr 26, 2022 at 03:02:48PM -0500, Andrew F. Davis via lists.yoctoproject.org wrote:
>> Prelinking hasn't worked on ARM in a while so this class was
>> removed in the latests core master. Remove it here.
> 
> This file is used for both dunfell and master. Maybe this change calls for v3
> of the corresponding sample files?
> 


I only see these v2 files referenced in master configs.

Andrew


> 
>> Signed-off-by: Andrew Davis <afd@ti.com>
>> ---
>>   sample-files/local-arago64-v2.conf.sample | 4 +---
>>   sample-files/local-poky-v2.conf.sample    | 4 +---
>>   2 files changed, 2 insertions(+), 6 deletions(-)
>>
>> diff --git a/sample-files/local-arago64-v2.conf.sample b/sample-files/local-arago64-v2.conf.sample
>> index 9549e8a..13585cb 100644
>> --- a/sample-files/local-arago64-v2.conf.sample
>> +++ b/sample-files/local-arago64-v2.conf.sample
>> @@ -112,11 +112,9 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks"
>>   # enable extra features. Some available options which can be included in this variable
>>   # are:
>>   #   - 'buildstats' collect build statistics
>> -#   - 'image-prelink' in order to prelink the filesystem image
>>   #   - 'image-swab' to perform host system intrusion detection
>> -# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
>>   # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
>> -USER_CLASSES ?= "buildstats image-prelink"
>> +USER_CLASSES ?= "buildstats"
>>   
>>   # By default disable interactive patch resolution (tasks will just fail instead):
>>   PATCHRESOLVE = "noop"
>> diff --git a/sample-files/local-poky-v2.conf.sample b/sample-files/local-poky-v2.conf.sample
>> index 5cbe6ef..a958055 100644
>> --- a/sample-files/local-poky-v2.conf.sample
>> +++ b/sample-files/local-poky-v2.conf.sample
>> @@ -109,11 +109,9 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks"
>>   # enable extra features. Some available options which can be included in this variable
>>   # are:
>>   #   - 'buildstats' collect build statistics
>> -#   - 'image-prelink' in order to prelink the filesystem image
>>   #   - 'image-swab' to perform host system intrusion detection
>> -# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
>>   # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
>> -USER_CLASSES ?= "buildstats image-prelink"
>> +USER_CLASSES ?= "buildstats"
>>   
>>   # By default disable interactive patch resolution (tasks will just fail instead):
>>   PATCHRESOLVE = "noop"
>> -- 
>> 2.17.1
Denys Dmytriyenko April 26, 2022, 9:33 p.m. UTC | #3
On Tue, Apr 26, 2022 at 04:20:14PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> On 4/26/22 4:11 PM, Denys Dmytriyenko wrote:
> >On Tue, Apr 26, 2022 at 03:02:48PM -0500, Andrew F. Davis via lists.yoctoproject.org wrote:
> >>Prelinking hasn't worked on ARM in a while so this class was
> >>removed in the latests core master. Remove it here.
> >
> >This file is used for both dunfell and master. Maybe this change calls for v3
> >of the corresponding sample files?
> >
> 
> 
> I only see these v2 files referenced in master configs.

Ah, v2 wasn't that old and was still not used in dunfell (it felt like 
eternity for some reason):

https://lists.yoctoproject.org/g/meta-arago/message/13289

Ok, no need for v3:

Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>


> >>Signed-off-by: Andrew Davis <afd@ti.com>
> >>---
> >>  sample-files/local-arago64-v2.conf.sample | 4 +---
> >>  sample-files/local-poky-v2.conf.sample    | 4 +---
> >>  2 files changed, 2 insertions(+), 6 deletions(-)
> >>
> >>diff --git a/sample-files/local-arago64-v2.conf.sample b/sample-files/local-arago64-v2.conf.sample
> >>index 9549e8a..13585cb 100644
> >>--- a/sample-files/local-arago64-v2.conf.sample
> >>+++ b/sample-files/local-arago64-v2.conf.sample
> >>@@ -112,11 +112,9 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks"
> >>  # enable extra features. Some available options which can be included in this variable
> >>  # are:
> >>  #   - 'buildstats' collect build statistics
> >>-#   - 'image-prelink' in order to prelink the filesystem image
> >>  #   - 'image-swab' to perform host system intrusion detection
> >>-# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
> >>  # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
> >>-USER_CLASSES ?= "buildstats image-prelink"
> >>+USER_CLASSES ?= "buildstats"
> >>  # By default disable interactive patch resolution (tasks will just fail instead):
> >>  PATCHRESOLVE = "noop"
> >>diff --git a/sample-files/local-poky-v2.conf.sample b/sample-files/local-poky-v2.conf.sample
> >>index 5cbe6ef..a958055 100644
> >>--- a/sample-files/local-poky-v2.conf.sample
> >>+++ b/sample-files/local-poky-v2.conf.sample
> >>@@ -109,11 +109,9 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks"
> >>  # enable extra features. Some available options which can be included in this variable
> >>  # are:
> >>  #   - 'buildstats' collect build statistics
> >>-#   - 'image-prelink' in order to prelink the filesystem image
> >>  #   - 'image-swab' to perform host system intrusion detection
> >>-# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
> >>  # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
> >>-USER_CLASSES ?= "buildstats image-prelink"
> >>+USER_CLASSES ?= "buildstats"
> >>  # By default disable interactive patch resolution (tasks will just fail instead):
> >>  PATCHRESOLVE = "noop"
> >>-- 
> >>2.17.1

Patch

diff --git a/sample-files/local-arago64-v2.conf.sample b/sample-files/local-arago64-v2.conf.sample
index 9549e8a..13585cb 100644
--- a/sample-files/local-arago64-v2.conf.sample
+++ b/sample-files/local-arago64-v2.conf.sample
@@ -112,11 +112,9 @@  EXTRA_IMAGE_FEATURES = "debug-tweaks"
 # enable extra features. Some available options which can be included in this variable 
 # are:
 #   - 'buildstats' collect build statistics
-#   - 'image-prelink' in order to prelink the filesystem image
 #   - 'image-swab' to perform host system intrusion detection
-# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
 # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
-USER_CLASSES ?= "buildstats image-prelink"
+USER_CLASSES ?= "buildstats"
 
 # By default disable interactive patch resolution (tasks will just fail instead):
 PATCHRESOLVE = "noop"
diff --git a/sample-files/local-poky-v2.conf.sample b/sample-files/local-poky-v2.conf.sample
index 5cbe6ef..a958055 100644
--- a/sample-files/local-poky-v2.conf.sample
+++ b/sample-files/local-poky-v2.conf.sample
@@ -109,11 +109,9 @@  EXTRA_IMAGE_FEATURES = "debug-tweaks"
 # enable extra features. Some available options which can be included in this variable 
 # are:
 #   - 'buildstats' collect build statistics
-#   - 'image-prelink' in order to prelink the filesystem image
 #   - 'image-swab' to perform host system intrusion detection
-# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
 # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
-USER_CLASSES ?= "buildstats image-prelink"
+USER_CLASSES ?= "buildstats"
 
 # By default disable interactive patch resolution (tasks will just fail instead):
 PATCHRESOLVE = "noop"