From ca64708ab51936ce533758fc73608b5b35dd079b Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Fri, 15 Mar 2024 16:18:44 +0800 Subject: [PATCH] weston-init: Add --system for useradd Add --system parameter for useradd to avoid intruducing .bashrc and .profile under home dir to fix the below error. $ bitbake core-image-weston | DEBUG: Executing python function set_image_size | DEBUG: 352679.600000 = 271292 * 1.300000 | DEBUG: 455079.600000 = max(352679.600000, 65536)[352679.600000] + 102400 | DEBUG: 455080.000000 = int(455079.600000) | DEBUG: 455080 = aligned(455080) | DEBUG: returning 455080 | DEBUG: Python function set_image_size finished | DEBUG: Executing shell function do_image_tar | tar: ./home/weston/.bashrc: Unknown file type; file ignored | tar: ./home/weston/.profile: Unknown file type; file ignored | tar: Exiting with failure status due to previous errors | WARNING: /buildarea1/test/yocto/builds/poky-build-weston/tmp/work/qemux86_64-poky-linux/core-image-weston/1.0/temp/run.do_image_tar.1972897:150 exit 1 from '[ $? -eq 1 ]' | WARNING: Backtrace (BB generated script): #1: do_image_tar, /buildarea1/test/yocto/builds/poky-build-weston/tmp/work/qemux86_64-poky-linux/core-image-weston/1.0/temp/run.do_image_tar.1972897, line 150 #2: main, /buildarea1/test/yocto/builds/poky-build-weston/tmp/work/qemux86_64-poky-linux/core-image-weston/1.0/temp/run.do_image_tar.1972897, line 156 | DEBUG: Python function extend_recipe_sysroot finished | DEBUG: Executing python function set_image_size | DEBUG: 352679.600000 = 271292 * 1.300000 | DEBUG: 455079.600000 = max(352679.600000, 65536)[352679.600000] + 102400 | DEBUG: 455080.000000 = int(455079.600000) | DEBUG: 455080 = aligned(455080) | DEBUG: returning 455080 | DEBUG: Python function set_image_size finished | DEBUG: Executing shell function do_image_ext4 | DEBUG: Executing dd if=/dev/zero of=/buildarea1/test/yocto/builds/poky-build-weston/tmp/work/qemux86_64-poky-linux/core-image-weston/1.0/deploy-core-image-weston-image-complete/core-image-weston-qemux86-64.rootfs-20240315032140.ext4 seek=455080 count=0 bs=1024 | 0+0 records in | 0+0 records out | 0 bytes copied, 0.00136946 s, 0.0 kB/s | DEBUG: Actual Rootfs size: 268184 /buildarea1/test/yocto/builds/poky-build-weston/tmp/work/qemux86_64-poky-linux/core-image-weston/1.0/rootfs | DEBUG: Actual Partition size: 466001920 | DEBUG: Executing mkfs.ext4 -F -i 4096 /buildarea1/test/yocto/builds/poky-build-weston/tmp/work/qemux86_64-poky-linux/core-image-weston/1.0/deploy-core-image-weston-image-complete/core-image-weston-qemux86-64.rootfs-20240315032140.ext4 -d /buildarea1/test/yocto/builds/poky-build-weston/tmp/work/qemux86_64-poky-linux/core-image-weston/1.0/rootfs | mke2fs 1.47.0 (5-Feb-2023) | Discarding device blocks: done | Creating filesystem with 455080 1k blocks and 113792 inodes | Filesystem UUID: 2031373e-63cd-4711-968b-4023ff7d6a90 | Superblock backups stored on blocks: | 8193, 24577, 40961, 57345, 73729, 204801, 221185, 401409 | | Allocating group tables: done | Writing inode tables: done | Creating journal (8192 blocks): done | Copying files into the device: __populate_fs: ignoring entry ".bashrc" | .bashrc: File not found by ext2_lookup while looking up ".bashrc" | mkfs.ext4: File not found by ext2_lookup while populating file system | WARNING: /buildarea1/test/yocto/builds/poky-build-weston/tmp/work/qemux86_64-poky-linux/core-image-weston/1.0/temp/run.do_image_ext4.1972895:178 exit 1 from 'mkfs.$fstype -F $extra_imagecmd /buildarea1/test/yocto/builds/poky-build-weston/tmp/work/qemux86_64-poky-linux/core-image-weston/1.0/deploy-core-image-weston-image-complete/core-image-weston-qemux86-64.rootfs-20240315032140.$fstype -d /buildarea1/test/yocto/builds/poky-build-weston/tmp/work/qemux86_64-poky-linux/core-image-weston/1.0/rootfs' | WARNING: Backtrace (BB generated script): | #1: oe_mkext234fs, /buildarea1/test/yocto/builds/poky-build-weston/tmp/work/qemux86_64-poky-linux/core-image-weston/1.0/temp/run.do_image_ext4.1972895, line 178 | #2: do_image_ext4, /buildarea1/test/yocto/builds/poky-build-weston/tmp/work/qemux86_64-poky-linux/core-image-weston/1.0/temp/run.do_image_ext4.1972895, line 150 | #3: main, /buildarea1/test/yocto/builds/poky-build-weston/tmp/work/qemux86_64-poky-linux/core-image-weston/1.0/temp/run.do_image_ext4.1972895, line 215 ERROR: Task (/buildarea1/test/yocto/poky/meta/recipes-graphics/images/core-image-weston.bb:do_image_ext4) failed with exit code '1' Before the patch: $ ls -a tmp/work/qemux86_64-poky-linux/core-image-weston/1.0/rootfs/home/weston/ . .. .bashrc .profile After the patch: $ ls -a tmp/work/qemux86_64-poky-linux/core-image-weston/1.0/rootfs/home/weston/ . .. Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/weston-init.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb index 024e400665ef..542b86818cc9 100644 --- a/meta/recipes-graphics/wayland/weston-init.bb +++ b/meta/recipes-graphics/wayland/weston-init.bb @@ -101,6 +101,6 @@ FILES:${PN} += "\ CONFFILES:${PN} += "${sysconfdir}/xdg/weston/weston.ini ${sysconfdir}/default/weston" SYSTEMD_SERVICE:${PN} = "weston.service weston.socket" -USERADD_PARAM:${PN} = "--home /home/weston --shell /bin/sh --user-group -G video,input,render,wayland weston" +USERADD_PARAM:${PN} = "--system --home /home/weston --shell /bin/sh --user-group -G video,input,render,wayland weston" GROUPADD_PARAM:${PN} = "-r wayland; -r render"