From patchwork Thu Sep 19 16:24:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan McGregor X-Patchwork-Id: 49323 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D685CF395D for ; Thu, 19 Sep 2024 16:26:28 +0000 (UTC) Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) by mx.groups.io with SMTP id smtpd.web11.24566.1726763186603488301 for ; Thu, 19 Sep 2024 09:26:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=YAedvlof; spf=pass (domain: gmail.com, ip: 209.85.222.169, mailfrom: danismostlikely@gmail.com) Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-7a9b3cd75e5so102054785a.0 for ; Thu, 19 Sep 2024 09:26:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726763185; x=1727367985; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=V//XbblqTMOWChKaW+/lQwHgZCUM7lFUwfNQUnTbkKk=; b=YAedvlofxMD2bDXovVgG/lH23YoMy8K3okhLsq+SUS7AGC62IvCT9BiyBIrQX35y3e WrxjsJDC6eGG1q/zrJTdDy4fJlPPVv4ZzJQOLiO6eF86y9YA/v6BeznRpi1aP5lh+VJd 89JJ8WSFou86RdhuVYUuk6iM72/0zNxnTteV/rrgkyRfW55Iof5fFbxv+w0Dh1PolF6f 5/sbi/vA+B+PdXr3DoIkUl5XzG/4usyK2KWPBoOUKV/A1Et0go0LKV6u9RDEiJAEIElL ImWMHDgDCKPGmtTMuOSDTwfwUzGku2KM8FWlroGsm8oe1amra91IHTxP7GGbqYZlDxCs JpmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726763185; x=1727367985; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=V//XbblqTMOWChKaW+/lQwHgZCUM7lFUwfNQUnTbkKk=; b=Bm2KvTtNxNI/nyYK9AQiakgW0cmOXG5NK89H4vXgBy8G8xaLfJXk85+8zWiEHODX9i 4p4dHk0pjQI6R9c1b1dKGCMOSRM5utygGdRXORcnmZMM1HbedNj46+dndT+kB6QtQxFx Ac08FbuJcp/HQDz6ROaRXLwGBbc9pGt4ivQuJjS/rldY8BBhWJNyyjuT7rIAWKX3fVUm n2p/ge29+ld74Pp446WveoUlDz0Bx0LS7HmnwjKcNnPbH3ORFpISgT/IXuJzfd0J35kZ ZOo/8a1mqsLKsivADk41Z1H/otAnLXzNu0AKydqxmyolKcvJCTFHaR/f523y6tt51xU1 uKGg== X-Gm-Message-State: AOJu0YzN0Fy+1bc9ZvFF9V1UXUvTII3w6Gt3p5kD8qPXPjF5M4r9smHu ijHp92F5U//OCphZb3Yuls/ChmMKPJP0SZ/uQ88neZVjHx5iMjHZfhqcUA== X-Google-Smtp-Source: AGHT+IHLKPU5VP7gKFxLyOas4YYElJj819BlH9jKcZ96JAVNtT6ha2aji5KVAdjIR5olM7jj7yda4Q== X-Received: by 2002:a05:620a:4396:b0:7ac:9c64:8ac3 with SMTP id af79cd13be357-7ac9c648b27mr1294748385a.56.1726763185373; Thu, 19 Sep 2024 09:26:25 -0700 (PDT) Received: from nebuchadnezzar.home.arpa ([204.83.204.143]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7acb08bddc3sm88636485a.90.2024.09.19.09.26.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Sep 2024 09:26:25 -0700 (PDT) From: Dan McGregor To: openembedded-core@lists.openembedded.org Cc: Daniel McGregor Subject: [PATCH 1/3] python3-pip: keep pip program name Date: Thu, 19 Sep 2024 10:24:58 -0600 Message-ID: <20240919162500.2642940-1-danismostlikely@gmail.com> X-Mailer: git-send-email 2.46.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 19 Sep 2024 16:26:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204707 From: Daniel McGregor Python 2.x support is long gone, and may tools expect to use pip by that name. Keep the pip name around again. Signed-off-by: Daniel McGregor --- meta/recipes-devtools/python/python3-pip_24.2.bb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta/recipes-devtools/python/python3-pip_24.2.bb b/meta/recipes-devtools/python/python3-pip_24.2.bb index 1f8aeb35fc8..5e1a467990a 100644 --- a/meta/recipes-devtools/python/python3-pip_24.2.bb +++ b/meta/recipes-devtools/python/python3-pip_24.2.bb @@ -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 \ From patchwork Thu Sep 19 16:24:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan McGregor X-Patchwork-Id: 49325 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E582CF3963 for ; Thu, 19 Sep 2024 16:26:38 +0000 (UTC) Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by mx.groups.io with SMTP id smtpd.web10.24222.1726763190991520805 for ; Thu, 19 Sep 2024 09:26:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=TJl/ueeC; spf=pass (domain: gmail.com, ip: 209.85.222.173, mailfrom: danismostlikely@gmail.com) Received: by mail-qk1-f173.google.com with SMTP id af79cd13be357-7a9b3cd75e5so102063385a.0 for ; Thu, 19 Sep 2024 09:26:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726763190; x=1727367990; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0vikOF2Ipr8kVreDKVmpkM3qt3VS9I+TExwKTIVd2PU=; b=TJl/ueeCzlwbgbNCtH+OnFCHMeCnPAyw8JSP0+weVbAPm71opx1+AmuKutsc2bwrJg B7fF1+YQc1Gs0gGKXiEHMQW5XYh1XQjqQWBxZmAnrjb8DHW+6vbL01qrf6quP+nyaItn t2OymE9ZH31bcqnTfOmXcMjl05nrOBFRCGdQZgMILpALeknJnLGYcPYvGmjiwZnkhoTc yhGbpMMGFPzhRcYS92YkLJZuYZukeKRssoZBpJh5Q10IedIAvpbf6K6NJ07YBbeqMilE 7PSbn/lIGeeHOkv3HCILt5adKhbs421+nTopAnNKYK8kYynLWe+YJkH6U4fNiODiINq6 QAvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726763190; x=1727367990; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0vikOF2Ipr8kVreDKVmpkM3qt3VS9I+TExwKTIVd2PU=; b=wPwMoreXlD+RqWN/EM8GTnRNHnWFPWGhcUWoA1D297Qk9+eBRvbwf1bzkACF3gvAhJ Ntx88afn7uB/K+kmuG2PqM3GwK4AFNZ/iuOu1z6AMPdEZNjZEBKVDDNAElA8sY/JE/XU ZtgRbeHg/KUKtsW9ns7xoJXbwWJSpwdh14sHQx6dU2whn96PxNnG5Ie27/ry79n2e8aX zvzJl83chG/MGbOZFKKxw68GtEe/Q9gId0qr8tWVRVLRiTEJjLufp9HnNc5YIYuQrmo5 dSzKtaCe66Z2exFQlaab7e8Y4JySJdvZoiE97yF6M6NufR/TCwUfGPikoVJ0UtFYZ0yT UjVA== X-Gm-Message-State: AOJu0YzmeOhXYVH16bRm0IesUg8TEaAwnk2WnLhkbtaTCRu0UKPBlTxm ZIYZrVvmzKfQaNSr22MtDKwZvTMyBxcRItzHz/aqROpRyP+P7d9LLtrgrw== X-Google-Smtp-Source: AGHT+IGx0GOHjInLhrPgqtltllEe5MnO2cXN82PZ9+rZ3SWlbVATxhKTIiYB9n+5TjowXsTEqPU+xA== X-Received: by 2002:a05:620a:2409:b0:7a9:ae1e:1055 with SMTP id af79cd13be357-7a9e5f7c3dcmr4668521585a.59.1726763189673; Thu, 19 Sep 2024 09:26:29 -0700 (PDT) Received: from nebuchadnezzar.home.arpa ([204.83.204.143]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7acb08bddc3sm88636485a.90.2024.09.19.09.26.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Sep 2024 09:26:29 -0700 (PDT) From: Dan McGregor To: openembedded-core@lists.openembedded.org Cc: Dan McGregor Subject: [PATCH 2/3] image_types: make tar images more reproducible Date: Thu, 19 Sep 2024 10:24:59 -0600 Message-ID: <20240919162500.2642940-2-danismostlikely@gmail.com> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240919162500.2642940-1-danismostlikely@gmail.com> References: <20240919162500.2642940-1-danismostlikely@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 19 Sep 2024 16:26:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204708 From: Dan McGregor 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 Signed-off-by: Dan McGregor --- meta/classes-recipe/image_types.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass index b230add3141..87d6effc6cf 100644 --- a/meta/classes-recipe/image_types.bbclass +++ b/meta/classes-recipe/image_types.bbclass @@ -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 ''}" From patchwork Thu Sep 19 16:25:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan McGregor X-Patchwork-Id: 49324 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D53CCF3962 for ; Thu, 19 Sep 2024 16:26:38 +0000 (UTC) Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) by mx.groups.io with SMTP id smtpd.web10.24223.1726763192468957714 for ; Thu, 19 Sep 2024 09:26:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=TmGfNO/Y; spf=pass (domain: gmail.com, ip: 209.85.222.172, mailfrom: danismostlikely@gmail.com) Received: by mail-qk1-f172.google.com with SMTP id af79cd13be357-7a99fde9f1dso92726885a.2 for ; Thu, 19 Sep 2024 09:26:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726763191; x=1727367991; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xlbenvjtZES7Efz4Tk0+xGXPfe+rOrWt4S79Tw76KZM=; b=TmGfNO/Yg9DrgPQQBa0mO03uoXgYeYqxc683Nr1BxWY01u7I55mkouGrUV1NiKjCac Oyv6veZWu/98AGwAUDsSDnQDU3PEmiud+y1Yc8kPk83u3LcbeJrHob5FuoVbpYoEXRui iYsCJDQd6bGGl02yds5B4WjzUWZp1DWiPi2RMMEBxitQSLTuB0xpecl8f6WOg6WDgU7K dT9qUUIlyRNYurQ9sLCgis3Uh5pk8DpEqeeRp5WaP85e0RkEYfa6YDmnfYBT9J6LLYBa QTBf2ylaF5E5xb2i7zaOtUJcnVz+7QW4vxtqL1kEpjgU0Va08HuJCUxtNLfxAPg1uePZ rzhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726763191; x=1727367991; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xlbenvjtZES7Efz4Tk0+xGXPfe+rOrWt4S79Tw76KZM=; b=P8xxc3F3mBtMOKZZ6k1RgQP9tV2MY3y0mfczKqHJspBN8Xbxp2dhe5b3xk6VOPqnmq wzqPpXsIEg8Thy/kNz08LwHeMCgeX+tcdie2JDpfn03jOZiAfjsPvtm4SBulrpn0AfhO hFu2UUkhdFsYdf7RToweRkAWcrK70mU1LOjFA6/7rheaR4gUKgZmH/+KoWm4p2MLGcaA oTU/AGw8+imZozQycJXcvZPGxTSiJRHEEtXCjlHoFsDQFXrcdB3yEHZ5nHllXp7QT9q2 JDb1++jFn68xYDLeDMUWOkJlE16g0Ozm6CHsXorjJHnaVfWLSDfhwC+Ujj08J6kwyrex fGSQ== X-Gm-Message-State: AOJu0Yy0p/PG4HvHp59y9FXSOO36WUZ2jW3K4efLD/+lUZCjGFnLo1s1 BcMbBboamremUXGsGX5WXpVyOlaIwKLj/0TIN3oMW8GmrWVuByV1GaZ4Qg== X-Google-Smtp-Source: AGHT+IEX3vKv85zhYOSxImpa6pFbFiYoadaBR6D5ZYQ0MIZZbh1ZYmvh847mAmSFVs4SMDEIWhPJJQ== X-Received: by 2002:a05:620a:4110:b0:7a6:4a8b:46f1 with SMTP id af79cd13be357-7a9e5f79719mr4316098685a.48.1726763191200; Thu, 19 Sep 2024 09:26:31 -0700 (PDT) Received: from nebuchadnezzar.home.arpa ([204.83.204.143]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7acb08bddc3sm88636485a.90.2024.09.19.09.26.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Sep 2024 09:26:30 -0700 (PDT) From: Dan McGregor To: openembedded-core@lists.openembedded.org Cc: Daniel McGregor Subject: [PATCH 3/3] libpam: use libdir in conditional Date: Thu, 19 Sep 2024 10:25:00 -0600 Message-ID: <20240919162500.2642940-3-danismostlikely@gmail.com> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240919162500.2642940-1-danismostlikely@gmail.com> References: <20240919162500.2642940-1-danismostlikely@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 19 Sep 2024 16:26:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204709 From: Daniel McGregor 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. Signed-off-by: Daniel McGregor --- meta/recipes-extended/pam/libpam_1.6.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/pam/libpam_1.6.1.bb b/meta/recipes-extended/pam/libpam_1.6.1.bb index b9ef564f564..c9ef40bf234 100644 --- a/meta/recipes-extended/pam/libpam_1.6.1.bb +++ b/meta/recipes-extended/pam/libpam_1.6.1.bb @@ -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