All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/1] wic: Use ROOTFS_DIR to locate pseudo_dir
@ 2022-06-15  6:35 Robert Yang
  2022-06-15  6:35 ` [PATCH 1/1] " Robert Yang
  0 siblings, 1 reply; 6+ messages in thread
From: Robert Yang @ 2022-06-15  6:35 UTC (permalink / raw)
  To: openembedded-core

The following changes since commit dd39446dff75c6e48f4aa44ec90087f172d717d4:

  python3-cryptography: remove test_x509.py (2022-06-14 10:03:58 +0100)

are available in the Git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/wic
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/wic

Robert Yang (1):
  wic: Use ROOTFS_DIR to locate pseudo_dir

 scripts/lib/wic/plugins/source/rootfs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.33.1



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

* [PATCH 1/1] wic: Use ROOTFS_DIR to locate pseudo_dir
  2022-06-15  6:35 [PATCH 0/1] wic: Use ROOTFS_DIR to locate pseudo_dir Robert Yang
@ 2022-06-15  6:35 ` Robert Yang
  2022-06-15  7:26   ` [OE-core] " Alexandre Belloni
  0 siblings, 1 reply; 6+ messages in thread
From: Robert Yang @ 2022-06-15  6:35 UTC (permalink / raw)
  To: openembedded-core

Fixed when wks is:
part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --fixed-size 256M
part / --source rootfs --exclude-path=var/ --ondisk mmcblk0 --fstype=ext4 --label root --align 4096
part /var --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var --ondrive mmcblk0 --fstype=ext4 --label var --align 4096 --fixed-size 1024M --fsoptions=ro,relatime,sync

$ bitbake <image>
$ wic create <wks> -e <image>
WARNING: /path/to/rootfs/var/../pseudo folder does not exist. Usernames and permissions will be invalid

The --rootfs-dir can be anywhere, so the ../pseudo may not exist, use
ROOTFS_DIR to fix the problem.

The patch is from "Rath Anil Kumar <AnilKumar.Rath@windriver.com>"

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 scripts/lib/wic/plugins/source/rootfs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py
index 25bb41dd702..11b09c1e80e 100644
--- a/scripts/lib/wic/plugins/source/rootfs.py
+++ b/scripts/lib/wic/plugins/source/rootfs.py
@@ -95,7 +95,7 @@ class RootfsPlugin(SourcePlugin):
 
         part.rootfs_dir = cls.__get_rootfs_dir(rootfs_dir)
         part.has_fstab = os.path.exists(os.path.join(part.rootfs_dir, "etc/fstab"))
-        pseudo_dir = os.path.join(part.rootfs_dir, "../pseudo")
+        pseudo_dir = os.path.join(krootfs_dir['ROOTFS_DIR'], "../pseudo")
         if not os.path.lexists(pseudo_dir):
             pseudo_dir = os.path.join(cls.__get_rootfs_dir(None), '../pseudo')
 
-- 
2.33.1



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

* Re: [OE-core] [PATCH 1/1] wic: Use ROOTFS_DIR to locate pseudo_dir
  2022-06-15  6:35 ` [PATCH 1/1] " Robert Yang
@ 2022-06-15  7:26   ` Alexandre Belloni
  2022-06-15  9:52     ` Robert Yang
  0 siblings, 1 reply; 6+ messages in thread
From: Alexandre Belloni @ 2022-06-15  7:26 UTC (permalink / raw)
  To: Robert Yang; +Cc: openembedded-core

Hello,

On 14/06/2022 23:35:29-0700, Robert Yang wrote:
> Fixed when wks is:
> part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --fixed-size 256M
> part / --source rootfs --exclude-path=var/ --ondisk mmcblk0 --fstype=ext4 --label root --align 4096
> part /var --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var --ondrive mmcblk0 --fstype=ext4 --label var --align 4096 --fixed-size 1024M --fsoptions=ro,relatime,sync
> 
> $ bitbake <image>
> $ wic create <wks> -e <image>
> WARNING: /path/to/rootfs/var/../pseudo folder does not exist. Usernames and permissions will be invalid
> 
> The --rootfs-dir can be anywhere, so the ../pseudo may not exist, use
> ROOTFS_DIR to fix the problem.
> 
> The patch is from "Rath Anil Kumar <AnilKumar.Rath@windriver.com>"

We need a proper Signed-off-by and From: to reflect that.

> 
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  scripts/lib/wic/plugins/source/rootfs.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py
> index 25bb41dd702..11b09c1e80e 100644
> --- a/scripts/lib/wic/plugins/source/rootfs.py
> +++ b/scripts/lib/wic/plugins/source/rootfs.py
> @@ -95,7 +95,7 @@ class RootfsPlugin(SourcePlugin):
>  
>          part.rootfs_dir = cls.__get_rootfs_dir(rootfs_dir)
>          part.has_fstab = os.path.exists(os.path.join(part.rootfs_dir, "etc/fstab"))
> -        pseudo_dir = os.path.join(part.rootfs_dir, "../pseudo")
> +        pseudo_dir = os.path.join(krootfs_dir['ROOTFS_DIR'], "../pseudo")
>          if not os.path.lexists(pseudo_dir):
>              pseudo_dir = os.path.join(cls.__get_rootfs_dir(None), '../pseudo')
>  
> -- 
> 2.33.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#166909): https://lists.openembedded.org/g/openembedded-core/message/166909
> Mute This Topic: https://lists.openembedded.org/mt/91771589/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com


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

* Re: [OE-core] [PATCH 1/1] wic: Use ROOTFS_DIR to locate pseudo_dir
  2022-06-15  7:26   ` [OE-core] " Alexandre Belloni
@ 2022-06-15  9:52     ` Robert Yang
  2022-06-15 10:22       ` Alexandre Belloni
  0 siblings, 1 reply; 6+ messages in thread
From: Robert Yang @ 2022-06-15  9:52 UTC (permalink / raw)
  To: Alexandre Belloni; +Cc: openembedded-core



On 6/15/22 3:26 PM, Alexandre Belloni wrote:
> Hello,
> 
> On 14/06/2022 23:35:29-0700, Robert Yang wrote:
>> Fixed when wks is:
>> part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --fixed-size 256M
>> part / --source rootfs --exclude-path=var/ --ondisk mmcblk0 --fstype=ext4 --label root --align 4096
>> part /var --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var --ondrive mmcblk0 --fstype=ext4 --label var --align 4096 --fixed-size 1024M --fsoptions=ro,relatime,sync
>>
>> $ bitbake <image>
>> $ wic create <wks> -e <image>
>> WARNING: /path/to/rootfs/var/../pseudo folder does not exist. Usernames and permissions will be invalid
>>
>> The --rootfs-dir can be anywhere, so the ../pseudo may not exist, use
>> ROOTFS_DIR to fix the problem.
>>
>> The patch is from "Rath Anil Kumar <AnilKumar.Rath@windriver.com>"
> 
> We need a proper Signed-off-by and From: to reflect that.

I got the raw patch from a website and added the commit messages, so I didn't
add a formal 'From:', and yes, add it would be better, but I can't add the SOB
for others. I've added the 'From:' in the PULL:

   git://git.openembedded.org/openembedded-core-contrib rbt/wic

     wic: Use ROOTFS_DIR to locate pseudo_dir

     Fixed when wks is:
     part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat 
--label boot --active --align 4096 --fixed-size 256M
     part / --source rootfs --exclude-path=var/ --ondisk mmcblk0 --fstype=ext4 
--label root --align 4096
     part /var --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var --ondrive 
mmcblk0 --fstype=ext4 --label var --align 4096 --fixed-size 1024M -
-fsoptions=ro,relatime,sync

     $ bitbake <image>
     $ wic create <wks> -e <image>
     WARNING: /path/to/rootfs/var/../pseudo folder does not exist. Usernames and 
permissions will be invalid

     The --rootfs-dir can be anywhere, so the ../pseudo may not exist, use
     ROOTFS_DIR to fix the problem.

     From: Rath Anil Kumar <AnilKumar.Rath@windriver.com>
     Signed-off-by: Robert Yang <liezhi.yang@windriver.com>


// Robert


> 
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>>   scripts/lib/wic/plugins/source/rootfs.py | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py
>> index 25bb41dd702..11b09c1e80e 100644
>> --- a/scripts/lib/wic/plugins/source/rootfs.py
>> +++ b/scripts/lib/wic/plugins/source/rootfs.py
>> @@ -95,7 +95,7 @@ class RootfsPlugin(SourcePlugin):
>>   
>>           part.rootfs_dir = cls.__get_rootfs_dir(rootfs_dir)
>>           part.has_fstab = os.path.exists(os.path.join(part.rootfs_dir, "etc/fstab"))
>> -        pseudo_dir = os.path.join(part.rootfs_dir, "../pseudo")
>> +        pseudo_dir = os.path.join(krootfs_dir['ROOTFS_DIR'], "../pseudo")
>>           if not os.path.lexists(pseudo_dir):
>>               pseudo_dir = os.path.join(cls.__get_rootfs_dir(None), '../pseudo')
>>   
>> -- 
>> 2.33.1
>>
> 
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#166909): https://lists.openembedded.org/g/openembedded-core/message/166909
>> Mute This Topic: https://lists.openembedded.org/mt/91771589/3617179
>> Group Owner: openembedded-core+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
> 
> 


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

* Re: [OE-core] [PATCH 1/1] wic: Use ROOTFS_DIR to locate pseudo_dir
  2022-06-15  9:52     ` Robert Yang
@ 2022-06-15 10:22       ` Alexandre Belloni
  2022-06-15 14:54         ` Randy MacLeod
  0 siblings, 1 reply; 6+ messages in thread
From: Alexandre Belloni @ 2022-06-15 10:22 UTC (permalink / raw)
  To: Robert Yang; +Cc: openembedded-core

On 15/06/2022 17:52:18+0800, Robert Yang wrote:
> 
> 
> On 6/15/22 3:26 PM, Alexandre Belloni wrote:
> > Hello,
> > 
> > On 14/06/2022 23:35:29-0700, Robert Yang wrote:
> > > Fixed when wks is:
> > > part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --fixed-size 256M
> > > part / --source rootfs --exclude-path=var/ --ondisk mmcblk0 --fstype=ext4 --label root --align 4096
> > > part /var --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var --ondrive mmcblk0 --fstype=ext4 --label var --align 4096 --fixed-size 1024M --fsoptions=ro,relatime,sync
> > > 
> > > $ bitbake <image>
> > > $ wic create <wks> -e <image>
> > > WARNING: /path/to/rootfs/var/../pseudo folder does not exist. Usernames and permissions will be invalid
> > > 
> > > The --rootfs-dir can be anywhere, so the ../pseudo may not exist, use
> > > ROOTFS_DIR to fix the problem.
> > > 
> > > The patch is from "Rath Anil Kumar <AnilKumar.Rath@windriver.com>"
> > 
> > We need a proper Signed-off-by and From: to reflect that.
> 
> I got the raw patch from a website and added the commit messages, so I didn't
> add a formal 'From:', and yes, add it would be better, but I can't add the SOB
> for others. I've added the 'From:' in the PULL:
> 

Well, according to the DCO, you must add the SoB from the original
author, else, there is no guarantee anyone is allowed to shared the
code.

>   git://git.openembedded.org/openembedded-core-contrib rbt/wic
> 
>     wic: Use ROOTFS_DIR to locate pseudo_dir
> 
>     Fixed when wks is:
>     part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat
> --label boot --active --align 4096 --fixed-size 256M
>     part / --source rootfs --exclude-path=var/ --ondisk mmcblk0
> --fstype=ext4 --label root --align 4096
>     part /var --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var --ondrive
> mmcblk0 --fstype=ext4 --label var --align 4096 --fixed-size 1024M -
> -fsoptions=ro,relatime,sync
> 
>     $ bitbake <image>
>     $ wic create <wks> -e <image>
>     WARNING: /path/to/rootfs/var/../pseudo folder does not exist. Usernames
> and permissions will be invalid
> 
>     The --rootfs-dir can be anywhere, so the ../pseudo may not exist, use
>     ROOTFS_DIR to fix the problem.
> 
>     From: Rath Anil Kumar <AnilKumar.Rath@windriver.com>
>     Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> 
> 
> // Robert
> 
> 
> > 
> > > 
> > > Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> > > ---
> > >   scripts/lib/wic/plugins/source/rootfs.py | 2 +-
> > >   1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py
> > > index 25bb41dd702..11b09c1e80e 100644
> > > --- a/scripts/lib/wic/plugins/source/rootfs.py
> > > +++ b/scripts/lib/wic/plugins/source/rootfs.py
> > > @@ -95,7 +95,7 @@ class RootfsPlugin(SourcePlugin):
> > >           part.rootfs_dir = cls.__get_rootfs_dir(rootfs_dir)
> > >           part.has_fstab = os.path.exists(os.path.join(part.rootfs_dir, "etc/fstab"))
> > > -        pseudo_dir = os.path.join(part.rootfs_dir, "../pseudo")
> > > +        pseudo_dir = os.path.join(krootfs_dir['ROOTFS_DIR'], "../pseudo")
> > >           if not os.path.lexists(pseudo_dir):
> > >               pseudo_dir = os.path.join(cls.__get_rootfs_dir(None), '../pseudo')
> > > -- 
> > > 2.33.1
> > > 
> > 
> > > 
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > > Links: You receive all messages sent to this group.
> > > View/Reply Online (#166909): https://lists.openembedded.org/g/openembedded-core/message/166909
> > > Mute This Topic: https://lists.openembedded.org/mt/91771589/3617179
> > > Group Owner: openembedded-core+owner@lists.openembedded.org
> > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > > 
> > 
> > 

-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com


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

* Re: [OE-core] [PATCH 1/1] wic: Use ROOTFS_DIR to locate pseudo_dir
  2022-06-15 10:22       ` Alexandre Belloni
@ 2022-06-15 14:54         ` Randy MacLeod
  0 siblings, 0 replies; 6+ messages in thread
From: Randy MacLeod @ 2022-06-15 14:54 UTC (permalink / raw)
  To: alexandre.belloni, Robert Yang, anilkumar.rath; +Cc: openembedded-core

Add Anil Rath, the patch author.

On 2022-06-15 06:22, Alexandre Belloni via lists.openembedded.org wrote:
> On 15/06/2022 17:52:18+0800, Robert Yang wrote:
>> On 6/15/22 3:26 PM, Alexandre Belloni wrote:
>>> Hello,
>>>
>>> On 14/06/2022 23:35:29-0700, Robert Yang wrote:
>>>> Fixed when wks is:
>>>> part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --fixed-size 256M
>>>> part / --source rootfs --exclude-path=var/ --ondisk mmcblk0 --fstype=ext4 --label root --align 4096
>>>> part /var --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var --ondrive mmcblk0 --fstype=ext4 --label var --align 4096 --fixed-size 1024M --fsoptions=ro,relatime,sync
>>>>
>>>> $ bitbake <image>
>>>> $ wic create <wks> -e <image>
>>>> WARNING: /path/to/rootfs/var/../pseudo folder does not exist. Usernames and permissions will be invalid
>>>>
>>>> The --rootfs-dir can be anywhere, so the ../pseudo may not exist, use
>>>> ROOTFS_DIR to fix the problem.
>>>>
>>>> The patch is from "Rath Anil Kumar <AnilKumar.Rath@windriver.com>"
>>> We need a proper Signed-off-by and From: to reflect that.
>> I got the raw patch from a website and added the commit messages, so I didn't
>> add a formal 'From:', and yes, add it would be better, but I can't add the SOB
>> for others. I've added the 'From:' in the PULL:
>>
> Well, according to the DCO, you must add the SoB from the original
> author, else, there is no guarantee anyone is allowed to shared the
> code.
Anil,

Can you confirm privately with Robert to fix this so we can get your 
patch merged?

Thanks,

../Randy

>
>>    git://git.openembedded.org/openembedded-core-contrib rbt/wic
>>
>>      wic: Use ROOTFS_DIR to locate pseudo_dir
>>
>>      Fixed when wks is:
>>      part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat
>> --label boot --active --align 4096 --fixed-size 256M
>>      part / --source rootfs --exclude-path=var/ --ondisk mmcblk0
>> --fstype=ext4 --label root --align 4096
>>      part /var --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var --ondrive
>> mmcblk0 --fstype=ext4 --label var --align 4096 --fixed-size 1024M -
>> -fsoptions=ro,relatime,sync
>>
>>      $ bitbake <image>
>>      $ wic create <wks> -e <image>
>>      WARNING: /path/to/rootfs/var/../pseudo folder does not exist. Usernames
>> and permissions will be invalid
>>
>>      The --rootfs-dir can be anywhere, so the ../pseudo may not exist, use
>>      ROOTFS_DIR to fix the problem.
>>
>>      From: Rath Anil Kumar <AnilKumar.Rath@windriver.com>
>>      Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>>
>>
>> // Robert
>>
>>
>>>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>>>> ---
>>>>    scripts/lib/wic/plugins/source/rootfs.py | 2 +-
>>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py
>>>> index 25bb41dd702..11b09c1e80e 100644
>>>> --- a/scripts/lib/wic/plugins/source/rootfs.py
>>>> +++ b/scripts/lib/wic/plugins/source/rootfs.py
>>>> @@ -95,7 +95,7 @@ class RootfsPlugin(SourcePlugin):
>>>>            part.rootfs_dir = cls.__get_rootfs_dir(rootfs_dir)
>>>>            part.has_fstab = os.path.exists(os.path.join(part.rootfs_dir, "etc/fstab"))
>>>> -        pseudo_dir = os.path.join(part.rootfs_dir, "../pseudo")
>>>> +        pseudo_dir = os.path.join(krootfs_dir['ROOTFS_DIR'], "../pseudo")
>>>>            if not os.path.lexists(pseudo_dir):
>>>>                pseudo_dir = os.path.join(cls.__get_rootfs_dir(None), '../pseudo')
>>>> -- 
>>>> 2.33.1
>>>>
>>>>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#166928): https://lists.openembedded.org/g/openembedded-core/message/166928
> Mute This Topic: https://lists.openembedded.org/mt/91771589/3616765
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [randy.macleod@windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

-- 
# Randy MacLeod
# Wind River Linux



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

end of thread, other threads:[~2022-06-15 14:54 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-15  6:35 [PATCH 0/1] wic: Use ROOTFS_DIR to locate pseudo_dir Robert Yang
2022-06-15  6:35 ` [PATCH 1/1] " Robert Yang
2022-06-15  7:26   ` [OE-core] " Alexandre Belloni
2022-06-15  9:52     ` Robert Yang
2022-06-15 10:22       ` Alexandre Belloni
2022-06-15 14:54         ` Randy MacLeod

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.