* [OE-Core][PATCH v14 02/11] image_types.bbclass: override tar with tar-native
2023-10-15 14:57 [OE-Core][PATCH v14 01/11] package.bbclass: override tar with tar-native Piotr Łobacz
@ 2023-10-15 14:57 ` Piotr Łobacz
2023-10-15 14:57 ` [OE-Core][PATCH v14 03/11] sstate.bbclass: " Piotr Łobacz
` (8 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Piotr Łobacz @ 2023-10-15 14:57 UTC (permalink / raw)
To: openembedded-core; +Cc: Piotr Łobacz
Due to the bugs https://savannah.gnu.org/bugs/?61934 and
https://savannah.gnu.org/bugs/?59184, which are fixed in
tar version 1.35, we need to force yocto to use it instead
of the one provided by the host machine.
IMAGE_CMD_TAR will use the tar provided by tar recipe, which
is already in proper version.
Signed-off-by: Piotr Łobacz <p.lobacz@welotec.com>
---
meta/classes-recipe/image_types.bbclass | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass
index 4aed64e27f..c50bcf673d 100644
--- a/meta/classes-recipe/image_types.bbclass
+++ b/meta/classes-recipe/image_types.bbclass
@@ -385,5 +385,9 @@ DEPLOYABLE_IMAGE_TYPES ?= "hddimg iso"
# images that will not be built at do_rootfs time: vmdk, vhd, vhdx, vdi, qcow2, hddimg, iso, etc.
IMAGE_TYPES_MASKED ?= ""
+# Minimal tar version 1.35 is needed as it has fixed bugs for storing ACL entries in textual representation
+# and is able to extract files with xattrs that are read-only; this needs to work only if acl or xattr are turned on
+DEPENDS:append = " ${@bb.utils.contains_any('DISTRO_FEATURES', 'acl xattr', 'tar-replacement-native', '', d)}"
# bmap requires python3 to be in the PATH
-EXTRANATIVEPATH += "${@'python3-native' if d.getVar('IMAGE_FSTYPES').find('.bmap') else ''}"
+# IMAGE_CMD_TAR requires tar to be in the PATH
+EXTRANATIVEPATH += "${@'python3-native' if d.getVar('IMAGE_FSTYPES').find('.bmap') else ''} ${@bb.utils.contains_any('DISTRO_FEATURES', 'acl xattr', 'tar-native', '', d)}"
--
2.42.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [OE-Core][PATCH v14 03/11] sstate.bbclass: override tar with tar-native
2023-10-15 14:57 [OE-Core][PATCH v14 01/11] package.bbclass: override tar with tar-native Piotr Łobacz
2023-10-15 14:57 ` [OE-Core][PATCH v14 02/11] image_types.bbclass: " Piotr Łobacz
@ 2023-10-15 14:57 ` Piotr Łobacz
2023-10-15 18:26 ` Richard Purdie
2023-10-15 14:57 ` [OE-Core][PATCH v14 04/11] path.py: add support for ACLs and all additional attributes Piotr Łobacz
` (7 subsequent siblings)
9 siblings, 1 reply; 18+ messages in thread
From: Piotr Łobacz @ 2023-10-15 14:57 UTC (permalink / raw)
To: openembedded-core; +Cc: Piotr Łobacz
Due to the bugs https://savannah.gnu.org/bugs/?61934 and
https://savannah.gnu.org/bugs/?59184, which are fixed in
tar version 1.35, we need to force yocto to use it instead
of the one provided by the host machine.
sstate_create_package and sstate_unpack_package functions,
will use the tar provided by tar recipe, which is already
in proper version.
Signed-off-by: Piotr Łobacz <p.lobacz@welotec.com>
---
meta/classes-global/sstate.bbclass | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/classes-global/sstate.bbclass b/meta/classes-global/sstate.bbclass
index 2676f18e0a..5ae6f515f2 100644
--- a/meta/classes-global/sstate.bbclass
+++ b/meta/classes-global/sstate.bbclass
@@ -152,7 +152,9 @@ python () {
else:
d.setVar('SSTATE_MANMACH', d.expand("${PACKAGE_ARCH}"))
- if bb.data.inherits_class('native', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross', d):
+ is_native = bb.data.inherits_class('native', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross', d)
+
+ if is_native:
d.setVar('SSTATE_EXTRAPATH', "${NATIVELSBSTRING}/")
d.setVar('BB_HASHFILENAME', "True ${SSTATE_PKGSPEC} ${SSTATE_SWSPEC}")
d.setVar('SSTATE_EXTRAPATHWILDCARD', "${NATIVELSBSTRING}/")
@@ -164,6 +166,8 @@ python () {
d.appendVarFlag(task, 'postfuncs', " sstate_task_postfunc")
d.setVarFlag(task, 'network', '1')
d.setVarFlag(task + "_setscene", 'network', '1')
+ if not is_native:
+ d.appendVarFlag(task, 'deptask', ' tar-replacement-native:do_populate_sysroot')
}
def sstate_init(task, d):
--
2.42.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [OE-Core][PATCH v14 03/11] sstate.bbclass: override tar with tar-native
2023-10-15 14:57 ` [OE-Core][PATCH v14 03/11] sstate.bbclass: " Piotr Łobacz
@ 2023-10-15 18:26 ` Richard Purdie
2023-10-16 5:45 ` Piotr Łobacz
[not found] ` <178E804624FA5560.14388@lists.openembedded.org>
0 siblings, 2 replies; 18+ messages in thread
From: Richard Purdie @ 2023-10-15 18:26 UTC (permalink / raw)
To: Piotr Łobacz, openembedded-core
On Sun, 2023-10-15 at 16:57 +0200, Piotr Łobacz wrote:
> Due to the bugs https://savannah.gnu.org/bugs/?61934 and
> https://savannah.gnu.org/bugs/?59184, which are fixed in
> tar version 1.35, we need to force yocto to use it instead
> of the one provided by the host machine.
>
> sstate_create_package and sstate_unpack_package functions,
> will use the tar provided by tar recipe, which is already
> in proper version.
>
> Signed-off-by: Piotr Łobacz <p.lobacz@welotec.com>
> ---
> meta/classes-global/sstate.bbclass | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/meta/classes-global/sstate.bbclass b/meta/classes-global/sstate.bbclass
> index 2676f18e0a..5ae6f515f2 100644
> --- a/meta/classes-global/sstate.bbclass
> +++ b/meta/classes-global/sstate.bbclass
> @@ -152,7 +152,9 @@ python () {
> else:
> d.setVar('SSTATE_MANMACH', d.expand("${PACKAGE_ARCH}"))
>
> - if bb.data.inherits_class('native', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross', d):
> + is_native = bb.data.inherits_class('native', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross', d)
> +
> + if is_native:
> d.setVar('SSTATE_EXTRAPATH', "${NATIVELSBSTRING}/")
> d.setVar('BB_HASHFILENAME', "True ${SSTATE_PKGSPEC} ${SSTATE_SWSPEC}")
> d.setVar('SSTATE_EXTRAPATHWILDCARD', "${NATIVELSBSTRING}/")
> @@ -164,6 +166,8 @@ python () {
> d.appendVarFlag(task, 'postfuncs', " sstate_task_postfunc")
> d.setVarFlag(task, 'network', '1')
> d.setVarFlag(task + "_setscene", 'network', '1')
> + if not is_native:
> + d.appendVarFlag(task, 'deptask', ' tar-replacement-native:do_populate_sysroot')
> }
>
> def sstate_init(task, d):
I don't think this dependency is enough to ensure that the setscene
task for one of these tasks has tar-native present when the sstate
package is extracted from sstate?
Cheers,
Richard
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [OE-Core][PATCH v14 03/11] sstate.bbclass: override tar with tar-native
2023-10-15 18:26 ` Richard Purdie
@ 2023-10-16 5:45 ` Piotr Łobacz
[not found] ` <178E804624FA5560.14388@lists.openembedded.org>
1 sibling, 0 replies; 18+ messages in thread
From: Piotr Łobacz @ 2023-10-16 5:45 UTC (permalink / raw)
To: openembedded-core@lists.openembedded.org, Richard Purdie
Dnia niedziela, 15 października 2023 20:26:49 CEST Richard Purdie pisze:
> On Sun, 2023-10-15 at 16:57 +0200, Piotr Łobacz wrote:
> > Due to the bugs
> > https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsavanna
> > h.gnu.org%2Fbugs%2F%3F61934&data=05%7C01%7Cp.lobacz%40welotec.com%7C20843c
> > d409ff471ad53b08dbcdac4d55%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C63
> > 8329912144020487%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luM
> > zIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=U8%2Fmm02MR5ps5btR
> > JnE1EnySNk4NJV498kRX66jjeeQ%3D&reserved=0 and
> > https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsavanna
> > h.gnu.org%2Fbugs%2F%3F59184&data=05%7C01%7Cp.lobacz%40welotec.com%7C20843c
> > d409ff471ad53b08dbcdac4d55%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C63
> > 8329912144020487%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luM
> > zIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=J3cwWWAQ6BHP1aGVeP
> > 1yRIGnGyG1fqVvPaVJY6kjKWc%3D&reserved=0, which are fixed in tar version
> > 1.35, we need to force yocto to use it instead
> > of the one provided by the host machine.
> >
> > sstate_create_package and sstate_unpack_package functions,
> > will use the tar provided by tar recipe, which is already
> > in proper version.
> >
> > Signed-off-by: Piotr Łobacz <p.lobacz@welotec.com>
> > ---
> >
> > meta/classes-global/sstate.bbclass | 6 +++++-
> > 1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/classes-global/sstate.bbclass
> > b/meta/classes-global/sstate.bbclass index 2676f18e0a..5ae6f515f2 100644
> > --- a/meta/classes-global/sstate.bbclass
> > +++ b/meta/classes-global/sstate.bbclass
> > @@ -152,7 +152,9 @@ python () {
> >
> > else:
> > d.setVar('SSTATE_MANMACH', d.expand("${PACKAGE_ARCH}"))
> >
> > - if bb.data.inherits_class('native', d) or
> > bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross',
> > d): + is_native = bb.data.inherits_class('native', d) or
> > bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross',
> > d) +
> >
> > + if is_native:
> > d.setVar('SSTATE_EXTRAPATH', "${NATIVELSBSTRING}/")
> > d.setVar('BB_HASHFILENAME', "True ${SSTATE_PKGSPEC}
> > ${SSTATE_SWSPEC}")
> > d.setVar('SSTATE_EXTRAPATHWILDCARD', "${NATIVELSBSTRING}/")
> >
> > @@ -164,6 +166,8 @@ python () {
> >
> > d.appendVarFlag(task, 'postfuncs', " sstate_task_postfunc")
> > d.setVarFlag(task, 'network', '1')
> > d.setVarFlag(task + "_setscene", 'network', '1')
> >
> > + if not is_native:
> > + d.appendVarFlag(task, 'deptask', '
> > tar-replacement-native:do_populate_sysroot')>
> > }
>
> > def sstate_init(task, d):
> I don't think this dependency is enough to ensure that the setscene
> task for one of these tasks has tar-native present when the sstate
> package is extracted from sstate?
>
> Cheers,
>
> Richard
Hi Richard, proposals are welcome :-)
BR
Piotr
^ permalink raw reply [flat|nested] 18+ messages in thread[parent not found: <178E804624FA5560.14388@lists.openembedded.org>]
* Re: [OE-Core][PATCH v14 03/11] sstate.bbclass: override tar with tar-native
[not found] ` <178E804624FA5560.14388@lists.openembedded.org>
@ 2023-11-10 10:12 ` Piotr Łobacz
2023-11-10 12:01 ` Richard Purdie
0 siblings, 1 reply; 18+ messages in thread
From: Piotr Łobacz @ 2023-11-10 10:12 UTC (permalink / raw)
To: openembedded-core@lists.openembedded.org, Richard Purdie
Cc: Piotr Łobacz
Dnia poniedziałek, 16 października 2023 07:45:41 CET Piotr Łobacz via
lists.openembedded.org pisze:
> Dnia niedziela, 15 października 2023 20:26:49 CEST Richard Purdie pisze:
> > On Sun, 2023-10-15 at 16:57 +0200, Piotr Łobacz wrote:
> > > Due to the bugs
> > > https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsavann
> > > a%2F&data=05%7C01%7Cp.lobacz%40welotec.com%7Cbac3f04a07664b3a912a08dbce0
> > > b282c%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C638330319545808351%7C
> > > Unknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haW
> > > wiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=875wwpxmvY10%2BUdvEbJFTJwc1zW%2Bq
> > > 0YOn8g9wgVvdUA%3D&reserved=0
> > > h.gnu.org%2Fbugs%2F%3F61934&data=05%7C01%7Cp.lobacz%40welotec.com%7C208
> > > 43c
> > > d409ff471ad53b08dbcdac4d55%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7
> > > C63
> > > 8329912144020487%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2
> > > luM
> > > zIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=U8%2Fmm02MR5ps5
> > > btR JnE1EnySNk4NJV498kRX66jjeeQ%3D&reserved=0 and
> > > https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsavann
> > > a%2F&data=05%7C01%7Cp.lobacz%40welotec.com%7Cbac3f04a07664b3a912a08dbce0
> > > b282c%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C638330319545808351%7C
> > > Unknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haW
> > > wiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=875wwpxmvY10%2BUdvEbJFTJwc1zW%2Bq
> > > 0YOn8g9wgVvdUA%3D&reserved=0
> > > h.gnu.org%2Fbugs%2F%3F59184&data=05%7C01%7Cp.lobacz%40welotec.com%7C208
> > > 43c
> > > d409ff471ad53b08dbcdac4d55%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7
> > > C63
> > > 8329912144020487%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2
> > > luM
> > > zIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=J3cwWWAQ6BHP1aG
> > > VeP 1yRIGnGyG1fqVvPaVJY6kjKWc%3D&reserved=0, which are fixed in tar
> > > version 1.35, we need to force yocto to use it instead
> > > of the one provided by the host machine.
> > >
> > > sstate_create_package and sstate_unpack_package functions,
> > > will use the tar provided by tar recipe, which is already
> > > in proper version.
> > >
> > > Signed-off-by: Piotr Łobacz <p.lobacz@welotec.com>
> > > ---
> > >
> > > meta/classes-global/sstate.bbclass | 6 +++++-
> > > 1 file changed, 5 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/meta/classes-global/sstate.bbclass
> > > b/meta/classes-global/sstate.bbclass index 2676f18e0a..5ae6f515f2 100644
> > > --- a/meta/classes-global/sstate.bbclass
> > > +++ b/meta/classes-global/sstate.bbclass
> > > @@ -152,7 +152,9 @@ python () {
> > >
> > > else:
> > > d.setVar('SSTATE_MANMACH', d.expand("${PACKAGE_ARCH}"))
> > >
> > > - if bb.data.inherits_class('native', d) or
> > > bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross',
> > > d): + is_native = bb.data.inherits_class('native', d) or
> > > bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross',
> > > d) +
> > >
> > > + if is_native:
> > > d.setVar('SSTATE_EXTRAPATH', "${NATIVELSBSTRING}/")
> > > d.setVar('BB_HASHFILENAME', "True ${SSTATE_PKGSPEC}
> > > ${SSTATE_SWSPEC}")
> > > d.setVar('SSTATE_EXTRAPATHWILDCARD', "${NATIVELSBSTRING}/")
> > >
> > > @@ -164,6 +166,8 @@ python () {
> > >
> > > d.appendVarFlag(task, 'postfuncs', " sstate_task_postfunc")
> > > d.setVarFlag(task, 'network', '1')
> > > d.setVarFlag(task + "_setscene", 'network', '1')
> > >
> > > + if not is_native:
> > > + d.appendVarFlag(task, 'deptask', '
> > > tar-replacement-native:do_populate_sysroot')>
> > >
> > > }
> >
> > > def sstate_init(task, d):
> > I don't think this dependency is enough to ensure that the setscene
> > task for one of these tasks has tar-native present when the sstate
> > package is extracted from sstate?
> >
> > Cheers,
> >
> > Richard
>
> Hi Richard, proposals are welcome :-)
>
> BR
> Piotr
BTW. Richard was it tested already by you?
BR
Piotr
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [OE-Core][PATCH v14 03/11] sstate.bbclass: override tar with tar-native
2023-11-10 10:12 ` Piotr Łobacz
@ 2023-11-10 12:01 ` Richard Purdie
2023-11-10 19:23 ` Piotr Łobacz
0 siblings, 1 reply; 18+ messages in thread
From: Richard Purdie @ 2023-11-10 12:01 UTC (permalink / raw)
To: Piotr Łobacz, openembedded-core@lists.openembedded.org
On Fri, 2023-11-10 at 10:12 +0000, Piotr Łobacz wrote:
> Dnia poniedziałek, 16 października 2023 07:45:41 CET Piotr Łobacz via
> lists.openembedded.org pisze:
> > Dnia niedziela, 15 października 2023 20:26:49 CEST Richard Purdie pisze:
> > > On Sun, 2023-10-15 at 16:57 +0200, Piotr Łobacz wrote:
> > > > Due to the bugs
> > > > https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsavann
> > > > a%2F&data=05%7C01%7Cp.lobacz%40welotec.com%7Cbac3f04a07664b3a912a08dbce0
> > > > b282c%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C638330319545808351%7C
> > > > Unknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haW
> > > > wiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=875wwpxmvY10%2BUdvEbJFTJwc1zW%2Bq
> > > > 0YOn8g9wgVvdUA%3D&reserved=0
> > > > h.gnu.org%2Fbugs%2F%3F61934&data=05%7C01%7Cp.lobacz%40welotec.com%7C208
> > > > 43c
> > > > d409ff471ad53b08dbcdac4d55%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7
> > > > C63
> > > > 8329912144020487%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2
> > > > luM
> > > > zIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=U8%2Fmm02MR5ps5
> > > > btR JnE1EnySNk4NJV498kRX66jjeeQ%3D&reserved=0 and
> > > > https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsavann
> > > > a%2F&data=05%7C01%7Cp.lobacz%40welotec.com%7Cbac3f04a07664b3a912a08dbce0
> > > > b282c%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C638330319545808351%7C
> > > > Unknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haW
> > > > wiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=875wwpxmvY10%2BUdvEbJFTJwc1zW%2Bq
> > > > 0YOn8g9wgVvdUA%3D&reserved=0
> > > > h.gnu.org%2Fbugs%2F%3F59184&data=05%7C01%7Cp.lobacz%40welotec.com%7C208
> > > > 43c
> > > > d409ff471ad53b08dbcdac4d55%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7
> > > > C63
> > > > 8329912144020487%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2
> > > > luM
> > > > zIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=J3cwWWAQ6BHP1aG
> > > > VeP 1yRIGnGyG1fqVvPaVJY6kjKWc%3D&reserved=0, which are fixed in tar
> > > > version 1.35, we need to force yocto to use it instead
> > > > of the one provided by the host machine.
> > > >
> > > > sstate_create_package and sstate_unpack_package functions,
> > > > will use the tar provided by tar recipe, which is already
> > > > in proper version.
> > > >
> > > > Signed-off-by: Piotr Łobacz <p.lobacz@welotec.com>
> > > > ---
> > > >
> > > > meta/classes-global/sstate.bbclass | 6 +++++-
> > > > 1 file changed, 5 insertions(+), 1 deletion(-)
> > > >
> > > > diff --git a/meta/classes-global/sstate.bbclass
> > > > b/meta/classes-global/sstate.bbclass index 2676f18e0a..5ae6f515f2 100644
> > > > --- a/meta/classes-global/sstate.bbclass
> > > > +++ b/meta/classes-global/sstate.bbclass
> > > > @@ -152,7 +152,9 @@ python () {
> > > >
> > > > else:
> > > > d.setVar('SSTATE_MANMACH', d.expand("${PACKAGE_ARCH}"))
> > > >
> > > > - if bb.data.inherits_class('native', d) or
> > > > bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross',
> > > > d): + is_native = bb.data.inherits_class('native', d) or
> > > > bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('cross',
> > > > d) +
> > > >
> > > > + if is_native:
> > > > d.setVar('SSTATE_EXTRAPATH', "${NATIVELSBSTRING}/")
> > > > d.setVar('BB_HASHFILENAME', "True ${SSTATE_PKGSPEC}
> > > > ${SSTATE_SWSPEC}")
> > > > d.setVar('SSTATE_EXTRAPATHWILDCARD', "${NATIVELSBSTRING}/")
> > > >
> > > > @@ -164,6 +166,8 @@ python () {
> > > >
> > > > d.appendVarFlag(task, 'postfuncs', " sstate_task_postfunc")
> > > > d.setVarFlag(task, 'network', '1')
> > > > d.setVarFlag(task + "_setscene", 'network', '1')
> > > >
> > > > + if not is_native:
> > > > + d.appendVarFlag(task, 'deptask', '
> > > > tar-replacement-native:do_populate_sysroot')>
> > > >
> > > > }
> > >
> > > > def sstate_init(task, d):
> > > I don't think this dependency is enough to ensure that the setscene
> > > task for one of these tasks has tar-native present when the sstate
> > > package is extracted from sstate?
> > >
> > > Cheers,
> > >
> > > Richard
> >
> > Hi Richard, proposals are welcome :-)
> >
> > BR
> > Piotr
> BTW. Richard was it tested already by you?
No, sadly I can tell from the patches alone that there are issues there
:(
Cheers,
Richard
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [OE-Core][PATCH v14 03/11] sstate.bbclass: override tar with tar-native
2023-11-10 12:01 ` Richard Purdie
@ 2023-11-10 19:23 ` Piotr Łobacz
2023-11-11 0:23 ` Richard Purdie
0 siblings, 1 reply; 18+ messages in thread
From: Piotr Łobacz @ 2023-11-10 19:23 UTC (permalink / raw)
To: openembedded-core@lists.openembedded.org, Richard Purdie
Dnia piątek, 10 listopada 2023 13:01:46 CET Richard Purdie pisze:
> On Fri, 2023-11-10 at 10:12 +0000, Piotr Łobacz wrote:
> > Dnia poniedziałek, 16 października 2023 07:45:41 CET Piotr Łobacz via
> >
> > lists.openembedded.org pisze:
> > > Dnia niedziela, 15 października 2023 20:26:49 CEST Richard Purdie pisze:
> > > > On Sun, 2023-10-15 at 16:57 +0200, Piotr Łobacz wrote:
> > > > > Due to the bugs
> > > > > https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsa
> > > > > vann%2F&data=05%7C01%7Cp.lobacz%40welotec.com%7C6cb785a640ac49183830
> > > > > 08dbe1e4d185%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C6383521451
> > > > > 16769023%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzI
> > > > > iLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=NNKAagYPr3Lzk5
> > > > > 18gY3ceRLgWpKnHODZQylBweyOyAI%3D&reserved=0
> > > > > a%2F&data=05%7C01%7Cp.lobacz%40welotec.com%7Cbac3f04a07664b3a912a08
> > > > > dbce0
> > > > > b282c%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C6383303195458083
> > > > > 51%7C
> > > > > Unknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6I
> > > > > k1haW
> > > > > wiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=875wwpxmvY10%2BUdvEbJFTJwc1z
> > > > > W%2Bq 0YOn8g9wgVvdUA%3D&reserved=0
> > > > > h.gnu.org%2Fbugs%2F%3F61934&data=05%7C01%7Cp.lobacz%40welotec.com%7C
> > > > > 208
> > > > > 43c
> > > > > d409ff471ad53b08dbcdac4d55%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C
> > > > > 0%7
> > > > > C63
> > > > > 8329912144020487%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjo
> > > > > iV2
> > > > > luM
> > > > > zIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=U8%2Fmm02MR5
> > > > > ps5
> > > > > btR JnE1EnySNk4NJV498kRX66jjeeQ%3D&reserved=0 and
> > > > > https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsa
> > > > > vann%2F&data=05%7C01%7Cp.lobacz%40welotec.com%7C6cb785a640ac49183830
> > > > > 08dbe1e4d185%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C6383521451
> > > > > 16769023%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzI
> > > > > iLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=NNKAagYPr3Lzk5
> > > > > 18gY3ceRLgWpKnHODZQylBweyOyAI%3D&reserved=0
> > > > > a%2F&data=05%7C01%7Cp.lobacz%40welotec.com%7Cbac3f04a07664b3a912a08
> > > > > dbce0
> > > > > b282c%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C6383303195458083
> > > > > 51%7C
> > > > > Unknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6I
> > > > > k1haW
> > > > > wiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=875wwpxmvY10%2BUdvEbJFTJwc1z
> > > > > W%2Bq 0YOn8g9wgVvdUA%3D&reserved=0
> > > > > h.gnu.org%2Fbugs%2F%3F59184&data=05%7C01%7Cp.lobacz%40welotec.com%7C
> > > > > 208
> > > > > 43c
> > > > > d409ff471ad53b08dbcdac4d55%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C
> > > > > 0%7
> > > > > C63
> > > > > 8329912144020487%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjo
> > > > > iV2
> > > > > luM
> > > > > zIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=J3cwWWAQ6BHP
> > > > > 1aG
> > > > > VeP 1yRIGnGyG1fqVvPaVJY6kjKWc%3D&reserved=0, which are fixed in tar
> > > > > version 1.35, we need to force yocto to use it instead
> > > > > of the one provided by the host machine.
> > > > >
> > > > > sstate_create_package and sstate_unpack_package functions,
> > > > > will use the tar provided by tar recipe, which is already
> > > > > in proper version.
> > > > >
> > > > > Signed-off-by: Piotr Łobacz <p.lobacz@welotec.com>
> > > > > ---
> > > > >
> > > > > meta/classes-global/sstate.bbclass | 6 +++++-
> > > > > 1 file changed, 5 insertions(+), 1 deletion(-)
> > > > >
> > > > > diff --git a/meta/classes-global/sstate.bbclass
> > > > > b/meta/classes-global/sstate.bbclass index 2676f18e0a..5ae6f515f2
> > > > > 100644
> > > > > --- a/meta/classes-global/sstate.bbclass
> > > > > +++ b/meta/classes-global/sstate.bbclass
> > > > > @@ -152,7 +152,9 @@ python () {
> > > > >
> > > > > else:
> > > > > d.setVar('SSTATE_MANMACH', d.expand("${PACKAGE_ARCH}"))
> > > > >
> > > > > - if bb.data.inherits_class('native', d) or
> > > > > bb.data.inherits_class('crosssdk', d) or
> > > > > bb.data.inherits_class('cross',
> > > > > d): + is_native = bb.data.inherits_class('native', d) or
> > > > > bb.data.inherits_class('crosssdk', d) or
> > > > > bb.data.inherits_class('cross',
> > > > > d) +
> > > > >
> > > > > + if is_native:
> > > > > d.setVar('SSTATE_EXTRAPATH', "${NATIVELSBSTRING}/")
> > > > > d.setVar('BB_HASHFILENAME', "True ${SSTATE_PKGSPEC}
> > > > > ${SSTATE_SWSPEC}")
> > > > > d.setVar('SSTATE_EXTRAPATHWILDCARD', "${NATIVELSBSTRING}/")
> > > > >
> > > > > @@ -164,6 +166,8 @@ python () {
> > > > >
> > > > > d.appendVarFlag(task, 'postfuncs', " sstate_task_postfunc")
> > > > > d.setVarFlag(task, 'network', '1')
> > > > > d.setVarFlag(task + "_setscene", 'network', '1')
> > > > >
> > > > > + if not is_native:
> > > > > + d.appendVarFlag(task, 'deptask', '
> > > > > tar-replacement-native:do_populate_sysroot')>
> > > > >
> > > > > }
> > > >
> > > > > def sstate_init(task, d):
> > > > I don't think this dependency is enough to ensure that the setscene
> > > > task for one of these tasks has tar-native present when the sstate
> > > > package is extracted from sstate?
> > > >
> > > > Cheers,
> > > >
> > > > Richard
> > >
> > > Hi Richard, proposals are welcome :-)
> > >
> > > BR
> > > Piotr
> >
> > BTW. Richard was it tested already by you?
>
> No, sadly I can tell from the patches alone that there are issues there
>
> :(
>
> Cheers,
>
> Richard
You mean there are issues with the patches or what?
BR
Piotr
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [OE-Core][PATCH v14 03/11] sstate.bbclass: override tar with tar-native
2023-11-10 19:23 ` Piotr Łobacz
@ 2023-11-11 0:23 ` Richard Purdie
2023-11-11 11:16 ` Piotr Łobacz
0 siblings, 1 reply; 18+ messages in thread
From: Richard Purdie @ 2023-11-11 0:23 UTC (permalink / raw)
To: Piotr Łobacz, openembedded-core@lists.openembedded.org
On Fri, 2023-11-10 at 19:23 +0000, Piotr Łobacz wrote:
> Dnia piątek, 10 listopada 2023 13:01:46 CET Richard Purdie pisze:
> > On Fri, 2023-11-10 at 10:12 +0000, Piotr Łobacz wrote:
> > > Dnia poniedziałek, 16 października 2023 07:45:41 CET Piotr Łobacz via
> > >
> > > lists.openembedded.org pisze:
> > > > Dnia niedziela, 15 października 2023 20:26:49 CEST Richard Purdie pisze:
> > > > > On Sun, 2023-10-15 at 16:57 +0200, Piotr Łobacz wrote:
> > > > > > Due to the bugs
> > > > > > https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsa
> > > > > > vann%2F&data=05%7C01%7Cp.lobacz%40welotec.com%7C6cb785a640ac49183830
> > > > > > 08dbe1e4d185%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C6383521451
> > > > > > 16769023%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzI
> > > > > > iLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=NNKAagYPr3Lzk5
> > > > > > 18gY3ceRLgWpKnHODZQylBweyOyAI%3D&reserved=0
> > > > > > a%2F&data=05%7C01%7Cp.lobacz%40welotec.com%7Cbac3f04a07664b3a912a08
> > > > > > dbce0
> > > > > > b282c%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C6383303195458083
> > > > > > 51%7C
> > > > > > Unknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6I
> > > > > > k1haW
> > > > > > wiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=875wwpxmvY10%2BUdvEbJFTJwc1z
> > > > > > W%2Bq 0YOn8g9wgVvdUA%3D&reserved=0
> > > > > > h.gnu.org%2Fbugs%2F%3F61934&data=05%7C01%7Cp.lobacz%40welotec.com%7C
> > > > > > 208
> > > > > > 43c
> > > > > > d409ff471ad53b08dbcdac4d55%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C
> > > > > > 0%7
> > > > > > C63
> > > > > > 8329912144020487%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjo
> > > > > > iV2
> > > > > > luM
> > > > > > zIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=U8%2Fmm02MR5
> > > > > > ps5
> > > > > > btR JnE1EnySNk4NJV498kRX66jjeeQ%3D&reserved=0 and
> > > > > > https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsa
> > > > > > vann%2F&data=05%7C01%7Cp.lobacz%40welotec.com%7C6cb785a640ac49183830
> > > > > > 08dbe1e4d185%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C6383521451
> > > > > > 16769023%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzI
> > > > > > iLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=NNKAagYPr3Lzk5
> > > > > > 18gY3ceRLgWpKnHODZQylBweyOyAI%3D&reserved=0
> > > > > > a%2F&data=05%7C01%7Cp.lobacz%40welotec.com%7Cbac3f04a07664b3a912a08
> > > > > > dbce0
> > > > > > b282c%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C6383303195458083
> > > > > > 51%7C
> > > > > > Unknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6I
> > > > > > k1haW
> > > > > > wiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=875wwpxmvY10%2BUdvEbJFTJwc1z
> > > > > > W%2Bq 0YOn8g9wgVvdUA%3D&reserved=0
> > > > > > h.gnu.org%2Fbugs%2F%3F59184&data=05%7C01%7Cp.lobacz%40welotec.com%7C
> > > > > > 208
> > > > > > 43c
> > > > > > d409ff471ad53b08dbcdac4d55%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C
> > > > > > 0%7
> > > > > > C63
> > > > > > 8329912144020487%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjo
> > > > > > iV2
> > > > > > luM
> > > > > > zIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=J3cwWWAQ6BHP
> > > > > > 1aG
> > > > > > VeP 1yRIGnGyG1fqVvPaVJY6kjKWc%3D&reserved=0, which are fixed in tar
> > > > > > version 1.35, we need to force yocto to use it instead
> > > > > > of the one provided by the host machine.
> > > > > >
> > > > > > sstate_create_package and sstate_unpack_package functions,
> > > > > > will use the tar provided by tar recipe, which is already
> > > > > > in proper version.
> > > > > >
> > > > > > Signed-off-by: Piotr Łobacz <p.lobacz@welotec.com>
> > > > > > ---
> > > > > >
> > > > > > meta/classes-global/sstate.bbclass | 6 +++++-
> > > > > > 1 file changed, 5 insertions(+), 1 deletion(-)
> > > > > >
> > > > > > diff --git a/meta/classes-global/sstate.bbclass
> > > > > > b/meta/classes-global/sstate.bbclass index 2676f18e0a..5ae6f515f2
> > > > > > 100644
> > > > > > --- a/meta/classes-global/sstate.bbclass
> > > > > > +++ b/meta/classes-global/sstate.bbclass
> > > > > > @@ -152,7 +152,9 @@ python () {
> > > > > >
> > > > > > else:
> > > > > > d.setVar('SSTATE_MANMACH', d.expand("${PACKAGE_ARCH}"))
> > > > > >
> > > > > > - if bb.data.inherits_class('native', d) or
> > > > > > bb.data.inherits_class('crosssdk', d) or
> > > > > > bb.data.inherits_class('cross',
> > > > > > d): + is_native = bb.data.inherits_class('native', d) or
> > > > > > bb.data.inherits_class('crosssdk', d) or
> > > > > > bb.data.inherits_class('cross',
> > > > > > d) +
> > > > > >
> > > > > > + if is_native:
> > > > > > d.setVar('SSTATE_EXTRAPATH', "${NATIVELSBSTRING}/")
> > > > > > d.setVar('BB_HASHFILENAME', "True ${SSTATE_PKGSPEC}
> > > > > > ${SSTATE_SWSPEC}")
> > > > > > d.setVar('SSTATE_EXTRAPATHWILDCARD', "${NATIVELSBSTRING}/")
> > > > > >
> > > > > > @@ -164,6 +166,8 @@ python () {
> > > > > >
> > > > > > d.appendVarFlag(task, 'postfuncs', " sstate_task_postfunc")
> > > > > > d.setVarFlag(task, 'network', '1')
> > > > > > d.setVarFlag(task + "_setscene", 'network', '1')
> > > > > >
> > > > > > + if not is_native:
> > > > > > + d.appendVarFlag(task, 'deptask', '
> > > > > > tar-replacement-native:do_populate_sysroot')>
> > > > > >
> > > > > > }
> > > > >
> > > > > > def sstate_init(task, d):
> > > > > I don't think this dependency is enough to ensure that the setscene
> > > > > task for one of these tasks has tar-native present when the sstate
> > > > > package is extracted from sstate?
> > > > >
> > > > > Cheers,
> > > > >
> > > > > Richard
> > > >
> > > > Hi Richard, proposals are welcome :-)
> > > >
> > > > BR
> > > > Piotr
> > >
> > > BTW. Richard was it tested already by you?
> >
> > No, sadly I can tell from the patches alone that there are issues there
> >
> > :(
> >
> > Cheers,
> >
> > Richard
> You mean there are issues with the patches or what?
I mean that the problem I mentioned above, that the dependency won't
work for setscene tasks will cause breakage. If I can see that just
looking at the patch there is little point in testing it further.
I ended with a question mark as I'm not 100% sure and I was basically
saying "correct me if I'm wrong", but I am fairly certain it won't work
in some corner cases.
Cheers,
Richard
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [OE-Core][PATCH v14 03/11] sstate.bbclass: override tar with tar-native
2023-11-11 0:23 ` Richard Purdie
@ 2023-11-11 11:16 ` Piotr Łobacz
0 siblings, 0 replies; 18+ messages in thread
From: Piotr Łobacz @ 2023-11-11 11:16 UTC (permalink / raw)
To: openembedded-core@lists.openembedded.org, Richard Purdie
Dnia sobota, 11 listopada 2023 01:23:59 CET Richard Purdie pisze:
> On Fri, 2023-11-10 at 19:23 +0000, Piotr Łobacz wrote:
> > Dnia piątek, 10 listopada 2023 13:01:46 CET Richard Purdie pisze:
> > > On Fri, 2023-11-10 at 10:12 +0000, Piotr Łobacz wrote:
> > > > Dnia poniedziałek, 16 października 2023 07:45:41 CET Piotr Łobacz via
> > > >
> > > > lists.openembedded.org pisze:
> > > > > Dnia niedziela, 15 października 2023 20:26:49 CEST Richard Purdie
pisze:
> > > > > > On Sun, 2023-10-15 at 16:57 +0200, Piotr Łobacz wrote:
> > > > > > > Due to the bugs
> > > > > > > https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%
> > > > > > > 2Fsa%2F&data=05%7C01%7Cp.lobacz%40welotec.com%7C2a6d6926b1c545c5
> > > > > > > 6aa608dbe24c8149%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C63
> > > > > > > 8352590457133024%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJ
> > > > > > > QIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdat
> > > > > > > a=ETw552e%2B46hM5hanBbOyv417wADVL0HaFFSK%2BPVeJ54%3D&reserved=0
> > > > > > > vann%2F&data=05%7C01%7Cp.lobacz%40welotec.com%7C6cb785a640ac491
> > > > > > > 83830
> > > > > > > 08dbe1e4d185%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C63835
> > > > > > > 21451
> > > > > > > 16769023%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2
> > > > > > > luMzI
> > > > > > > iLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=NNKAagYPr
> > > > > > > 3Lzk5 18gY3ceRLgWpKnHODZQylBweyOyAI%3D&reserved=0
> > > > > > > a%2F&data=05%7C01%7Cp.lobacz%40welotec.com%7Cbac3f04a07664b3a912
> > > > > > > a08
> > > > > > > dbce0
> > > > > > > b282c%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C6383303195458
> > > > > > > 083
> > > > > > > 51%7C
> > > > > > > Unknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTi
> > > > > > > I6I
> > > > > > > k1haW
> > > > > > > wiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=875wwpxmvY10%2BUdvEbJFTJw
> > > > > > > c1z
> > > > > > > W%2Bq 0YOn8g9wgVvdUA%3D&reserved=0
> > > > > > > h.gnu.org%2Fbugs%2F%3F61934&data=05%7C01%7Cp.lobacz%40welotec.co
> > > > > > > m%7C
> > > > > > > 208
> > > > > > > 43c
> > > > > > > d409ff471ad53b08dbcdac4d55%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C
> > > > > > > 0%7C
> > > > > > > 0%7
> > > > > > > C63
> > > > > > > 8329912144020487%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJ
> > > > > > > QIjo
> > > > > > > iV2
> > > > > > > luM
> > > > > > > zIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=U8%2Fmm0
> > > > > > > 2MR5
> > > > > > > ps5
> > > > > > > btR JnE1EnySNk4NJV498kRX66jjeeQ%3D&reserved=0 and
> > > > > > > https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%
> > > > > > > 2Fsa%2F&data=05%7C01%7Cp.lobacz%40welotec.com%7C2a6d6926b1c545c5
> > > > > > > 6aa608dbe24c8149%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C63
> > > > > > > 8352590457133024%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJ
> > > > > > > QIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdat
> > > > > > > a=ETw552e%2B46hM5hanBbOyv417wADVL0HaFFSK%2BPVeJ54%3D&reserved=0
> > > > > > > vann%2F&data=05%7C01%7Cp.lobacz%40welotec.com%7C6cb785a640ac491
> > > > > > > 83830
> > > > > > > 08dbe1e4d185%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C63835
> > > > > > > 21451
> > > > > > > 16769023%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2
> > > > > > > luMzI
> > > > > > > iLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=NNKAagYPr
> > > > > > > 3Lzk5 18gY3ceRLgWpKnHODZQylBweyOyAI%3D&reserved=0
> > > > > > > a%2F&data=05%7C01%7Cp.lobacz%40welotec.com%7Cbac3f04a07664b3a912
> > > > > > > a08
> > > > > > > dbce0
> > > > > > > b282c%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C6383303195458
> > > > > > > 083
> > > > > > > 51%7C
> > > > > > > Unknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTi
> > > > > > > I6I
> > > > > > > k1haW
> > > > > > > wiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=875wwpxmvY10%2BUdvEbJFTJw
> > > > > > > c1z
> > > > > > > W%2Bq 0YOn8g9wgVvdUA%3D&reserved=0
> > > > > > > h.gnu.org%2Fbugs%2F%3F59184&data=05%7C01%7Cp.lobacz%40welotec.co
> > > > > > > m%7C
> > > > > > > 208
> > > > > > > 43c
> > > > > > > d409ff471ad53b08dbcdac4d55%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C
> > > > > > > 0%7C
> > > > > > > 0%7
> > > > > > > C63
> > > > > > > 8329912144020487%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJ
> > > > > > > QIjo
> > > > > > > iV2
> > > > > > > luM
> > > > > > > zIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=J3cwWWAQ
> > > > > > > 6BHP
> > > > > > > 1aG
> > > > > > > VeP 1yRIGnGyG1fqVvPaVJY6kjKWc%3D&reserved=0, which are fixed in
> > > > > > > tar
> > > > > > > version 1.35, we need to force yocto to use it instead
> > > > > > > of the one provided by the host machine.
> > > > > > >
> > > > > > > sstate_create_package and sstate_unpack_package functions,
> > > > > > > will use the tar provided by tar recipe, which is already
> > > > > > > in proper version.
> > > > > > >
> > > > > > > Signed-off-by: Piotr Łobacz <p.lobacz@welotec.com>
> > > > > > > ---
> > > > > > >
> > > > > > > meta/classes-global/sstate.bbclass | 6 +++++-
> > > > > > > 1 file changed, 5 insertions(+), 1 deletion(-)
> > > > > > >
> > > > > > > diff --git a/meta/classes-global/sstate.bbclass
> > > > > > > b/meta/classes-global/sstate.bbclass index
> > > > > > > 2676f18e0a..5ae6f515f2
> > > > > > > 100644
> > > > > > > --- a/meta/classes-global/sstate.bbclass
> > > > > > > +++ b/meta/classes-global/sstate.bbclass
> > > > > > > @@ -152,7 +152,9 @@ python () {
> > > > > > >
> > > > > > > else:
> > > > > > > d.setVar('SSTATE_MANMACH', d.expand("${PACKAGE_ARCH}"))
> > > > > > >
> > > > > > > - if bb.data.inherits_class('native', d) or
> > > > > > > bb.data.inherits_class('crosssdk', d) or
> > > > > > > bb.data.inherits_class('cross',
> > > > > > > d): + is_native = bb.data.inherits_class('native', d) or
> > > > > > > bb.data.inherits_class('crosssdk', d) or
> > > > > > > bb.data.inherits_class('cross',
> > > > > > > d) +
> > > > > > >
> > > > > > > + if is_native:
> > > > > > > d.setVar('SSTATE_EXTRAPATH', "${NATIVELSBSTRING}/")
> > > > > > > d.setVar('BB_HASHFILENAME', "True ${SSTATE_PKGSPEC}
> > > > > > > ${SSTATE_SWSPEC}")
> > > > > > > d.setVar('SSTATE_EXTRAPATHWILDCARD',
> > > > > > > "${NATIVELSBSTRING}/")
> > > > > > >
> > > > > > > @@ -164,6 +166,8 @@ python () {
> > > > > > >
> > > > > > > d.appendVarFlag(task, 'postfuncs', "
> > > > > > > sstate_task_postfunc")
> > > > > > > d.setVarFlag(task, 'network', '1')
> > > > > > > d.setVarFlag(task + "_setscene", 'network', '1')
> > > > > > >
> > > > > > > + if not is_native:
> > > > > > > + d.appendVarFlag(task, 'deptask', '
> > > > > > > tar-replacement-native:do_populate_sysroot')>
> > > > > > >
> > > > > > > }
> > > > > >
> > > > > > > def sstate_init(task, d):
> > > > > > I don't think this dependency is enough to ensure that the
> > > > > > setscene
> > > > > > task for one of these tasks has tar-native present when the sstate
> > > > > > package is extracted from sstate?
> > > > > >
> > > > > > Cheers,
> > > > > >
> > > > > > Richard
> > > > >
> > > > > Hi Richard, proposals are welcome :-)
> > > > >
> > > > > BR
> > > > > Piotr
> > > >
> > > > BTW. Richard was it tested already by you?
> > >
> > > No, sadly I can tell from the patches alone that there are issues there
> > >
> > > :(
> > >
> > > Cheers,
> > >
> > > Richard
> >
> > You mean there are issues with the patches or what?
>
> I mean that the problem I mentioned above, that the dependency won't
> work for setscene tasks will cause breakage. If I can see that just
> looking at the patch there is little point in testing it further.
>
> I ended with a question mark as I'm not 100% sure and I was basically
> saying "correct me if I'm wrong", but I am fairly certain it won't work
> in some corner cases.
>
> Cheers,
>
> Richard
OK so I should add it as well for setscene like in case of network above
right? I'm sorry Richard that I'm asking to many questions but I do not know
that code that well as you.
BR
Piotr
^ permalink raw reply [flat|nested] 18+ messages in thread
* [OE-Core][PATCH v14 04/11] path.py: add support for ACLs and all additional attributes
2023-10-15 14:57 [OE-Core][PATCH v14 01/11] package.bbclass: override tar with tar-native Piotr Łobacz
2023-10-15 14:57 ` [OE-Core][PATCH v14 02/11] image_types.bbclass: " Piotr Łobacz
2023-10-15 14:57 ` [OE-Core][PATCH v14 03/11] sstate.bbclass: " Piotr Łobacz
@ 2023-10-15 14:57 ` Piotr Łobacz
2023-10-15 14:57 ` [OE-Core][PATCH v14 05/11] package_ipk.bbclass: add support for ACLs and xattr Piotr Łobacz
` (6 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Piotr Łobacz @ 2023-10-15 14:57 UTC (permalink / raw)
To: openembedded-core; +Cc: Piotr Łobacz
Extend `tar` command inside copytree() and copyhardlinktree() functions,
with additional parameters, in order to support ACLs and xattr. The posix
format doesn't need to be set in here, as GNU tar switches to it whenewer
is uses --acls and/or --xattrs parameters.
Additionaly change preservation of additional attributes for `cp` command
to all (meaning mode, ownership, timestamps etc.) not only xattrs, which
were previously.
Signed-off-by: Piotr Łobacz <p.lobacz@welotec.com>
---
meta/lib/oe/path.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py
index 0dc8f172d5..56e8e214ac 100644
--- a/meta/lib/oe/path.py
+++ b/meta/lib/oe/path.py
@@ -92,7 +92,7 @@ def copytree(src, dst):
# This way we also preserve hardlinks between files in the tree.
bb.utils.mkdirhier(dst)
- cmd = "tar --xattrs --xattrs-include='*' -cf - -S -C %s -p . | tar --xattrs --xattrs-include='*' -xf - -C %s" % (src, dst)
+ cmd = "tar --acls --xattrs --xattrs-include='*' -cf - -S -C %s -p . | tar --acls --xattrs --xattrs-include='*' -xf - -C %s" % (src, dst)
subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
def copyhardlinktree(src, dst):
@@ -119,7 +119,7 @@ def copyhardlinktree(src, dst):
if (canhard):
# Need to copy directories only with tar first since cp will error if two
# writers try and create a directory at the same time
- cmd = "cd %s; find . -type d -print | tar --xattrs --xattrs-include='*' -cf - -S -C %s -p --no-recursion --files-from - | tar --xattrs --xattrs-include='*' -xhf - -C %s" % (src, src, dst)
+ cmd = "cd %s; find . -type d -print | tar --acls --xattrs --xattrs-include='*' -cf - -S -C %s -p --no-recursion --files-from - | tar --acls --xattrs --xattrs-include='*' -xhf - -C %s" % (src, src, dst)
subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
source = ''
if os.path.isdir(src):
@@ -130,7 +130,7 @@ def copyhardlinktree(src, dst):
else:
source = src
s_dir = os.getcwd()
- cmd = 'cp -afl --preserve=xattr %s %s' % (source, os.path.realpath(dst))
+ cmd = 'cp -afl --preserve=all %s %s' % (source, os.path.realpath(dst))
subprocess.check_output(cmd, shell=True, cwd=s_dir, stderr=subprocess.STDOUT)
else:
copytree(src, dst)
--
2.42.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [OE-Core][PATCH v14 05/11] package_ipk.bbclass: add support for ACLs and xattr
2023-10-15 14:57 [OE-Core][PATCH v14 01/11] package.bbclass: override tar with tar-native Piotr Łobacz
` (2 preceding siblings ...)
2023-10-15 14:57 ` [OE-Core][PATCH v14 04/11] path.py: add support for ACLs and all additional attributes Piotr Łobacz
@ 2023-10-15 14:57 ` Piotr Łobacz
2023-10-15 14:57 ` [OE-Core][PATCH v14 06/11] package.bbclass: " Piotr Łobacz
` (5 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Piotr Łobacz @ 2023-10-15 14:57 UTC (permalink / raw)
To: openembedded-core; +Cc: Piotr Łobacz
Extend OPKGBUILDCMD variable, with additional parameters, depending
on target distro features, in order to support ACLs and xattr.
With fix pushed to the opkg-devel:
https://groups.google.com/g/opkg-devel/c/dYNHrLjDwg8
opkg-build is able to create tar archives with ACLs and xattr.
Signed-off-by: Piotr Łobacz <p.lobacz@welotec.com>
---
meta/classes-global/package_ipk.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes-global/package_ipk.bbclass b/meta/classes-global/package_ipk.bbclass
index b4b7bc9ac2..a0f106e4ad 100644
--- a/meta/classes-global/package_ipk.bbclass
+++ b/meta/classes-global/package_ipk.bbclass
@@ -15,7 +15,7 @@ IPKGCONF_SDK_TARGET = "${WORKDIR}/opkg-sdk-target.conf"
PKGWRITEDIRIPK = "${WORKDIR}/deploy-ipks"
# Program to be used to build opkg packages
-OPKGBUILDCMD ??= 'opkg-build -Z xz -a "${XZ_DEFAULTS}"'
+OPKGBUILDCMD ??= 'opkg-build -Z xz -a "${XZ_DEFAULTS}" ${@bb.utils.contains('DISTRO_FEATURES', 'acl', '-A', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', '-X', '', d)}'
OPKG_ARGS += "--force_postinstall --prefer-arch-to-version"
OPKG_ARGS += "${@['', '--no-install-recommends'][d.getVar("NO_RECOMMENDATIONS") == "1"]}"
--
2.42.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [OE-Core][PATCH v14 06/11] package.bbclass: add support for ACLs and xattr
2023-10-15 14:57 [OE-Core][PATCH v14 01/11] package.bbclass: override tar with tar-native Piotr Łobacz
` (3 preceding siblings ...)
2023-10-15 14:57 ` [OE-Core][PATCH v14 05/11] package_ipk.bbclass: add support for ACLs and xattr Piotr Łobacz
@ 2023-10-15 14:57 ` Piotr Łobacz
2023-10-15 14:57 ` [OE-Core][PATCH v14 07/11] sstate.bbclass: " Piotr Łobacz
` (4 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Piotr Łobacz @ 2023-10-15 14:57 UTC (permalink / raw)
To: openembedded-core; +Cc: Piotr Łobacz
Extend `tar` command, with additional parameters, depending
on choosen package class and target distro features, in order
to support ACLs and xattr.
Currently only `package_ipk` supports fully ACLs and xattr.
Signed-off-by: Piotr Łobacz <p.lobacz@welotec.com>
---
meta/classes-global/package.bbclass | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/meta/classes-global/package.bbclass b/meta/classes-global/package.bbclass
index 580884cd83..22af6552d7 100644
--- a/meta/classes-global/package.bbclass
+++ b/meta/classes-global/package.bbclass
@@ -353,8 +353,13 @@ python perform_packagecopy () {
# Start by package population by taking a copy of the installed
# files to operate on
- # Preserve sparse files and hard links
- cmd = 'tar --exclude=./sysroot-only -cf - -C %s -p -S . | tar -xf - -C %s' % (dest, dvar)
+ # Preserve sparse files, hard links, ACLs and extended attributes
+ # TODO: for the moment only ipk packages are supporting ACLs and extended attributes
+ # we need to add support for other package systems as well, but that doesn't bother
+ # tar from creating archives with acl and/or xattr support
+ acl = bb.utils.contains('DISTRO_FEATURES', 'acl', '--acls', '', d)
+ xattr = bb.utils.contains('DISTRO_FEATURES', 'xattr', '--xattrs', '', d)
+ cmd = f'tar --format=posix {acl} {xattr} --numeric-owner --exclude=./sysroot-only -cf - -C {dest} -p -S . | tar --format=posix {acl} {xattr} -xf - -C {dvar}'
subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
# replace RPATHs for the nativesdk binaries, to make them relocatable
--
2.42.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [OE-Core][PATCH v14 07/11] sstate.bbclass: add support for ACLs and xattr
2023-10-15 14:57 [OE-Core][PATCH v14 01/11] package.bbclass: override tar with tar-native Piotr Łobacz
` (4 preceding siblings ...)
2023-10-15 14:57 ` [OE-Core][PATCH v14 06/11] package.bbclass: " Piotr Łobacz
@ 2023-10-15 14:57 ` Piotr Łobacz
2023-10-15 14:57 ` [OE-Core][PATCH v14 08/11] sstatesig.py: fix hash calculation for timestamp Piotr Łobacz
` (3 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Piotr Łobacz @ 2023-10-15 14:57 UTC (permalink / raw)
To: openembedded-core; +Cc: Piotr Łobacz
Extend `tar` command, with additional parameters, depending
on choosen package class and target distro features, in order
to support ACLs and xattr.
Additionaly set archive posix format, in order to preserve
milliseconds in timestamps for reproducibility tests.
Currently only `package_ipk` supports fully ACLs and xattr.
Signed-off-by: Piotr Łobacz <p.lobacz@welotec.com>
---
meta/classes-global/sstate.bbclass | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/meta/classes-global/sstate.bbclass b/meta/classes-global/sstate.bbclass
index 5ae6f515f2..3e7b2ce474 100644
--- a/meta/classes-global/sstate.bbclass
+++ b/meta/classes-global/sstate.bbclass
@@ -829,7 +829,22 @@ sstate_create_package () {
mkdir --mode=0775 -p `dirname ${SSTATE_PKG}`
TFILE=`mktemp ${SSTATE_PKG}.XXXXXXXX`
- OPT="-cS"
+ # Notice, that if you create an archive in POSIX format (see section GNU tar and POSIX tar) and the environment variable POSIXLY_CORRECT is set,
+ # then the two archives created using the same options on the same set of files will not be byte-to-byte equivalent even with the above option.
+ # This is because the posix default for extended header names includes the PID of the tar process, which is different at each run. To produce
+ # byte-to-byte equivalent archives in this case, either unset POSIXLY_CORRECT, or use the following option:
+ #
+ # --pax-option=exthdr.name=%d/PaxHeaders/%f,atime:=0,ctime:=0
+ #
+ # https://www.gnu.org/software/tar/manual/html_node/PAX-keywords.html
+ MTIME_ARGS="--mtime=@${SOURCE_DATE_EPOCH:-$(date +%s)} --pax-option=exthdr.name=%d/PaxHeaders/%f,atime:=0,ctime:=0"
+ # --clamp-mtime requires tar > 1.28. Only use it if SOURCE_DATE_EPOCH is set, to avoid having a generic case dependency on tar > 1.28.
+ # this setting will make sure files generated at build time have consistent mtimes, for reproducible builds.
+ if [ ! -z "$SOURCE_DATE_EPOCH" ]; then
+ MTIME_ARGS="$MTIME_ARGS --clamp-mtime"
+ fi
+
+ OPT="--format=posix ${@bb.utils.contains('DISTRO_FEATURES', 'acl', '--acls', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', '--xattrs', '', d)} --numeric-owner ${MTIME_ARGS} -cS"
ZSTD="zstd -${SSTATE_ZSTD_CLEVEL} -T${ZSTD_THREADS}"
# Use pzstd if available
if [ -x "$(command -v pzstd)" ]; then
@@ -895,7 +910,7 @@ sstate_unpack_package () {
ZSTD="pzstd -p ${ZSTD_THREADS}"
fi
- tar -I "$ZSTD" -xvpf ${SSTATE_PKG}
+ tar -I "$ZSTD" --format=posix ${@bb.utils.contains('DISTRO_FEATURES', 'acl', '--acls', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', '--xattrs', '', d)} -xvpf ${SSTATE_PKG}
# update .siginfo atime on local/NFS mirror if it is a symbolic link
[ ! -h ${SSTATE_PKG}.siginfo ] || [ ! -e ${SSTATE_PKG}.siginfo ] || touch -a ${SSTATE_PKG}.siginfo 2>/dev/null || true
# update each symbolic link instead of any referenced file
--
2.42.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [OE-Core][PATCH v14 08/11] sstatesig.py: fix hash calculation for timestamp
2023-10-15 14:57 [OE-Core][PATCH v14 01/11] package.bbclass: override tar with tar-native Piotr Łobacz
` (5 preceding siblings ...)
2023-10-15 14:57 ` [OE-Core][PATCH v14 07/11] sstate.bbclass: " Piotr Łobacz
@ 2023-10-15 14:57 ` Piotr Łobacz
2023-10-15 14:57 ` [OE-Core][PATCH v14 09/11] opkg-utils: add acl and xattr support Piotr Łobacz
` (2 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Piotr Łobacz @ 2023-10-15 14:57 UTC (permalink / raw)
To: openembedded-core; +Cc: Piotr Łobacz
Passing timestamp as an integer was losing precision, which led
to problems with badly recreated sstate cache.
Passing it as floating point number fixes the issue.
Signed-off-by: Piotr Łobacz <p.lobacz@welotec.com>
---
meta/lib/oe/sstatesig.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 5bf1697e72..f1f9de253d 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -604,7 +604,7 @@ def OEOuthashBasic(path, sigfile, task, d):
raise Exception(msg).with_traceback(e.__traceback__)
if include_timestamps:
- update_hash(" %10d" % s.st_mtime)
+ update_hash(" %f" % s.st_mtime)
update_hash(" ")
if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode):
--
2.42.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [OE-Core][PATCH v14 09/11] opkg-utils: add acl and xattr support
2023-10-15 14:57 [OE-Core][PATCH v14 01/11] package.bbclass: override tar with tar-native Piotr Łobacz
` (6 preceding siblings ...)
2023-10-15 14:57 ` [OE-Core][PATCH v14 08/11] sstatesig.py: fix hash calculation for timestamp Piotr Łobacz
@ 2023-10-15 14:57 ` Piotr Łobacz
2023-10-15 14:57 ` [OE-Core][PATCH v14 10/11] opkg: add options to enable support for acl and xattr Piotr Łobacz
2023-10-15 14:57 ` [OE-Core][PATCH v14 11/11] opkg: set locale from system environment variables Piotr Łobacz
9 siblings, 0 replies; 18+ messages in thread
From: Piotr Łobacz @ 2023-10-15 14:57 UTC (permalink / raw)
To: openembedded-core; +Cc: Piotr Łobacz
Add support for tar archives created with --acls and/or --xattrs options,
PAX header format.
GNU tar and libarchive already supports ACLs and extended attributes.
We can now add this support as well to opkg-build script in order to use
fsetattr or setcap inside do_install command and end up with a file in
an image with the relevant ACLs and xattrs.
Signed-off-by: Piotr Łobacz <p.lobacz@welotec.com>
---
...kg-build-Add-acls-and-xattrs-support.patch | 174 ++++++++++++++++++
.../opkg-utils/opkg-utils_0.6.2.bb | 1 +
2 files changed, 175 insertions(+)
create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Add-acls-and-xattrs-support.patch
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Add-acls-and-xattrs-support.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Add-acls-and-xattrs-support.patch
new file mode 100644
index 0000000000..6cc81d3241
--- /dev/null
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Add-acls-and-xattrs-support.patch
@@ -0,0 +1,174 @@
+From 8d9953dd8d589e9b740307976cbe474e0ce292a0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20=C5=81obacz?= <p.lobacz@welotec.com>
+Date: Wed, 16 Aug 2023 14:59:35 +0200
+Subject: [PATCH 1/2] opkg-build: Add acls and xattrs support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add support for tar archives created with --acls and/or --xattrs options,
+PAX header format.
+
+GNU tar and libarchive already supports ACLs and extended attributes.
+We can now add this support as well to opkg-build script in order to use
+fsetattr or setcap inside do_install command and end up with a file in
+an image with the relevant ACLs and xattrs.
+
+Upstream-Status: Backport [8d9953dd8d589e9b740307976cbe474e0ce292a0]
+
+[1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=15097
+[2] https://groups.google.com/g/opkg-devel/c/aEGL7XRXfaA
+
+Signed-off-by: Piotr Łobacz <p.lobacz@welotec.com>
+---
+ opkg-build | 81 +++++++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 53 insertions(+), 28 deletions(-)
+
+diff --git a/opkg-build b/opkg-build
+index a9e45d4..fb0873d 100755
+--- a/opkg-build
++++ b/opkg-build
+@@ -145,6 +145,7 @@ You probably want to chown these to a system user: " >&2
+ ###
+ # opkg-build "main"
+ ###
++attributesargs=""
+ ogargs=""
+ outer=ar
+ noclean=0
+@@ -153,22 +154,6 @@ compressor=gzip
+ zipargs="-9n"
+ compressorargs=""
+
+-# Determine if tar supports the --format argument by checking the help output.
+-#
+-# This is needed because:
+-# - Busybox tar doesn't support '--format'
+-# - On some Linux distros, tar now defaults to posix format if '--format'
+-# isn't explicitly specified
+-# - Opkg doesn't currently support posix format archives
+-#
+-# It's easier to check for mention of the '--format' option than to detect the
+-# tar implementation and maintain a list of which support '--format'.
+-tarformat=""
+-if tar --help 2>&1 | grep -- "--format" > /dev/null;
+-then
+- tarformat="--format=gnu"
+-fi
+-
+ compressor_ext() {
+ case $1 in
+ gzip|pigz)
+@@ -197,20 +182,24 @@ compressor_ext() {
+ : <<=cut
+ =head1 SYNOPSIS
+
+-B<opkg-build> [B<-c>] [B<-C>] [B<-Z> I<compressor>] [B<-a>] [B<-O>] [B<-o> I<owner>] [B<-g> I<group>] I<pkg_directory> [I<destination_directory>]
++B<opkg-build> [B<-A>] [B<-X>] [B<-c>] [B<-C>] [B<-Z> I<compressor>] [B<-a>] [B<-O>] [B<-o> I<owner>] [B<-g> I<group>] I<pkg_directory> [I<destination_directory>]
+
+ =cut
+
+-usage="Usage: $0 [-c] [-C] [-Z compressor] [-a compressor_args] [-O] [-o owner] [-g group] <pkg_directory> [<destination_directory>]"
+-while getopts "a:cCg:ho:vOZ:" opt; do
++usage="Usage: $0 [-A] [-X] [-c] [-C] [-Z compressor] [-a compressor_args] [-O] [-o owner] [-g group] <pkg_directory> [<destination_directory>]"
++while getopts "Aa:cCg:ho:vOXZ:" opt; do
+ case $opt in
++ A ) attributesargs="${attributesargs:+$attributesargs }--acls"
++ ;;
++ X ) attributesargs="${attributesargs:+$attributesargs }--xattrs"
++ ;;
+ o ) owner=$OPTARG
+- ogargs="--owner=$owner"
++ ogargs="${ogargs:+$ogargs }--owner=$owner"
+ ;;
+ O ) opkext=1
+ ;;
+ g ) group=$OPTARG
+- ogargs="$ogargs --group=$group"
++ ogargs="${ogargs:+$ogargs }--group=$group"
+ ;;
+ c ) outer=tar
+ ;;
+@@ -232,6 +221,32 @@ while getopts "a:cCg:ho:vOZ:" opt; do
+ esac
+ done
+
++# Determine if tar supports the --format argument by checking the help output.
++#
++# This is needed because:
++# - Busybox tar doesn't support '--format'
++# - On some Linux distros, tar now defaults to posix format if '--format'
++# isn't explicitly specified
++# - Opkg currently supports posix format archives, but gnu format is left
++# here intentionally for backward compatibility
++#
++# It's easier to check for mention of the '--format' option than to detect the
++# tar implementation and maintain a list of which support '--format'.
++tarformat=""
++if tar --help 2>&1 | grep -- "--format" > /dev/null;
++then
++ # For ACLs or xattr support, gnu format will not work
++ # we need to set posix format instead
++ if [ ! -z "$attributesargs" ] ; then
++ tarformat="--format=posix"
++ else
++ tarformat="--format=gnu"
++ fi
++elif [ ! -z "$attributesargs" ] ; then
++ echo "*** Error: Attributes: $attributesargs, don't work, without posix format, which is not supported by host's tar command." >&2
++ exit 1
++fi
++
+ cext=$(compressor_ext $compressor)
+
+ # pgzip requires -T to avoid timestamps on the gzip archive
+@@ -301,21 +316,31 @@ fi
+ tmp_dir=$dest_dir/IPKG_BUILD.$$
+ mkdir $tmp_dir
+
+-build_date="${SOURCE_DATE_EPOCH:-$(date +%s)}"
+-
+-mtime_args=""
++mtime_args="--mtime=@${SOURCE_DATE_EPOCH:-$(date +%s)}"
+ # --clamp-mtime requires tar > 1.28. Only use it if SOURCE_DATE_EPOCH is set, to avoid having a generic case dependency on tar > 1.28.
+ # this setting will make sure files generated at build time have consistent mtimes, for reproducible builds.
+ if [ ! -z "$SOURCE_DATE_EPOCH" ]; then
+- mtime_args="--mtime=@$build_date --clamp-mtime"
++ mtime_args="$mtime_args --clamp-mtime"
++fi
++
++# Notice, that if you create an archive in POSIX format (see section GNU tar and POSIX tar) and the environment variable POSIXLY_CORRECT is set,
++# then the two archives created using the same options on the same set of files will not be byte-to-byte equivalent even with the above option.
++# This is because the posix default for extended header names includes the PID of the tar process, which is different at each run. To produce
++# byte-to-byte equivalent archives in this case, either unset POSIXLY_CORRECT, or use the following option:
++#
++# --pax-option=exthdr.name=%d/PaxHeaders/%f,atime:=0,ctime:=0
++#
++# https://www.gnu.org/software/tar/manual/html_node/PAX-keywords.html
++if [[ "$tarformat" == "--format=posix" ]]; then
++ mtime_args="$mtime_args --pax-option=exthdr.name=%d/PaxHeaders/%f,atime:=0,ctime:=0"
+ fi
+
+ export LANG=C
+ export LC_ALL=C
+ ( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list )
+ ( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print | sort > $tmp_dir/file_list )
+-( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext )
+-( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz )
++( cd $pkg_dir && tar $attributesargs $ogargs $tsortargs --numeric-owner --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext )
++( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz )
+ rm $tmp_dir/file_list
+ rm $tmp_dir/control_list
+
+@@ -331,7 +356,7 @@ rm -f $pkg_file
+ if [ "$outer" = "ar" ] ; then
+ ( cd $tmp_dir && ar -crfD $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext )
+ else
+- ( cd $tmp_dir && tar -c $tsortargs --mtime=@$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file )
++ ( cd $tmp_dir && tar -c $tsortargs $mtime_args $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file )
+ fi
+
+ rm $tmp_dir/debian-binary $tmp_dir/data.tar.$cext $tmp_dir/control.tar.gz
+--
+2.34.1
+
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb
index eb88b9b734..d5ce2cfbe2 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb
@@ -9,6 +9,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 \
+ file://0002-opkg-build-Add-acls-and-xattrs-support.patch \
"
SRCREV = "67994e62dc598282830385da75ba9b1abbbda941"
--
2.42.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [OE-Core][PATCH v14 10/11] opkg: add options to enable support for acl and xattr
2023-10-15 14:57 [OE-Core][PATCH v14 01/11] package.bbclass: override tar with tar-native Piotr Łobacz
` (7 preceding siblings ...)
2023-10-15 14:57 ` [OE-Core][PATCH v14 09/11] opkg-utils: add acl and xattr support Piotr Łobacz
@ 2023-10-15 14:57 ` Piotr Łobacz
2023-10-15 14:57 ` [OE-Core][PATCH v14 11/11] opkg: set locale from system environment variables Piotr Łobacz
9 siblings, 0 replies; 18+ messages in thread
From: Piotr Łobacz @ 2023-10-15 14:57 UTC (permalink / raw)
To: openembedded-core; +Cc: Piotr Łobacz
The libarchive library, which is being used by opkg, supports ACLs
and xattr already.
More informations can be read at this link:
https://github.com/libarchive/libarchive/pull/691
Signed-off-by: Piotr Łobacz <p.lobacz@welotec.com>
---
...-to-enable-support-for-acl-and-xattr.patch | 70 +++++++++++++++++++
meta/recipes-devtools/opkg/opkg_0.6.2.bb | 5 +-
2 files changed, 74 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-devtools/opkg/opkg/0002-Add-options-to-enable-support-for-acl-and-xattr.patch
diff --git a/meta/recipes-devtools/opkg/opkg/0002-Add-options-to-enable-support-for-acl-and-xattr.patch b/meta/recipes-devtools/opkg/opkg/0002-Add-options-to-enable-support-for-acl-and-xattr.patch
new file mode 100644
index 0000000000..26b2a36c42
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg/0002-Add-options-to-enable-support-for-acl-and-xattr.patch
@@ -0,0 +1,70 @@
+From 1c935e994bd572d9fff436f660ac1a060a434df0 Mon Sep 17 00:00:00 2001
+From: Maciej Liszewski <m.liszewski@welotec.com>
+Date: Tue, 4 Jul 2023 22:01:58 +0200
+Subject: [PATCH] Add options to enable support for acl and xattr
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The libarchive library, which is being used by opkg, supports ACLs
+and xattr already.
+
+More informations can be read at this link:
+https://github.com/libarchive/libarchive/pull/691
+
+Upstream-Status: Backport [ef743b75745939df210a9e6a70a44d69181ef05a]
+
+[1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=15097
+
+Signed-off-by: Maciej Liszewski <m.liszewski@welotec.com>
+Signed-off-by: Piotr Łobacz <p.lobacz@welotec.com>
+---
+ configure.ac | 12 ++++++++++++
+ libopkg/opkg_archive.c | 8 ++++++++
+ 2 files changed, 20 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 389a818..46949cd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -158,6 +158,18 @@ return OPENSSL_VERSION_NUMBER; ],
+ AC_SUBST(OPENSSL_LIBS)
+ fi
+
++# check for ACL support
++AC_ARG_WITH([acl], [AS_HELP_STRING([--with-acl], [Enable ACL support])])
++if test "x$with_acl" = "xyes"; then
++ AC_DEFINE([ENABLE_ACL], [1], [Enable ACL support])
++fi
++
++# check for xattr support
++AC_ARG_WITH([xattr], [AS_HELP_STRING([--with-xattr], [Enable xattr support])])
++if test "x$with_xattr" = "xyes"; then
++ AC_DEFINE([ENABLE_XATTR], [1], [Enable xattr support])
++fi
++
+ # check for libsolv solver
+ AC_ARG_WITH(libsolv, AC_HELP_STRING([--with-libsolv], [Use libsolv solver support.
+ ]), [], [with_libsolv="no"])
+diff --git a/libopkg/opkg_archive.c b/libopkg/opkg_archive.c
+index 03a4afb..8dd902d 100644
+--- a/libopkg/opkg_archive.c
++++ b/libopkg/opkg_archive.c
+@@ -912,6 +912,14 @@ struct opkg_ar *ar_open_pkg_data_archive(const char *filename)
+ ar->extract_flags = ARCHIVE_EXTRACT_OWNER | ARCHIVE_EXTRACT_PERM |
+ ARCHIVE_EXTRACT_TIME | ARCHIVE_EXTRACT_UNLINK | ARCHIVE_EXTRACT_NO_OVERWRITE;
+
++#ifdef ENABLE_ACL
++ ar->extract_flags |= ARCHIVE_EXTRACT_ACL;
++#endif
++
++#ifdef ENABLE_XATTR
++ ar->extract_flags |= ARCHIVE_EXTRACT_FFLAGS | ARCHIVE_EXTRACT_XATTR;
++#endif
++
+ if (opkg_config->ignore_uid)
+ ar->extract_flags &= ~ARCHIVE_EXTRACT_OWNER;
+
+--
+2.34.1
+
diff --git a/meta/recipes-devtools/opkg/opkg_0.6.2.bb b/meta/recipes-devtools/opkg/opkg_0.6.2.bb
index 46be137354..d7dc6ab715 100644
--- a/meta/recipes-devtools/opkg/opkg_0.6.2.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.6.2.bb
@@ -15,6 +15,7 @@ PE = "1"
SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
file://opkg.conf \
file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \
+ file://0002-Add-options-to-enable-support-for-acl-and-xattr.patch \
file://run-ptest \
"
@@ -30,8 +31,10 @@ inherit autotools pkgconfig ptest
target_localstatedir := "${localstatedir}"
OPKGLIBDIR ??= "${target_localstatedir}/lib"
-PACKAGECONFIG ??= "libsolv"
+PACKAGECONFIG ??= "libsolv ${@bb.utils.filter('DISTRO_FEATURES', 'acl xattr', d)}"
+PACKAGECONFIG[acl] = "--with-acl,--without-acl"
+PACKAGECONFIG[xattr] = "--with-xattr,--without-xattr"
PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,\
gnupg gpgme libgpg-error,\
${@ "gnupg" if ("native" in d.getVar("PN")) else "gnupg-gpg"}\
--
2.42.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [OE-Core][PATCH v14 11/11] opkg: set locale from system environment variables
2023-10-15 14:57 [OE-Core][PATCH v14 01/11] package.bbclass: override tar with tar-native Piotr Łobacz
` (8 preceding siblings ...)
2023-10-15 14:57 ` [OE-Core][PATCH v14 10/11] opkg: add options to enable support for acl and xattr Piotr Łobacz
@ 2023-10-15 14:57 ` Piotr Łobacz
9 siblings, 0 replies; 18+ messages in thread
From: Piotr Łobacz @ 2023-10-15 14:57 UTC (permalink / raw)
To: openembedded-core; +Cc: Piotr Łobacz
A C program inherits its locale environment variables when it starts up.
This happens automatically. However, these variables do not automatically
control the locale used by the library functions, because ISO C says that
all programs start by default in the standard ‘C’ locale.
Fixes warnings:
Warning when reading ar archive header: Pathname can't be converted from UTF-8 to current locale. (errno=84)
Signed-off-by: Piotr Łobacz <p.lobacz@welotec.com>
---
...le-from-system-environment-variables.patch | 48 +++++++++++++++++++
meta/recipes-devtools/opkg/opkg_0.6.2.bb | 1 +
2 files changed, 49 insertions(+)
create mode 100644 meta/recipes-devtools/opkg/opkg/0003-opkg-set-locale-from-system-environment-variables.patch
diff --git a/meta/recipes-devtools/opkg/opkg/0003-opkg-set-locale-from-system-environment-variables.patch b/meta/recipes-devtools/opkg/opkg/0003-opkg-set-locale-from-system-environment-variables.patch
new file mode 100644
index 0000000000..7bf191beab
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg/0003-opkg-set-locale-from-system-environment-variables.patch
@@ -0,0 +1,48 @@
+From 712895b1914bf63ee4d669863bfd106814329076 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20=C5=81obacz?= <p.lobacz@welotec.com>
+Date: Wed, 19 Jul 2023 21:26:09 +0200
+Subject: [PATCH] opkg: set locale from system environment variables
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+A C program inherits its locale environment variables when it starts up.
+This happens automatically. However, these variables do not automatically
+control the locale used by the library functions, because ISO C says that
+all programs start by default in the standard ‘C’ locale.
+
+Fixes warnings:
+Warning when reading ar archive header: Pathname can't be converted from UTF-8 to current locale. (errno=84)
+
+Upstream-Status: Backport [9e62a38a4a52974007e9ea174504c42069da1a02]
+
+[1] https://www.gnu.org/software/libc/manual/html_node/Setting-the-Locale.html
+
+Signed-off-by: Piotr Łobacz <p.lobacz@welotec.com>
+---
+ src/opkg.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/opkg.c b/src/opkg.c
+index 544c58a..0c729ff 100644
+--- a/src/opkg.c
++++ b/src/opkg.c
+@@ -27,6 +27,7 @@
+ #include <stdio.h>
+ #include <getopt.h>
+ #include <stdlib.h>
++#include <locale.h>
+
+ #include "opkg_conf.h"
+ #include "opkg_cmd.h"
+@@ -408,6 +409,7 @@ int main(int argc, char *argv[])
+ if (opkg_conf_init())
+ goto err0;
+
++ setlocale(LC_ALL, "");
+ opkg_config->verbosity = NOTICE;
+
+ opts = args_parse(argc, argv);
+--
+2.34.1
+
diff --git a/meta/recipes-devtools/opkg/opkg_0.6.2.bb b/meta/recipes-devtools/opkg/opkg_0.6.2.bb
index d7dc6ab715..3b5d51d74a 100644
--- a/meta/recipes-devtools/opkg/opkg_0.6.2.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.6.2.bb
@@ -16,6 +16,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
file://opkg.conf \
file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \
file://0002-Add-options-to-enable-support-for-acl-and-xattr.patch \
+ file://0003-opkg-set-locale-from-system-environment-variables.patch \
file://run-ptest \
"
--
2.42.0
^ permalink raw reply related [flat|nested] 18+ messages in thread