python3-pip: keep pip program name
PATCH 1/3 python3-pip: keep pip program name
From: Daniel McGregor <[email protected]>
Python 2.x support is long gone, and may tools expect to use pip by that name. Keep the pip name around again.
--- meta/recipes-devtools/python/python3-pip_24.2.bb | 4 ---- 1 file changed, 4 deletions(-)
meta/recipes-devtools/python/python3-pip_24.2.bb +0 -4
@@ -29,10 +29,6 @@ SRC_URI += "file://no_shebang_mangling.patch" SRC_URI[sha256sum] = "5b5e490b5e9cb275c879595064adce9ebd31b854e3e803740b72f9ccf34a45b8" -do_install:append() { - rm -f ${D}/${bindir}/pip -} - RDEPENDS:${PN} = "\ python3-compile \ python3-io \
Signature · 1 line
2.46.1
PATCH 2/3 image_types: make tar images more reproducible
From: Dan McGregor <[email protected]>
Use tar-native from our build system. GNU tar changed its behaviour starting with version 1.35. It no longer stores device numbers for regular, non-device files. Since some supported host distributions still use 1.34, rely on tar-native for consistency.
Strip atime and ctime from tar archives, they're not necessary and can change from invocation to invocation. Eliminate them from the tar output as suggested in the tar 1.35 documentation[1].
[1] https://www.gnu.org/software/tar/manual/html_node/Reproducibility.html
--- meta/classes-recipe/image_types.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta/classes-recipe/image_types.bbclass +4 -1
@@ -145,7 +145,7 @@ IMAGE_CMD:vfat = "oe_mkvfatfs ${EXTRA_IMAGECMD}" IMAGE_CMD_TAR ?= "tar" # ignore return code 1 "file changed as we read it" as other tasks(e.g. do_image_wic) may be hardlinking rootfs -IMAGE_CMD:tar = "${IMAGE_CMD_TAR} --sort=name --format=posix --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}.tar -C ${IMAGE_ROOTFS} . || [ $? -eq 1 ]" +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 ]" SPDX_IMAGE_PURPOSE:tar = "archive" do_image_cpio[cleandirs] += "${WORKDIR}/cpio_append"
@@ -283,6 +283,7 @@ EXTRA_IMAGECMD:f2fs ?= "" # otherwise mkfs.vfat will automatically pick one. EXTRA_IMAGECMD:vfat ?= "" +do_image_tar[depends] += "tar-replacement-native:do_populate_sysroot" do_image_cpio[depends] += "cpio-native:do_populate_sysroot" do_image_jffs2[depends] += "mtd-utils-native:do_populate_sysroot" do_image_cramfs[depends] += "util-linux-native:do_populate_sysroot"
@@ -391,3 +392,5 @@ IMAGE_TYPES_MASKED ?= "" # bmap requires python3 to be in the PATH EXTRANATIVEPATH += "${@'python3-native' if d.getVar('IMAGE_FSTYPES').find('.bmap') else ''}" +# reproducible tar requires our tar, not the host's +EXTRANATIVEPATH += "${@'tar-native' if 'tar' in d.getVar('IMAGE_FSTYPES') else ''}"
Signature · 1 line
2.46.1
PATCH 3/3 libpam: use libdir in conditional
In reply to Dan McGregorFrom: Daniel McGregor <[email protected]>
Using the usrmerge distro feature for this check causes the -native variant's build to fail. Simplify the test to be correct for both native and target builds.
--- meta/recipes-extended/pam/libpam_1.6.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/pam/libpam_1.6.1.bb +1 -1
@@ -155,7 +155,7 @@ do_install() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session fi - if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then + if [ "${base_libdir}" != "${libdir}" ]; then install -d ${D}/${libdir}/ mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/ fi
Signature · 1 line
2.46.1