* [PATCH 1/2] Revert "opkg-utils: upgrade 0.6.2 -> 0.6.3"
@ 2024-01-04 2:10 Khem Raj
2024-01-04 2:10 ` [PATCH 2/2] quilt,cpio: Create ptest user when ptest is enabled in distro features Khem Raj
2024-01-05 16:16 ` [OE-core] [PATCH 1/2] Revert "opkg-utils: upgrade 0.6.2 -> 0.6.3" Alexandre Belloni
0 siblings, 2 replies; 6+ messages in thread
From: Khem Raj @ 2024-01-04 2:10 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
This reverts commit a856192be5dd78c621478ed29871191c580686c4.
It causes a regression in creating different GIDs in image and ipk as
reported in [1]
[1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=15334
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../opkg-utils/{opkg-utils_0.6.3.bb => opkg-utils_0.6.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/opkg-utils/{opkg-utils_0.6.3.bb => opkg-utils_0.6.2.bb} (97%)
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.3.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb
similarity index 97%
rename from meta/recipes-devtools/opkg-utils/opkg-utils_0.6.3.bb
rename to meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb
index b509227e1a6..eb88b9b734c 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.3.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb
@@ -10,7 +10,7 @@ PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtu
SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=https;branch=master \
file://0001-update-alternatives-correctly-match-priority.patch \
"
-SRCREV = "589880d01969eb9af1e66120e731d43193504718"
+SRCREV = "67994e62dc598282830385da75ba9b1abbbda941"
S = "${WORKDIR}/git"
--
2.43.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] quilt,cpio: Create ptest user when ptest is enabled in distro features 2024-01-04 2:10 [PATCH 1/2] Revert "opkg-utils: upgrade 0.6.2 -> 0.6.3" Khem Raj @ 2024-01-04 2:10 ` Khem Raj 2024-01-09 16:05 ` [OE-core] " Ross Burton 2024-01-05 16:16 ` [OE-core] [PATCH 1/2] Revert "opkg-utils: upgrade 0.6.2 -> 0.6.3" Alexandre Belloni 1 sibling, 1 reply; 6+ messages in thread From: Khem Raj @ 2024-01-04 2:10 UTC (permalink / raw) To: openembedded-core; +Cc: Khem Raj Fixes warnings run.do_install_ptest_base.107960:175 exit 1 from 'chgrp -R ptest /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/cpio/2.14/image/usr/lib/cpio/ptest/' Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-devtools/quilt/quilt.inc | 8 ++++---- meta/recipes-extended/cpio/cpio_2.14.bb | 11 +++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index 3374f4dfbf3..89572d70d7c 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc @@ -20,7 +20,7 @@ SRC_URI:append:class-target = " file://gnu_patch_test_fix_target.patch" SRC_URI[sha256sum] = "3be3be0987e72a6c364678bb827e3e1fcc10322b56bc5f02b576698f55013cc2" -inherit autotools-brokensep ptest +inherit autotools-brokensep ptest useradd INHIBIT_AUTOTOOLS_DEPS:class-native = "1" PATCHTOOL:class-native = "patch" @@ -62,9 +62,9 @@ do_install:append:class-native () { touch ${D}${sysconfdir}/quiltrc } -# The tests need to run as a non-root user, so pull in the ptest user -DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" -PACKAGE_WRITE_DEPS += "ptest-runner" +# The tests need to run as a non-root user +USERADD_PACKAGES = "${PN}-ptest" +USERADD_PARAM:${PN}-ptest = "--system --home /nonexistent --no-create-home --user-group ptest" do_install_ptest() { install ${WORKDIR}/test.sh ${D}${PTEST_PATH} diff --git a/meta/recipes-extended/cpio/cpio_2.14.bb b/meta/recipes-extended/cpio/cpio_2.14.bb index 560038d2a67..c6ab0054994 100644 --- a/meta/recipes-extended/cpio/cpio_2.14.bb +++ b/meta/recipes-extended/cpio/cpio_2.14.bb @@ -14,7 +14,7 @@ SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ SRC_URI[sha256sum] = "145a340fd9d55f0b84779a44a12d5f79d77c99663967f8cfa168d7905ca52454" -inherit autotools gettext texinfo ptest +inherit autotools gettext texinfo ptest useradd CVE_STATUS[CVE-2010-4226] = "not-applicable-platform: Issue applies to use of cpio in SUSE/OBS" @@ -63,11 +63,10 @@ do_install_ptest_base:append() { chmod -R g+w ${D}${PTEST_PATH}/ } -# The tests need to run as a non-root user, so pull in the ptest user -DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" -PACKAGE_WRITE_DEPS:append:class-target = " ${MLPREFIX}ptest-runner" - -RDEPENDS:${PN}-ptest += "ptest-runner" +# The tests need to run as a non-root user +USERADD_PACKAGES = "${PN}-ptest" +USERADD_PARAM:${PN}-ptest = "--system --home /nonexistent --no-create-home \ + --user-group ptest" PACKAGES =+ "${PN}-rmt" -- 2.43.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [OE-core] [PATCH 2/2] quilt,cpio: Create ptest user when ptest is enabled in distro features 2024-01-04 2:10 ` [PATCH 2/2] quilt,cpio: Create ptest user when ptest is enabled in distro features Khem Raj @ 2024-01-09 16:05 ` Ross Burton 2024-01-09 18:42 ` Khem Raj 0 siblings, 1 reply; 6+ messages in thread From: Ross Burton @ 2024-01-09 16:05 UTC (permalink / raw) To: raj.khem@gmail.com; +Cc: openembedded-core@lists.openembedded.org On 4 Jan 2024, at 02:10, Khem Raj via lists.openembedded.org <raj.khem=gmail.com@lists.openembedded.org> wrote: > -# The tests need to run as a non-root user, so pull in the ptest user > -DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" > -PACKAGE_WRITE_DEPS += "ptest-runner" > +# The tests need to run as a non-root user > +USERADD_PACKAGES = "${PN}-ptest" > +USERADD_PARAM:${PN}-ptest = "--system --home /nonexistent --no-create-home --user-group ptest” The original lines were intended to pull in the ptest user that the ptest-runner recipe creates. Why is that not sufficient? Ross ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [OE-core] [PATCH 2/2] quilt,cpio: Create ptest user when ptest is enabled in distro features 2024-01-09 16:05 ` [OE-core] " Ross Burton @ 2024-01-09 18:42 ` Khem Raj 0 siblings, 0 replies; 6+ messages in thread From: Khem Raj @ 2024-01-09 18:42 UTC (permalink / raw) To: Ross Burton; +Cc: openembedded-core@lists.openembedded.org lets drop this patch. The issue with chgrp seems to be gone, must have been transitory as I was narrowing down the opkg-utils bug. On Tue, Jan 9, 2024 at 8:05 AM Ross Burton <Ross.Burton@arm.com> wrote: > > On 4 Jan 2024, at 02:10, Khem Raj via lists.openembedded.org <raj.khem=gmail.com@lists.openembedded.org> wrote: > > -# The tests need to run as a non-root user, so pull in the ptest user > > -DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" > > -PACKAGE_WRITE_DEPS += "ptest-runner" > > +# The tests need to run as a non-root user > > +USERADD_PACKAGES = "${PN}-ptest" > > +USERADD_PARAM:${PN}-ptest = "--system --home /nonexistent --no-create-home --user-group ptest” > > The original lines were intended to pull in the ptest user that the ptest-runner recipe creates. Why is that not sufficient? > > Ross ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [OE-core] [PATCH 1/2] Revert "opkg-utils: upgrade 0.6.2 -> 0.6.3" 2024-01-04 2:10 [PATCH 1/2] Revert "opkg-utils: upgrade 0.6.2 -> 0.6.3" Khem Raj 2024-01-04 2:10 ` [PATCH 2/2] quilt,cpio: Create ptest user when ptest is enabled in distro features Khem Raj @ 2024-01-05 16:16 ` Alexandre Belloni 2024-01-05 17:43 ` Khem Raj 1 sibling, 1 reply; 6+ messages in thread From: Alexandre Belloni @ 2024-01-05 16:16 UTC (permalink / raw) To: Khem Raj; +Cc: openembedded-core I believe this caused: https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/4191/steps/12/logs/stdio On 03/01/2024 18:10:51-0800, Khem Raj wrote: > This reverts commit a856192be5dd78c621478ed29871191c580686c4. > > It causes a regression in creating different GIDs in image and ipk as > reported in [1] > > [1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=15334 > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > .../opkg-utils/{opkg-utils_0.6.3.bb => opkg-utils_0.6.2.bb} | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > rename meta/recipes-devtools/opkg-utils/{opkg-utils_0.6.3.bb => opkg-utils_0.6.2.bb} (97%) > > diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.3.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb > similarity index 97% > rename from meta/recipes-devtools/opkg-utils/opkg-utils_0.6.3.bb > rename to meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb > index b509227e1a6..eb88b9b734c 100644 > --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.3.bb > +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb > @@ -10,7 +10,7 @@ PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtu > SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=https;branch=master \ > file://0001-update-alternatives-correctly-match-priority.patch \ > " > -SRCREV = "589880d01969eb9af1e66120e731d43193504718" > +SRCREV = "67994e62dc598282830385da75ba9b1abbbda941" > > S = "${WORKDIR}/git" > > -- > 2.43.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#193299): https://lists.openembedded.org/g/openembedded-core/message/193299 > Mute This Topic: https://lists.openembedded.org/mt/103515671/3617179 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > -=-=-=-=-=-=-=-=-=-=-=- > -- Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [OE-core] [PATCH 1/2] Revert "opkg-utils: upgrade 0.6.2 -> 0.6.3" 2024-01-05 16:16 ` [OE-core] [PATCH 1/2] Revert "opkg-utils: upgrade 0.6.2 -> 0.6.3" Alexandre Belloni @ 2024-01-05 17:43 ` Khem Raj 0 siblings, 0 replies; 6+ messages in thread From: Khem Raj @ 2024-01-05 17:43 UTC (permalink / raw) To: Alexandre Belloni; +Cc: openembedded-core On Fri, Jan 5, 2024 at 8:16 AM Alexandre Belloni <alexandre.belloni@bootlin.com> wrote: > > I believe this caused: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/4191/steps/12/logs/stdio > Likely, so because this patch https://git.yoctoproject.org/opkg-utils/commit/?id=8d9953dd8d589e9b740307976cbe474e0ce292a0 to opkg fixes mtime to be consistent across runs and this seems likely to be the reason for the reproducibiliy failiure. I wish xattr/acl support and this piece were two separate patches perhaps we could then revert just the one affecting GID issue. I would say lets wait for above bugs progress and hold on to this patch until then. > On 03/01/2024 18:10:51-0800, Khem Raj wrote: > > This reverts commit a856192be5dd78c621478ed29871191c580686c4. > > > > It causes a regression in creating different GIDs in image and ipk as > > reported in [1] > > > > [1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=15334 > > > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > > --- > > .../opkg-utils/{opkg-utils_0.6.3.bb => opkg-utils_0.6.2.bb} | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > rename meta/recipes-devtools/opkg-utils/{opkg-utils_0.6.3.bb => opkg-utils_0.6.2.bb} (97%) > > > > diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.3.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb > > similarity index 97% > > rename from meta/recipes-devtools/opkg-utils/opkg-utils_0.6.3.bb > > rename to meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb > > index b509227e1a6..eb88b9b734c 100644 > > --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.3.bb > > +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb > > @@ -10,7 +10,7 @@ PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtu > > SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=https;branch=master \ > > file://0001-update-alternatives-correctly-match-priority.patch \ > > " > > -SRCREV = "589880d01969eb9af1e66120e731d43193504718" > > +SRCREV = "67994e62dc598282830385da75ba9b1abbbda941" > > > > S = "${WORKDIR}/git" > > > > -- > > 2.43.0 > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#193299): https://lists.openembedded.org/g/openembedded-core/message/193299 > > Mute This Topic: https://lists.openembedded.org/mt/103515671/3617179 > > Group Owner: openembedded-core+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > > -=-=-=-=-=-=-=-=-=-=-=- > > > > > -- > Alexandre Belloni, co-owner and COO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-01-09 18:42 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-01-04 2:10 [PATCH 1/2] Revert "opkg-utils: upgrade 0.6.2 -> 0.6.3" Khem Raj 2024-01-04 2:10 ` [PATCH 2/2] quilt,cpio: Create ptest user when ptest is enabled in distro features Khem Raj 2024-01-09 16:05 ` [OE-core] " Ross Burton 2024-01-09 18:42 ` Khem Raj 2024-01-05 16:16 ` [OE-core] [PATCH 1/2] Revert "opkg-utils: upgrade 0.6.2 -> 0.6.3" Alexandre Belloni 2024-01-05 17:43 ` Khem Raj
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.