Advertisement
RobertBerger

Untitled

Oct 3rd, 2024
12
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.63 KB | None | 0 0
  1. $ git diff master meta/classes-recipe/image_types.bbclass
  2. diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass
  3. index 87d6effc6c..b230add314 100644
  4. --- a/meta/classes-recipe/image_types.bbclass
  5. +++ b/meta/classes-recipe/image_types.bbclass
  6. @@ -145,7 +145,7 @@ IMAGE_CMD:vfat = "oe_mkvfatfs ${EXTRA_IMAGECMD}"
  7.  
  8. IMAGE_CMD_TAR ?= "tar"
  9. # ignore return code 1 "file changed as we read it" as other tasks(e.g. do_image_wic) may be hardlinking rootfs
  10. -IMAGE_CMD:tar = "${IMAGE_CMD_TAR} --sort=name --format=posix --pax-option=delete=atime,delete=ctime --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}.tar -C ${IMAGE_ROOTFS} . || [ $? -eq 1 ]"
  11. +IMAGE_CMD:tar = "${IMAGE_CMD_TAR} --sort=name --format=posix --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}.tar -C ${IMAGE_ROOTFS} . || [ $? -eq 1 ]"
  12. SPDX_IMAGE_PURPOSE:tar = "archive"
  13.  
  14. do_image_cpio[cleandirs] += "${WORKDIR}/cpio_append"
  15. @@ -283,7 +283,6 @@ EXTRA_IMAGECMD:f2fs ?= ""
  16. # otherwise mkfs.vfat will automatically pick one.
  17. EXTRA_IMAGECMD:vfat ?= ""
  18.  
  19. -do_image_tar[depends] += "tar-replacement-native:do_populate_sysroot"
  20. do_image_cpio[depends] += "cpio-native:do_populate_sysroot"
  21. do_image_jffs2[depends] += "mtd-utils-native:do_populate_sysroot"
  22. do_image_cramfs[depends] += "util-linux-native:do_populate_sysroot"
  23. @@ -392,5 +391,3 @@ IMAGE_TYPES_MASKED ?= ""
  24.  
  25. # bmap requires python3 to be in the PATH
  26. EXTRANATIVEPATH += "${@'python3-native' if d.getVar('IMAGE_FSTYPES').find('.bmap') else ''}"
  27. -# reproducible tar requires our tar, not the host's
  28. -EXTRANATIVEPATH += "${@'tar-native' if 'tar' in d.getVar('IMAGE_FSTYPES') else ''}"
  29.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement