wic: Use ROOTFS_DIR to locate pseudo_dir
cover wic: Use ROOTFS_DIR to locate pseudo_dir
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(-)
Signature · 1 line
2.33.1
PATCH 1/1 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.
The patch is from "Rath Anil Kumar <[email protected]>"
--- scripts/lib/wic/plugins/source/rootfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/lib/wic/plugins/source/rootfs.py +1 -1
@@ -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')
Signature · 1 line
2.33.1
Hello,
Quoted 5 lines · Robert Yang
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
Quoted 8 lines
$ bitbake <image> $ wic create <wks> -e <image> WARNING: /path/to/rootfs/var/../pseudo folder does not exist. Usernames and permissions will be invalidThe --rootfs-dir can be anywhere, so the ../pseudo may not exist, use
ROOTFS_DIRto fix the problem.The patch is from "Rath Anil Kumar <[email protected]>"
We need a proper Signed-off-by and From: to reflect that.
Quoted 32 lines
Signed-off-by Robert Yang <[email protected]>--- scripts/lib/wic/plugins/source/rootfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)scripts/lib/wic/plugins/source/rootfs.py +1
-1@@ -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')Signature · 11 lines
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: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Quoted 12 lines · Alexandre Belloni
Hello,
Quoted 9 lines · Robert Yang
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
Quoted 6 lines
Quoted 4 lines
The --rootfs-dir can be anywhere, so the ../pseudo may not exist, use
ROOTFS_DIRto fix the problem.The patch is from "Rath Anil Kumar <[email protected]>"
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 <[email protected]>
// Robert
Quoted 35 lines
Quoted 33 lines
Signed-off-by Robert Yang <[email protected]>--- scripts/lib/wic/plugins/source/rootfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)scripts/lib/wic/plugins/source/rootfs.py +1
-1@@ -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')Signature · 11 lines
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: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Quoted 18 lines · Robert Yang
Quoted 15 lines · Alexandre Belloni
Hello,
Quoted 12 lines · Robert Yang
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 invalidThe --rootfs-dir can be anywhere, so the ../pseudo may not exist, use
ROOTFS_DIRto fix the problem.
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
The patch is from "Rath Anil Kumar <[email protected]>"
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.
Quoted 61 lines
git://git.openembedded.org/openembedded-core-contribrbt/wicwic: Use
ROOTFS_DIRto locatepseudo_dirFixed when wks is:
part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat
--label boot --active --align 4096 --fixed-size 256Mpart / --source rootfs --exclude-path=var/ --ondisk mmcblk0 --fstype=ext4 --label root --align 4096 part /var --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var --ondrivemmcblk0 --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 invalidThe --rootfs-dir can be anywhere, so the ../pseudo may not exist, use
ROOTFS_DIRto fix the problem.From: Rath Anil Kumar <[email protected]>
Signed-off-by Robert Yang <[email protected]>// Robert
Quoted 33 lines
Quoted 31 lines
Signed-off-by Robert Yang <[email protected]>--- scripts/lib/wic/plugins/source/rootfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)scripts/lib/wic/plugins/source/rootfs.py +1
-1@@ -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')Signature · 11 lines
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: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Add Anil Rath, the patch author.
Quoted 18 lines · Alexandre Belloni via lists.openembedded.org
Quoted 17 lines · Robert Yang
Quoted 16 lines · Alexandre Belloni
Hello,
Quoted 13 lines · Robert Yang
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 invalidThe --rootfs-dir can be anywhere, so the ../pseudo may not exist, use
ROOTFS_DIRto fix the problem.The patch is from "Rath Anil Kumar <[email protected]>"
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
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
Quoted 58 lines
Quoted 34 lines
git://git.openembedded.org/openembedded-core-contribrbt/wicwic: Use
ROOTFS_DIRto locatepseudo_dirFixed when wks is:
part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat
--label boot --active --align 4096 --fixed-size 256Mpart / --source rootfs --exclude-path=var/ --ondisk mmcblk0 --fstype=ext4 --label root --align 4096 part /var --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var --ondrivemmcblk0 --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 invalidThe --rootfs-dir can be anywhere, so the ../pseudo may not exist, use
ROOTFS_DIRto fix the problem.From: Rath Anil Kumar <[email protected]>
Signed-off-by Robert Yang <[email protected]>// Robert
Quoted 5 lines
Quoted 5 lines
Signed-off-by Robert Yang <[email protected]>--- scripts/lib/wic/plugins/source/rootfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Quoted 15 lines
Quoted 7 lines
Quoted 7 lines
scripts/lib/wic/plugins/source/rootfs.py +0
-0@@ -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"))Quoted 8 lines
Quoted 8 lines
scripts/lib/wic/plugins/source/rootfs.py +1
-1- 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')Signature · 1 line
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: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 2 lines
# Randy MacLeod # Wind River Linux