[OE-core] [PATCH 1/1] iputils: update to 20240117
Changelog:
* ping
- fix: Restore -i0 (commit: 7a51494, PR: #519, regression from 2a63b94)
* localization
- Updated Turkish and Indonesian
- 100% translated: Chinese (Simplified), Czech, French, Georgian, German,
Korean, Portuguese (Brazil), Turkish, Ukrainian
- > 90% translated: Finnish, Indonesian, Japanese
Signed-off-by: Petr Vorel
---
.../iputils/{iputils_20231222.bb => iputils_20240117.bb}| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-extended/iputils/{iputils_20231222.bb =>
iputils_20240117.bb} (97%)
diff --git a/meta/recipes-extended/iputils/iputils_20231222.bb
b/meta/recipes-extended/iputils/iputils_20240117.bb
similarity index 97%
rename from meta/recipes-extended/iputils/iputils_20231222.bb
rename to meta/recipes-extended/iputils/iputils_20240117.bb
index e919febd12..5a5e15528e 100644
--- a/meta/recipes-extended/iputils/iputils_20231222.bb
+++ b/meta/recipes-extended/iputils/iputils_20240117.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=627cc07ec86a45951d43e30658bbd819"
DEPENDS = "gnutls"
SRC_URI = "git://github.com/iputils/iputils;branch=master;protocol=https"
-SRCREV = "84cdf26908b4a03b917a5429a6339b7374fcc38b"
+SRCREV = "8372f355bdf7a9b0c79338dd8ef8464c00a5c4e2"
S = "${WORKDIR}/git"
--
2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#193952):
https://lists.openembedded.org/g/openembedded-core/message/193952
Mute This Topic: https://lists.openembedded.org/mt/103799300/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v3 1/1] iputils: update to 20221126
From: Petr Vorel
This release removed: ninfod, rarpd, rdisc.
Remove also related, not yet upstreamed patch.
Signed-off-by: Petr Vorel
---
Hi,
changes v2-v3:
* Remove ninfod related code (Alexandre Belloni):
${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod', '', d)} \
Hope now it's correct (Alexandre Belloni is going to test v2 without
this line).
Kind regards,
Petr
.../0001-rarpd-rdisc-Drop-PrivateUsers.patch | 27 ---
...putils_20211215.bb => iputils_20221126.bb} | 20 +++---
2 files changed, 3 insertions(+), 44 deletions(-)
delete mode 100644
meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
rename meta/recipes-extended/iputils/{iputils_20211215.bb =>
iputils_20221126.bb} (64%)
diff --git
a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
deleted file mode 100644
index c61e39dc80..00
---
a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From dfeeb3f1328d09f516edeb6349bd63e3c87f9397 Mon Sep 17 00:00:00 2001
-From: Alex Kiernan
-Date: Thu, 13 Feb 2020 06:08:45 +
-Subject: [PATCH] rarpd:Drop PrivateUsers
-
-rarpd cannot gain the necessary capabilities with
-PrivateUsers enabled.
-
-Upstream-Status: Pending
-Signed-off-by: Alex Kiernan
-
- systemd/rarpd.service.in | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/systemd/rarpd.service.in b/systemd/rarpd.service.in
-index e600c10..f5d7621 100644
a/systemd/rarpd.service.in
-+++ b/systemd/rarpd.service.in
-@@ -12,7 +12,6 @@ AmbientCapabilities=CAP_NET_RAW
- DynamicUser=yes
- PrivateTmp=yes
- PrivateDevices=yes
--PrivateUsers=yes
- ProtectSystem=strict
- ProtectHome=yes
- ProtectControlGroups=yes
diff --git a/meta/recipes-extended/iputils/iputils_20211215.bb
b/meta/recipes-extended/iputils/iputils_20221126.bb
similarity index 64%
rename from meta/recipes-extended/iputils/iputils_20211215.bb
rename to meta/recipes-extended/iputils/iputils_20221126.bb
index 3ddce0be54..ad9c275e0c 100644
--- a/meta/recipes-extended/iputils/iputils_20211215.bb
+++ b/meta/recipes-extended/iputils/iputils_20221126.bb
@@ -11,9 +11,8 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=bb64c89bb0e23b72930d2380894c47a1"
DEPENDS = "gnutls"
SRC_URI = "git://github.com/iputils/iputils;branch=master;protocol=https \
- file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \
"
-SRCREV = "1d1e7c43210d8af316a41cb2c53d612a4c16f34d"
+SRCREV = "5ffabc4190cab975c7332645259e286a032e183b"
S = "${WORKDIR}/git"
@@ -23,14 +22,11 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P20\d+)"
# breaks the version order.
CVE_CHECK_IGNORE += "CVE-2000-1213 CVE-2000-1214"
-PACKAGECONFIG ??= "libcap rarpd \
- ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod',
'', d)} \
+PACKAGECONFIG ??= "libcap \
${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false
-DNO_SETCAP_OR_SUID=true, libcap libcap-native"
PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2"
PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext"
-PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false,"
-PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false,"
PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_system_unitdir},,systemd"
PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true
-DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt"
@@ -43,9 +39,7 @@ ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE:${PN}-ping = "ping"
ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping"
-SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff
${PN}-rdisc \
- ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '',
d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod',
'', d)}"
+SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff"
PACKAGES += "${SPLITPKGS}"
ALLOW_EMPTY:${PN} = "1"
@@ -56,11 +50,3 @@ FILES:${PN}-ping = "${base_bindir}/ping.${BPN}"
FILES:${PN}-arping = "${base_bindir}/arping"
FILES:${PN}-tracepath = "${base_bindir}/tracepath"
FILES:${PN}-clockdiff = "${base_bindir}/clockdiff"
-FILES:${PN}-rarpd = "${base_sbindir}/rarpd
${systemd_system_unitdir}/rarpd@.service"
-FILES:${PN}-rdisc = "${base_sbindir}/rdisc"
-FILES:${PN}-ninfod = "
Re: [OE-core] [PATCH v2 1/1] iputils: update to 20221126
On Sun, 27 Nov 2022 at 23:13, Alexandre Belloni
wrote:
>
> On 27/11/2022 22:55:31+0100, Petr Vorel wrote:
> > On Sun, 27 Nov 2022 at 19:42, Alexandre Belloni
> > wrote:
> > >
> > > Hello,
> > >
> > > You should at least build test your patches
> >
> > OK, I'll do. What always discourages me is that unlike Buildroot
> > build, openembedded takes so long.
> >
> > What I usually do:
> > cd ..; git clone git://git.openembedded.org/bitbake.git; cd -
> > . oe-init-build-env
> > bitbake iputils
> >
> > If there is anything I can speedup a build (e.g. using some of host
> > utils to build really just the target) please let me know.
>
> Not really, you'd have to keep your sstate-cache but my guess is that
> your builds are infrequent enough that everything will rebuild anyway.
Yes.
>
> This made me try to understand why you didn't test your patches and I
> didn't realize you are maintaining iputils. Thanks for the help!
Yes, I'm just iputils and ltp maintainer, thus understand the upstream code,
but not much of openembedded (I don't even use it).
>
> >
> > >
> > > On 27/11/2022 16:17:08+0100, Petr Vorel wrote:
> > > > -PACKAGECONFIG ??= "libcap rarpd \
> > > > - ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6',
> > > > 'ninfod', '', d)} \
> > > > +PACKAGECONFIG ??= "libcap \
> > > > + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '',
> > > > d)} \
> > >
> > > This probably doesn't work either
> > Not sure what's wrong on this, but maybe build shows that out.
>
> The whole bb.utils.contains call can be removed because it doesn't do
> anything once you remove the 'ninfod' argument.
>
> I'll send the patch to our CI with the line removed
Thank you! I'll send v3 without this line (so that it can be applied
if your testing is ok):
${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod', '', d)} \
Kind regards,
Petr
>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#173888):
https://lists.openembedded.org/g/openembedded-core/message/173888
Mute This Topic: https://lists.openembedded.org/mt/95290165/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v2 1/1] iputils: update to 20221126
On Sun, 27 Nov 2022 at 19:42, Alexandre Belloni
wrote:
>
> Hello,
>
> You should at least build test your patches
OK, I'll do. What always discourages me is that unlike Buildroot
build, openembedded takes so long.
What I usually do:
cd ..; git clone git://git.openembedded.org/bitbake.git; cd -
. oe-init-build-env
bitbake iputils
If there is anything I can speedup a build (e.g. using some of host
utils to build really just the target) please let me know.
>
> On 27/11/2022 16:17:08+0100, Petr Vorel wrote:
> > -PACKAGECONFIG ??= "libcap rarpd \
> > - ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6',
> > 'ninfod', '', d)} \
> > +PACKAGECONFIG ??= "libcap \
> > + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', d)}
> > \
>
> This probably doesn't work either
Not sure what's wrong on this, but maybe build shows that out.
Kind regards,
Petr
>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#173886):
https://lists.openembedded.org/g/openembedded-core/message/173886
Mute This Topic: https://lists.openembedded.org/mt/95290165/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2 1/1] iputils: update to 20221126
From: Petr Vorel
This release removed: ninfod, rarpd, rdisc.
Remove also related, not yet upstreamed patch.
Signed-off-by: Petr Vorel
---
Changes v1->v2:
* fixes missing " in SPLITPKGS (Alexandre Belloni)
Kind regards,
Petr
.../0001-rarpd-rdisc-Drop-PrivateUsers.patch | 27 ---
...putils_20211215.bb => iputils_20221126.bb} | 21 +++
2 files changed, 4 insertions(+), 44 deletions(-)
delete mode 100644
meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
rename meta/recipes-extended/iputils/{iputils_20211215.bb =>
iputils_20221126.bb} (66%)
diff --git
a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
deleted file mode 100644
index c61e39dc80..00
---
a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From dfeeb3f1328d09f516edeb6349bd63e3c87f9397 Mon Sep 17 00:00:00 2001
-From: Alex Kiernan
-Date: Thu, 13 Feb 2020 06:08:45 +
-Subject: [PATCH] rarpd:Drop PrivateUsers
-
-rarpd cannot gain the necessary capabilities with
-PrivateUsers enabled.
-
-Upstream-Status: Pending
-Signed-off-by: Alex Kiernan
-
- systemd/rarpd.service.in | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/systemd/rarpd.service.in b/systemd/rarpd.service.in
-index e600c10..f5d7621 100644
a/systemd/rarpd.service.in
-+++ b/systemd/rarpd.service.in
-@@ -12,7 +12,6 @@ AmbientCapabilities=CAP_NET_RAW
- DynamicUser=yes
- PrivateTmp=yes
- PrivateDevices=yes
--PrivateUsers=yes
- ProtectSystem=strict
- ProtectHome=yes
- ProtectControlGroups=yes
diff --git a/meta/recipes-extended/iputils/iputils_20211215.bb
b/meta/recipes-extended/iputils/iputils_20221126.bb
similarity index 66%
rename from meta/recipes-extended/iputils/iputils_20211215.bb
rename to meta/recipes-extended/iputils/iputils_20221126.bb
index 3ddce0be54..baff1452b8 100644
--- a/meta/recipes-extended/iputils/iputils_20211215.bb
+++ b/meta/recipes-extended/iputils/iputils_20221126.bb
@@ -11,9 +11,8 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=bb64c89bb0e23b72930d2380894c47a1"
DEPENDS = "gnutls"
SRC_URI = "git://github.com/iputils/iputils;branch=master;protocol=https \
- file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \
"
-SRCREV = "1d1e7c43210d8af316a41cb2c53d612a4c16f34d"
+SRCREV = "5ffabc4190cab975c7332645259e286a032e183b"
S = "${WORKDIR}/git"
@@ -23,14 +22,12 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P20\d+)"
# breaks the version order.
CVE_CHECK_IGNORE += "CVE-2000-1213 CVE-2000-1214"
-PACKAGECONFIG ??= "libcap rarpd \
- ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod',
'', d)} \
+PACKAGECONFIG ??= "libcap \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', d)} \
${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false
-DNO_SETCAP_OR_SUID=true, libcap libcap-native"
PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2"
PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext"
-PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false,"
-PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false,"
PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_system_unitdir},,systemd"
PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true
-DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt"
@@ -43,9 +40,7 @@ ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE:${PN}-ping = "ping"
ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping"
-SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff
${PN}-rdisc \
- ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '',
d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod',
'', d)}"
+SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff"
PACKAGES += "${SPLITPKGS}"
ALLOW_EMPTY:${PN} = "1"
@@ -56,11 +51,3 @@ FILES:${PN}-ping = "${base_bindir}/ping.${BPN}"
FILES:${PN}-arping = "${base_bindir}/arping"
FILES:${PN}-tracepath = "${base_bindir}/tracepath"
FILES:${PN}-clockdiff = "${base_bindir}/clockdiff"
-FILES:${PN}-rarpd = "${base_sbindir}/rarpd
${systemd_system_unitdir}/rarpd@.service"
-FILES:${PN}-rdisc = "${base_sbindir}/rdisc"
-FILES:${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh"
-
-SYSTEMD_PACKAGES = &
Re: [OE-core] [PATCH 1/1] iputils: update to 20221126
Hi Alexandre,
...
> > -SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff
> > ${PN}-rdisc \
> > - ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd',
> > '', d)} \
> > - ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6',
> > '${PN}-ninfod', '', d)}"
> > +SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff \
>
> This line can't ever parse.
Thank you! The problem is in previous line which should be:
SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff"
I'll send v2.
Kind regards,
Petr
>
> > PACKAGES += "${SPLITPKGS}"
...
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#173878):
https://lists.openembedded.org/g/openembedded-core/message/173878
Mute This Topic: https://lists.openembedded.org/mt/95265570/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/1] iputils: update to 20221126
From: Petr Vorel
This release removed: ninfod, rarpd, rdisc.
Remove also related, not yet upstreamed patch.
Signed-off-by: Petr Vorel
---
Hi all,
I'm sorry, I haven't managed to test patch.
Can anybody do it for me?
Thank you.
Kind regards,
Petr
.../0001-rarpd-rdisc-Drop-PrivateUsers.patch | 27 ---
...putils_20211215.bb => iputils_20221126.bb} | 21 +++
2 files changed, 4 insertions(+), 44 deletions(-)
delete mode 100644
meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
rename meta/recipes-extended/iputils/{iputils_20211215.bb =>
iputils_20221126.bb} (66%)
diff --git
a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
deleted file mode 100644
index c61e39dc80..00
---
a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From dfeeb3f1328d09f516edeb6349bd63e3c87f9397 Mon Sep 17 00:00:00 2001
-From: Alex Kiernan
-Date: Thu, 13 Feb 2020 06:08:45 +
-Subject: [PATCH] rarpd:Drop PrivateUsers
-
-rarpd cannot gain the necessary capabilities with
-PrivateUsers enabled.
-
-Upstream-Status: Pending
-Signed-off-by: Alex Kiernan
-
- systemd/rarpd.service.in | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/systemd/rarpd.service.in b/systemd/rarpd.service.in
-index e600c10..f5d7621 100644
a/systemd/rarpd.service.in
-+++ b/systemd/rarpd.service.in
-@@ -12,7 +12,6 @@ AmbientCapabilities=CAP_NET_RAW
- DynamicUser=yes
- PrivateTmp=yes
- PrivateDevices=yes
--PrivateUsers=yes
- ProtectSystem=strict
- ProtectHome=yes
- ProtectControlGroups=yes
diff --git a/meta/recipes-extended/iputils/iputils_20211215.bb
b/meta/recipes-extended/iputils/iputils_20221126.bb
similarity index 66%
rename from meta/recipes-extended/iputils/iputils_20211215.bb
rename to meta/recipes-extended/iputils/iputils_20221126.bb
index 3ddce0be54..b4ab2fce5e 100644
--- a/meta/recipes-extended/iputils/iputils_20211215.bb
+++ b/meta/recipes-extended/iputils/iputils_20221126.bb
@@ -11,9 +11,8 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=bb64c89bb0e23b72930d2380894c47a1"
DEPENDS = "gnutls"
SRC_URI = "git://github.com/iputils/iputils;branch=master;protocol=https \
- file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \
"
-SRCREV = "1d1e7c43210d8af316a41cb2c53d612a4c16f34d"
+SRCREV = "5ffabc4190cab975c7332645259e286a032e183b"
S = "${WORKDIR}/git"
@@ -23,14 +22,12 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P20\d+)"
# breaks the version order.
CVE_CHECK_IGNORE += "CVE-2000-1213 CVE-2000-1214"
-PACKAGECONFIG ??= "libcap rarpd \
- ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod',
'', d)} \
+PACKAGECONFIG ??= "libcap \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', d)} \
${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false
-DNO_SETCAP_OR_SUID=true, libcap libcap-native"
PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2"
PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext"
-PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false,"
-PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false,"
PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_system_unitdir},,systemd"
PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true
-DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt"
@@ -43,9 +40,7 @@ ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE:${PN}-ping = "ping"
ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping"
-SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff
${PN}-rdisc \
- ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '',
d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod',
'', d)}"
+SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff \
PACKAGES += "${SPLITPKGS}"
ALLOW_EMPTY:${PN} = "1"
@@ -56,11 +51,3 @@ FILES:${PN}-ping = "${base_bindir}/ping.${BPN}"
FILES:${PN}-arping = "${base_bindir}/arping"
FILES:${PN}-tracepath = "${base_bindir}/tracepath"
FILES:${PN}-clockdiff = "${base_bindir}/clockdiff"
-FILES:${PN}-rarpd = "${base_sbindir}/rarpd
${systemd_system_unitdir}/rarpd@.service"
-FILES:${PN}-rdisc = "${base_sbindir}/rdisc"
-FILES:${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh"
Re: [OE-core] [PATCH 1/1] ltp: Update to 20220930
On Mon, 3 Oct 2022 at 23:33, Khem Raj wrote:
>
> On Mon, Oct 3, 2022 at 11:49 AM Petr Vorel wrote:
> >
> > Hi Alexandre,
> >
> > ...
> > > > Hi,
> > > >
> > > > could you please test this patchset?
> > >
> > > This causes the following warning:
> > >
> > > ltp-20220930-r0 do_package_qa: QA Issue: File
> > > /opt/ltp/testcases/open_posix_testsuite/config.log in package ltp
> > > contains reference to TMPDIR
> >
> > Thanks for a testing. I wonder why this is problem to use TMPDIR.
> > Also, there already has been many TMPDIR references before:
> >
> > $ git grep -l TMPDIR 20220527 | wc -l
> > 139
> >
> > $ git grep -l TMPDIR 20220930 | wc -l
> > 141
> >
> > And the same number of them in open posix:
> >
> > $ git grep -l TMPDIR 20220527 testcases/open_posix_testsuite/ | wc -l
> > 1
> >
> > $ git grep -l TMPDIR 20220930 testcases/open_posix_testsuite/ | wc -l
> > 1
>
> I think the problem is that these references are inside the config.log
> file which is getting installed.
> I wonder if this log file should be installed as part of testsuite on
> target or not. If this file
> /opt/ltp/testcases/open_posix_testsuite/config.log is
> not needed for running the testsuite then perhaps its better to just
> delete it from ${D} in do_install
> and that will fix it.
Thanks for a hint. It's not needed. BTW I don't have enough time to
test the environment,
feel free to take what I prepared and post v2 with your proposed fix and with:
Co-developed-by: Petr Vorel
Kind regards,
Petr
>
> >
> > Kind regards,
> > Petr
> >
> > >
> > > https://autobuilder.yoctoproject.org/typhoon/#/builders/65/builds/5988/steps/12/logs/warnings
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171368):
https://lists.openembedded.org/g/openembedded-core/message/171368
Mute This Topic: https://lists.openembedded.org/mt/94056329/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/1] ltp: Update to 20220930
Hi Alexandre, ... > > Hi, > > > > could you please test this patchset? > > This causes the following warning: > > ltp-20220930-r0 do_package_qa: QA Issue: File > /opt/ltp/testcases/open_posix_testsuite/config.log in package ltp contains > reference to TMPDIR Thanks for a testing. I wonder why this is problem to use TMPDIR. Also, there already has been many TMPDIR references before: $ git grep -l TMPDIR 20220527 | wc -l 139 $ git grep -l TMPDIR 20220930 | wc -l 141 And the same number of them in open posix: $ git grep -l TMPDIR 20220527 testcases/open_posix_testsuite/ | wc -l 1 $ git grep -l TMPDIR 20220930 testcases/open_posix_testsuite/ | wc -l 1 Kind regards, Petr > > https://autobuilder.yoctoproject.org/typhoon/#/builders/65/builds/5988/steps/12/logs/warnings -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#171365): https://lists.openembedded.org/g/openembedded-core/message/171365 Mute This Topic: https://lists.openembedded.org/mt/94056329/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/1] ltp: Update to 20220930
From: Petr Vorel
Remove all patches accepted upstream.
Signed-off-by: Petr Vorel
---
Hi,
could you please test this patchset?
Kind regards,
Petr
...-access-mode-in-KVM-test-ELF-headers.patch | 40 -
...olve-conflict-in-different-header-fi.patch | 71
...-lapi-pidfd-adding-pidfd-header-file.patch | 60 ---
...-Fix-usage-of-PAGESIZE-from-memcg_li.patch | 121 --
...ait-for-umount-completed-in-thread_b.patch | 63 ---
...x-usage-of-variables-from-tst_net.sh.patch | 154 --
...0001-netstress-Restore-runtime-to-5m.patch | 53 --
...fs05_make_tree-Restore-5-min-timeout.patch | 31
...nt-instead-of-pthread_t-for-thread-I.patch | 36
...igrate_pages03-restore-runtime-to-5m.patch | 44 -
...-kvm-use-LD-instead-of-hardcoding-ld.patch | 39 -
...ile-variable-for-building-KVM-payloa.patch | 63 ---
.../ltp/{ltp_20220527.bb => ltp_20220930.bb} | 16 +-
13 files changed, 2 insertions(+), 789 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-kvm-Fix-stack-access-mode-in-KVM-test-ELF-headers.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-lapi-fsmount-resolve-conflict-in-different-header-fi.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-lapi-pidfd-adding-pidfd-header-file.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-mountns0-1-3-wait-for-umount-completed-in-thread_b.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-net_stress-Fix-usage-of-variables-from-tst_net.sh.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-netstress-Restore-runtime-to-5m.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-nfs05_make_tree-Restore-5-min-timeout.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-rt-migrate-Use-int-instead-of-pthread_t-for-thread-I.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-syscalls-migrate_pages03-restore-runtime-to-5m.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0002-kvm-use-LD-instead-of-hardcoding-ld.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0003-Add-KVM_LD-Makefile-variable-for-building-KVM-payloa.patch
rename meta/recipes-extended/ltp/{ltp_20220527.bb => ltp_20220930.bb} (86%)
diff --git
a/meta/recipes-extended/ltp/ltp/0001-kvm-Fix-stack-access-mode-in-KVM-test-ELF-headers.patch
b/meta/recipes-extended/ltp/ltp/0001-kvm-Fix-stack-access-mode-in-KVM-test-ELF-headers.patch
deleted file mode 100644
index 764e9c0d9f..00
---
a/meta/recipes-extended/ltp/ltp/0001-kvm-Fix-stack-access-mode-in-KVM-test-ELF-headers.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 608fc7bcda43e60536ae1f19842f7affba8f0aea Mon Sep 17 00:00:00 2001
-From: Martin Doucha
-Date: Wed, 1 Jun 2022 16:16:34 +0200
-Subject: [PATCH] kvm: Fix stack access mode in KVM test ELF headers
-
-When the linker converts guest payload binary into a linkable resource
-object file, it somehow defaults to requesting executable stack section
-for the final test binary. This trips some build-time security checks
-on newer systems. Add explicit linker option to make the stack
-non-executable.
-
-Suggested-by: Fabian Vogt
-Signed-off-by: Martin Doucha
-Reviewed-by: Petr Vorel
-Reviewed-by: Cyril Hrubis
-
-Signed-off-by: Martin Jansa
-Upstream-Status: Backport
[https://github.com/linux-test-project/ltp/commit/f9715d7c2e78713e26533c6e0846aaabf5c4095b]
- testcases/kernel/kvm/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/testcases/kernel/kvm/Makefile b/testcases/kernel/kvm/Makefile
-index 69a9946fe..adab56952 100644
a/testcases/kernel/kvm/Makefile
-+++ b/testcases/kernel/kvm/Makefile
-@@ -50,11 +50,11 @@ include $(top_srcdir)/include/mk/generic_leaf_target.mk
- ifdef VERBOSE
- $(CC) $(GUEST_CPPFLAGS) $(GUEST_CFLAGS) $(GUEST_LDFLAGS) -o
$*-payload.elf $^ $(GUEST_LDLIBS)
- objcopy -O binary -j .init.boot -j .text -j .data -j .init -j
.preinit_array -j .init_array --gap-fill=0 $*-payload.elf $*-payload.bin
-- ld -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@
$*-payload.bin
-+ ld -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds
--oformat=$(BIN_FORMAT) -o $@ $*-payload.bin
- else
- @$(CC) $(GUEST_CPPFLAGS) $(GUEST_CFLAGS) $(GUEST_LDFLAGS) -o
$*-payload.elf $^ $(GUEST_LDLIBS)
- @objcopy -O binary -j .init.boot -j .text -j .data -j .init -j
.preinit_array -j .init_array --gap-fill=0 $*-payload.elf $*-payload.bin
-- @ld -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o
$@ $*-payload.bin
-+ @ld -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds
--oformat=$(BIN_FORMAT) -o $@ $*-payload.bin
- @echo KVM_CC $(target_rel_dir)$@
- endif
- @rm $*-payload.elf $*-payload.bin
diff --git
a/meta/recipes-extended/ltp/ltp/0001-lapi-fsmount-resolve-confl
[OE-core] [PATCH 1/1] ltp: Update list of tests not buildable on musl
From: Petr Vorel
These tests are working on musl, thus not deleted:
* getcontext01.c
fixed for musl during conversion to the new API in 20220527
(commit 0f519d0da)
* ebizzy-0.3
fixed in 20200930 (commit 967612c45)
Signed-off-by: Petr Vorel
---
meta/recipes-extended/ltp/ltp_20220527.bb | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/meta/recipes-extended/ltp/ltp_20220527.bb
b/meta/recipes-extended/ltp/ltp_20220527.bb
index 00ff906ded..b657a6adb1 100644
--- a/meta/recipes-extended/ltp/ltp_20220527.bb
+++ b/meta/recipes-extended/ltp/ltp_20220527.bb
@@ -150,13 +150,11 @@ remove_broken_musl_sources() {
# sync with upstream
# https://github.com/linux-test-project/ltp/blob/master/ci/alpine.sh#L33
rm -rfv \
- testcases/kernel/syscalls/confstr/confstr01.c \
testcases/kernel/syscalls/fmtmsg/fmtmsg01.c \
testcases/kernel/syscalls/getcontext/getcontext01.c \
testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c \
testcases/kernel/syscalls/timer_create/timer_create01.c \
- testcases/kernel/syscalls/timer_create/timer_create03.c \
- utils/benchmark/ebizzy-0.3
+ testcases/kernel/syscalls/timer_create/timer_create03.c
}
do_patch[postfuncs] += "remove_broken_musl_sources"
--
2.37.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#170261):
https://lists.openembedded.org/g/openembedded-core/message/170261
Mute This Topic: https://lists.openembedded.org/mt/93430044/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v2 1/1] ltp: Add post release runtime fixes
Hi Richard, Khem, > > > +[ upstream status: bda92ad659a52d38ac810099f69adff626b064c6 ] > > Thanks for these. I did merge them, I just wanted to note that in > future the format for upstream status is: > > Upstream-Status: Backport [bda92ad659a52d38ac810099f69adff626b064c6] > > We have code that uses these so the format is standardised. I fixed the > ones in this series up manually. > Thanks a lot! I'll take care next time. Kind regards, Petr > > Cheers, > > Richard > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#169271): https://lists.openembedded.org/g/openembedded-core/message/169271 Mute This Topic: https://lists.openembedded.org/mt/92574361/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/1] ltp: Add post release runtime fixes
Hi Khem, all, > > 6 files changed, 466 insertions(+) > > create mode 100644 > meta/recipes-extended/ltp/ltp/0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch > > create mode 100644 > meta/recipes-extended/ltp/ltp/0001-mountns0-1-3-wait-for-umount-completed-in-thread_b.patch > > create mode 100644 > meta/recipes-extended/ltp/ltp/0001-net_stress-Fix-usage-of-variables-from-tst_net.sh.patch > > create mode 100644 > meta/recipes-extended/ltp/ltp/0001-netstress-Restore-runtime-to-5m.patch > > create mode 100644 > meta/recipes-extended/ltp/ltp/0001-nfs05_make_tree-Restore-5-min-timeout.patch > > create mode 100644 > meta/recipes-extended/ltp/ltp/0001-syscalls-migrate_pages03-restore-runtime-to-5m.patch > > These patches don't seem to be added to SRC_URI as I don't see the > recipe changes in this patch. > Thanks (forget to amend) => I've sent v2. > we use a commit in SRCREV, I wonder if it makes sense to just bump that > Although I used to advocate against backporting many runtime fixes, now I slightly prefer to use releases than random git snapshot unless number of patches is reasonable. But sure, if others want we can use latest master (usually the best LTP). Kind regards, Petr -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#168445): https://lists.openembedded.org/g/openembedded-core/message/168445 Mute This Topic: https://lists.openembedded.org/mt/92566589/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2 1/1] ltp: Add post release runtime fixes
From: Petr Vorel
Backport various post 20220527 release runtime fixes:
* The concept of max runtime
* tst_test.sh: Cleanup getopts usage
* mountns0[1-3]: wait for umount completed in thread_b
Signed-off-by: Petr Vorel
---
Changes v1->v2:
* add patches to SRC_URI (Khem Raj)
...-Fix-usage-of-PAGESIZE-from-memcg_li.patch | 121 ++
...ait-for-umount-completed-in-thread_b.patch | 63 +++
...x-usage-of-variables-from-tst_net.sh.patch | 154 ++
...0001-netstress-Restore-runtime-to-5m.patch | 53 ++
...fs05_make_tree-Restore-5-min-timeout.patch | 31
...igrate_pages03-restore-runtime-to-5m.patch | 44 +
meta/recipes-extended/ltp/ltp_20220527.bb | 6 +
7 files changed, 472 insertions(+)
create mode 100644
meta/recipes-extended/ltp/ltp/0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0001-mountns0-1-3-wait-for-umount-completed-in-thread_b.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0001-net_stress-Fix-usage-of-variables-from-tst_net.sh.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0001-netstress-Restore-runtime-to-5m.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0001-nfs05_make_tree-Restore-5-min-timeout.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0001-syscalls-migrate_pages03-restore-runtime-to-5m.patch
diff --git
a/meta/recipes-extended/ltp/ltp/0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch
b/meta/recipes-extended/ltp/ltp/0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch
new file mode 100644
index 00..6cc36cda79
--- /dev/null
+++
b/meta/recipes-extended/ltp/ltp/0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch
@@ -0,0 +1,121 @@
+From bda92ad659a52d38ac810099f69adff626b064c6 Mon Sep 17 00:00:00 2001
+From: Joerg Vehlow
+Date: Mon, 27 Jun 2022 10:44:49 +0200
+Subject: [PATCH] memcg/functional: Fix usage of PAGESIZE from memcg_lib.sh
+
+$PAGESIZES is set in memcg_lib.sh, which was moved to the bottom of the file.
+
+Fixes: 04021637f ("tst_test.sh: Cleanup getopts usage")
+
+Reviewed-by: Petr Vorel
+Signed-off-by: Joerg Vehlow
+[ upstream status: bda92ad659a52d38ac810099f69adff626b064c6 ]
+---
+ .../controllers/memcg/functional/memcg_failcnt.sh | 7 ---
+ .../memcg/functional/memcg_max_usage_in_bytes_test.sh | 10 +-
+ .../memcg/functional/memcg_subgroup_charge.sh | 8
+ .../memcg/functional/memcg_usage_in_bytes_test.sh | 10 +-
+ 4 files changed, 18 insertions(+), 17 deletions(-)
+
+diff --git a/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh
b/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh
+index 1fed01569..1be98a056 100755
+--- a/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh
b/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh
+@@ -12,9 +12,6 @@ MEMCG_TESTFUNC=test
+ MEMCG_SHMMAX=1
+ TST_TEST_DATA="--mmap-anon --mmap-file --shm"
+
+-MEMORY_LIMIT=$PAGESIZE
+-MEMORY_TO_ALLOCATE=$((MEMORY_LIMIT * 2))
+-
+ test()
+ {
+ ROD echo $MEMORY_LIMIT \> memory.limit_in_bytes
+@@ -36,4 +33,8 @@ test()
+ }
+
+ . memcg_lib.sh
++
++MEMORY_LIMIT=$PAGESIZE
++MEMORY_TO_ALLOCATE=$((MEMORY_LIMIT * 2))
++
+ tst_run
+diff --git
a/testcases/kernel/controllers/memcg/functional/memcg_max_usage_in_bytes_test.sh
b/testcases/kernel/controllers/memcg/functional/memcg_max_usage_in_bytes_test.sh
+index d1ffbe053..302810513 100755
+---
a/testcases/kernel/controllers/memcg/functional/memcg_max_usage_in_bytes_test.sh
b/testcases/kernel/controllers/memcg/functional/memcg_max_usage_in_bytes_test.sh
+@@ -9,11 +9,6 @@
+ MEMCG_TESTFUNC=test
+ TST_CNT=4
+
+-
+-MEM_TO_ALLOC=$((PAGESIZE * 1024))
+-MEM_EXPECTED_UPPER=$((MEM_TO_ALLOC + MEM_USAGE_RANGE))
+-MEM_LIMIT=$((MEM_TO_ALLOC * 2))
+-
+ # Run test cases which checks memory.[memsw.]max_usage_in_bytes after make
+ # some memory allocation
+ test_max_usage_in_bytes()
+@@ -88,4 +83,9 @@ test4()
+ }
+
+ . memcg_lib.sh
++
++MEM_TO_ALLOC=$((PAGESIZE * 1024))
++MEM_EXPECTED_UPPER=$((MEM_TO_ALLOC + MEM_USAGE_RANGE))
++MEM_LIMIT=$((MEM_TO_ALLOC * 2))
++
+ tst_run
+diff --git
a/testcases/kernel/controllers/memcg/functional/memcg_subgroup_charge.sh
b/testcases/kernel/controllers/memcg/functional/memcg_subgroup_charge.sh
+index 08b6697d4..9bcc01258 100755
+--- a/testcases/kernel/controllers/memcg/functional/memcg_subgroup_charge.sh
b/testcases/kernel/controllers/memcg/functional/memcg_subgroup_charge.sh
+@@ -12,10 +12,6 @@
+ MEMCG_TESTFUNC=test
+ TST_CNT=3
+
+-
+-# Allocate memory bigger than per-cpu kernel memory
+-MEM_TO_ALLOC=$((PAGESIZES * 2))
+-
+ # Test the memory charge won't move to subgroup
+ # $1 - memory.limit_in_bytes in sub group
+ test_subgroup()
+@@ -67,4 +63,8 @@ test3()
+ }
+
+ . memcg_lib.sh
++
++# Allocate memory bigger than per-cpu kernel memory
++MEM_TO_ALLOC=$((PAGESIZES * 2))
++
+ tst_run
[OE-core] [PATCH 1/1] ltp: Add post release runtime fixes
From: Petr Vorel
Backport various post 20220527 release runtime fixes:
* The concept of max runtime
* tst_test.sh: Cleanup getopts usage
* mountns0[1-3]: wait for umount completed in thread_b
Signed-off-by: Petr Vorel
---
Hi Richard, Daniel,
could you please test this patchset?
Kind regards,
Petr
...-Fix-usage-of-PAGESIZE-from-memcg_li.patch | 121 ++
...ait-for-umount-completed-in-thread_b.patch | 63 +++
...x-usage-of-variables-from-tst_net.sh.patch | 154 ++
...0001-netstress-Restore-runtime-to-5m.patch | 53 ++
...fs05_make_tree-Restore-5-min-timeout.patch | 31
...igrate_pages03-restore-runtime-to-5m.patch | 44 +
6 files changed, 466 insertions(+)
create mode 100644
meta/recipes-extended/ltp/ltp/0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0001-mountns0-1-3-wait-for-umount-completed-in-thread_b.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0001-net_stress-Fix-usage-of-variables-from-tst_net.sh.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0001-netstress-Restore-runtime-to-5m.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0001-nfs05_make_tree-Restore-5-min-timeout.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0001-syscalls-migrate_pages03-restore-runtime-to-5m.patch
diff --git
a/meta/recipes-extended/ltp/ltp/0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch
b/meta/recipes-extended/ltp/ltp/0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch
new file mode 100644
index 00..6cc36cda79
--- /dev/null
+++
b/meta/recipes-extended/ltp/ltp/0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch
@@ -0,0 +1,121 @@
+From bda92ad659a52d38ac810099f69adff626b064c6 Mon Sep 17 00:00:00 2001
+From: Joerg Vehlow
+Date: Mon, 27 Jun 2022 10:44:49 +0200
+Subject: [PATCH] memcg/functional: Fix usage of PAGESIZE from memcg_lib.sh
+
+$PAGESIZES is set in memcg_lib.sh, which was moved to the bottom of the file.
+
+Fixes: 04021637f ("tst_test.sh: Cleanup getopts usage")
+
+Reviewed-by: Petr Vorel
+Signed-off-by: Joerg Vehlow
+[ upstream status: bda92ad659a52d38ac810099f69adff626b064c6 ]
+---
+ .../controllers/memcg/functional/memcg_failcnt.sh | 7 ---
+ .../memcg/functional/memcg_max_usage_in_bytes_test.sh | 10 +-
+ .../memcg/functional/memcg_subgroup_charge.sh | 8
+ .../memcg/functional/memcg_usage_in_bytes_test.sh | 10 +-
+ 4 files changed, 18 insertions(+), 17 deletions(-)
+
+diff --git a/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh
b/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh
+index 1fed01569..1be98a056 100755
+--- a/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh
b/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh
+@@ -12,9 +12,6 @@ MEMCG_TESTFUNC=test
+ MEMCG_SHMMAX=1
+ TST_TEST_DATA="--mmap-anon --mmap-file --shm"
+
+-MEMORY_LIMIT=$PAGESIZE
+-MEMORY_TO_ALLOCATE=$((MEMORY_LIMIT * 2))
+-
+ test()
+ {
+ ROD echo $MEMORY_LIMIT \> memory.limit_in_bytes
+@@ -36,4 +33,8 @@ test()
+ }
+
+ . memcg_lib.sh
++
++MEMORY_LIMIT=$PAGESIZE
++MEMORY_TO_ALLOCATE=$((MEMORY_LIMIT * 2))
++
+ tst_run
+diff --git
a/testcases/kernel/controllers/memcg/functional/memcg_max_usage_in_bytes_test.sh
b/testcases/kernel/controllers/memcg/functional/memcg_max_usage_in_bytes_test.sh
+index d1ffbe053..302810513 100755
+---
a/testcases/kernel/controllers/memcg/functional/memcg_max_usage_in_bytes_test.sh
b/testcases/kernel/controllers/memcg/functional/memcg_max_usage_in_bytes_test.sh
+@@ -9,11 +9,6 @@
+ MEMCG_TESTFUNC=test
+ TST_CNT=4
+
+-
+-MEM_TO_ALLOC=$((PAGESIZE * 1024))
+-MEM_EXPECTED_UPPER=$((MEM_TO_ALLOC + MEM_USAGE_RANGE))
+-MEM_LIMIT=$((MEM_TO_ALLOC * 2))
+-
+ # Run test cases which checks memory.[memsw.]max_usage_in_bytes after make
+ # some memory allocation
+ test_max_usage_in_bytes()
+@@ -88,4 +83,9 @@ test4()
+ }
+
+ . memcg_lib.sh
++
++MEM_TO_ALLOC=$((PAGESIZE * 1024))
++MEM_EXPECTED_UPPER=$((MEM_TO_ALLOC + MEM_USAGE_RANGE))
++MEM_LIMIT=$((MEM_TO_ALLOC * 2))
++
+ tst_run
+diff --git
a/testcases/kernel/controllers/memcg/functional/memcg_subgroup_charge.sh
b/testcases/kernel/controllers/memcg/functional/memcg_subgroup_charge.sh
+index 08b6697d4..9bcc01258 100755
+--- a/testcases/kernel/controllers/memcg/functional/memcg_subgroup_charge.sh
b/testcases/kernel/controllers/memcg/functional/memcg_subgroup_charge.sh
+@@ -12,10 +12,6 @@
+ MEMCG_TESTFUNC=test
+ TST_CNT=3
+
+-
+-# Allocate memory bigger than per-cpu kernel memory
+-MEM_TO_ALLOC=$((PAGESIZES * 2))
+-
+ # Test the memory charge won't move to subgroup
+ # $1 - memory.limit_in_bytes in sub group
+ test_subgroup()
+@@ -67,4 +63,8 @@ test3()
+ }
+
+ . memcg_lib.sh
++
++# Allocate memory bigger than per-cpu kernel memory
++MEM_TO_ALLOC=$((PAGESIZES * 2))
++
+ tst_run
+diff --git
a/testcases/kernel/
Re: [OE-core] [PATCH 14/17] ltp: update 20210927 -> 20220121
> On Thu, 27 Jan 2022 at 18:21, Petr Vorel wrote: > > Hi Alexander, > > > The ltp compliancy parser is rewritten to actually > > > match the logs: they seem to be unstructured, test case names > > > are not printed and the only indication of failure is appearance of > > > FAIL[ED] somewhere. > > I'd split meta/lib/oeqa/utils/logparser.py change into separate commit. > > It's not related at all to the update. > Without this, the update would break the ltp_compliancy ptest, as it would > cause the parser to fail. OK. If it can work with the previous version I'd commit it separately. But maybe it's correct this way, I understand LTP, not openembedded. Anyway, thanks for the update. Kind regards, Petr > Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#161055): https://lists.openembedded.org/g/openembedded-core/message/161055 Mute This Topic: https://lists.openembedded.org/mt/88718368/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 14/17] ltp: update 20210927 -> 20220121
Hi Alexander,
> The ltp compliancy parser is rewritten to actually
> match the logs: they seem to be unstructured, test case names
> are not printed and the only indication of failure is appearance of
> FAIL[ED] somewhere.
I'd split meta/lib/oeqa/utils/logparser.py change into separate commit.
It's not related at all to the update.
Reviewed-by: Petr Vorel
to the update part only.
> +do_compile() {
> +oe_runmake HOSTCC="${CC_FOR_BUILD}" HOST_CFLAGS="${CFLAGS_FOR_BUILD}"
> HOST_LDFLAGS="${LDFLAGS_FOR_BUILD}"
> +}
This would take me some time to figure out (actually that's why I was postponing
to do the update myself). Thanks!
Kind regards,
Petr
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161042):
https://lists.openembedded.org/g/openembedded-core/message/161042
Mute This Topic: https://lists.openembedded.org/mt/88718368/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v3 1/1] ltp: Update to 20210927
New patches to fix functionality:
* 0002-lib-fix-MemAvailable-parsing.patch
* 0003-lapi-rtnetlink.h-Fix-include-guards.patch
* 0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch
* 0005-lapi-if_addr.h-Define-IFA_FLAGS.patch
Removed patch from this release
* 0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch
Rebased patch
* 0001-Remove-OOM-tests-from-runtest-mm.patch
* Updated copying (reduced files in 5eff445d4 ("Reduce LICENCE/COPYING files"))
* Updated removed musl incompatible files in
remove_broken_musl_sources() (process.c was removed in 926d3b906
("sched: Remove process.c")), also update link to CI file.
Signed-off-by: Petr Vorel
---
Warning: untested, please test it.
Changes v2->v3:
* Correct commit message title to reflect commit message, which is going
to be merged, see report in:
https://lore.kernel.org/ltp/YViVpZZG4VvSd7Nc@pevik/T/#m58a27e2c294d546031a2703535234071fe21131a
I hope to merge upstream patches next week.
Changes v1->v2:
* Update licence files in LIC_FILES_CHKSUM (reported by Daniel Díaz)
...001-Remove-OOM-tests-from-runtest-mm.patch | 12 ++--
...s05.c-ioctl_ns06.c-Fix-too-small-buf.patch | 59 --
.../0002-lib-fix-MemAvailable-parsing.patch | 36 +++
...-lapi-rtnetlink.h-Fix-include-guards.patch | 37
...f_addr.h-and-reuse-it-in-rtnetlink.h.patch | 58 ++
...0005-lapi-if_addr.h-Define-IFA_FLAGS.patch | 60 +++
.../ltp/{ltp_20210524.bb => ltp_20210927.bb} | 17 +++---
7 files changed, 206 insertions(+), 73 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0002-lib-fix-MemAvailable-parsing.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0003-lapi-rtnetlink.h-Fix-include-guards.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch
rename meta/recipes-extended/ltp/{ltp_20210524.bb => ltp_20210927.bb} (86%)
diff --git
a/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
b/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
index e51950f153..6d945700be 100644
--- a/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
+++ b/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
@@ -1,4 +1,4 @@
-From 93772c511d954d755cc9128c58ed8968a5af541b Mon Sep 17 00:00:00 2001
+From e87c2ad1e16cdbd62ba71b2ace3270503decaa56 Mon Sep 17 00:00:00 2001
From: "Mingde (Matthew) Zeng"
Date: Wed, 29 Jul 2020 08:47:09 -0400
Subject: [PATCH] Remove OOM tests from runtest/mm
@@ -7,16 +7,17 @@ Disable OOM tests, as they might cause oeqa ssh connection
lost
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Mingde (Matthew) Zeng
-
+[ pvorel: rebased for 20210927 ]
+Signed-off-by: Petr Vorel
---
runtest/mm | 6 --
1 file changed, 6 deletions(-)
diff --git a/runtest/mm b/runtest/mm
-index 481d39691..cf207d10e 100644
+index 6537666a9..e5a091a5a 100644
--- a/runtest/mm
+++ b/runtest/mm
-@@ -74,12 +74,6 @@ ksm06_2 ksm06 -n 1
+@@ -73,12 +73,6 @@ ksm06_2 ksm06 -n 8000
cpuset01 cpuset01
@@ -29,3 +30,6 @@ index 481d39691..cf207d10e 100644
swapping01 swapping01 -i 5
thp01 thp01 -I 120
+--
+2.33.0
+
diff --git
a/meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch
b/meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch
deleted file mode 100644
index 08b88a38f3..00
---
a/meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From af2b6f5ee6b171078b18246dd73f71cf6e350859 Mon Sep 17 00:00:00 2001
-From: Marius Hillenbrand
-Date: Mon, 19 Jul 2021 13:58:35 +0800
-Subject: [PATCH] syscalls/ioctl_ns05.c, ioctl_ns06.c: Fix too small buffer for
- path
-
-commit af2b6f5ee6b171078b18246dd73f71cf6e350859 upstream.
-
-Resize the buffer used for paths into /proc/ to grant enough space
-for long PIDs. While at it, replace sprintf with snprintf to avoid
-buffer overflows if we ever ran out of space again.
-
-Fixes: #847
-Signed-off-by: Marius Hillenbrand
-Reviewed-by: Yang Xu
-Upstream-Status: Backport
-Signed-off-by: Paul Gortmaker
-
-diff --git a/testcases/kernel/syscalls/ioctl/ioctl_ns05.c
b/testcases/kernel/syscalls/ioctl/ioctl_ns05.c
-index a67ddbe2c66f..52613810c7ce 100644
a/testcases/kernel/syscalls/ioctl/ioctl_ns05.c
-+++ b/testcases/kernel/syscalls/ioctl/ioctl_ns05.c
-@@ -59,10 +59,10 @@ static void run(void)
- if (pid == -1)
- tst_brk(TBROK | TERRNO, "ltp_clone failed");
-
-- char child_namespace[20];
-+ char child_namespace[30];
-
[OE-core] [PATCH v2 1/1] ltp: Update to 20210927
New patches to fix functionality:
* 0002-lib-fix-MemAvailable-parsing.patch
* 0003-lapi-rtnetlink.h-Fix-include-guards.patch
* 0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch
* 0005-lapi-if_addr.h-Define-IFA_FLAGS.patch
Removed patch from this release
* 0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch
Rebased patch
* 0001-Remove-OOM-tests-from-runtest-mm.patch
* Updated copying (reduced files in 5eff445d4 ("Reduce LICENCE/COPYING files"))
* Updated removed musl incompatible files in
remove_broken_musl_sources() (process.c was removed in 926d3b906
("sched: Remove process.c")), also update link to CI file.
Signed-off-by: Petr Vorel
---
Warning: untested, please test it.
Changes v1->v2:
* Update licence files in LIC_FILES_CHKSUM (reported by Daniel Díaz)
Kind regards,
Petr
...001-Remove-OOM-tests-from-runtest-mm.patch | 12 ++--
...s05.c-ioctl_ns06.c-Fix-too-small-buf.patch | 59 --
.../0002-lib-fix-MemAvailable-parsing.patch | 36 +++
...-lapi-rtnetlink.h-Fix-include-guards.patch | 37
...f_addr.h-and-reuse-it-in-rtnetlink.h.patch | 58 ++
...0005-lapi-if_addr.h-Define-IFA_FLAGS.patch | 60 +++
.../ltp/{ltp_20210524.bb => ltp_20210927.bb} | 17 +++---
7 files changed, 206 insertions(+), 73 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0002-lib-fix-MemAvailable-parsing.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0003-lapi-rtnetlink.h-Fix-include-guards.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch
rename meta/recipes-extended/ltp/{ltp_20210524.bb => ltp_20210927.bb} (86%)
diff --git
a/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
b/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
index e51950f153..6d945700be 100644
--- a/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
+++ b/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
@@ -1,4 +1,4 @@
-From 93772c511d954d755cc9128c58ed8968a5af541b Mon Sep 17 00:00:00 2001
+From e87c2ad1e16cdbd62ba71b2ace3270503decaa56 Mon Sep 17 00:00:00 2001
From: "Mingde (Matthew) Zeng"
Date: Wed, 29 Jul 2020 08:47:09 -0400
Subject: [PATCH] Remove OOM tests from runtest/mm
@@ -7,16 +7,17 @@ Disable OOM tests, as they might cause oeqa ssh connection
lost
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Mingde (Matthew) Zeng
-
+[ pvorel: rebased for 20210927 ]
+Signed-off-by: Petr Vorel
---
runtest/mm | 6 --
1 file changed, 6 deletions(-)
diff --git a/runtest/mm b/runtest/mm
-index 481d39691..cf207d10e 100644
+index 6537666a9..e5a091a5a 100644
--- a/runtest/mm
+++ b/runtest/mm
-@@ -74,12 +74,6 @@ ksm06_2 ksm06 -n 1
+@@ -73,12 +73,6 @@ ksm06_2 ksm06 -n 8000
cpuset01 cpuset01
@@ -29,3 +30,6 @@ index 481d39691..cf207d10e 100644
swapping01 swapping01 -i 5
thp01 thp01 -I 120
+--
+2.33.0
+
diff --git
a/meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch
b/meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch
deleted file mode 100644
index 08b88a38f3..00
---
a/meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From af2b6f5ee6b171078b18246dd73f71cf6e350859 Mon Sep 17 00:00:00 2001
-From: Marius Hillenbrand
-Date: Mon, 19 Jul 2021 13:58:35 +0800
-Subject: [PATCH] syscalls/ioctl_ns05.c, ioctl_ns06.c: Fix too small buffer for
- path
-
-commit af2b6f5ee6b171078b18246dd73f71cf6e350859 upstream.
-
-Resize the buffer used for paths into /proc/ to grant enough space
-for long PIDs. While at it, replace sprintf with snprintf to avoid
-buffer overflows if we ever ran out of space again.
-
-Fixes: #847
-Signed-off-by: Marius Hillenbrand
-Reviewed-by: Yang Xu
-Upstream-Status: Backport
-Signed-off-by: Paul Gortmaker
-
-diff --git a/testcases/kernel/syscalls/ioctl/ioctl_ns05.c
b/testcases/kernel/syscalls/ioctl/ioctl_ns05.c
-index a67ddbe2c66f..52613810c7ce 100644
a/testcases/kernel/syscalls/ioctl/ioctl_ns05.c
-+++ b/testcases/kernel/syscalls/ioctl/ioctl_ns05.c
-@@ -59,10 +59,10 @@ static void run(void)
- if (pid == -1)
- tst_brk(TBROK | TERRNO, "ltp_clone failed");
-
-- char child_namespace[20];
-+ char child_namespace[30];
- int my_fd, child_fd, parent_fd;
-
-- sprintf(child_namespace, "/proc/%i/ns/pid", pid);
-+ snprintf(child_namespace, sizeof(child_namespace), "/proc/%i/ns/pid",
pid);
- my_fd = SAFE_OPEN("/proc/self/
Re: [OE-core] [PATCH 1/1] ltp: Update to 20210927
Hi Daniel, > Hello! > Many thanks for this prompt recipe! yw, thanks for helping to test! > On Thu, 30 Sept 2021 at 14:09, Petr Vorel wrote: > > New patches to fix functionality: > > * 0002-lib-fix-MemAvailable-parsing.patch > > * 0003-lapi-rtnetlink.h-Fix-include-guards.patch > > * 0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch > > * 0005-lapi-if_addr.h-Define-IFA_FLAGS.patch > > Removed patch from this release > > * 0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch > > Rebased patch > > * 0001-Remove-OOM-tests-from-runtest-mm.patch > > Signed-off-by: Petr Vorel > [...] > > diff --git a/meta/recipes-extended/ltp/ltp_20210524.bb > > b/meta/recipes-extended/ltp/ltp_20210927.bb > > similarity index 93% > > rename from meta/recipes-extended/ltp/ltp_20210524.bb > > rename to meta/recipes-extended/ltp/ltp_20210927.bb > This needs to be updated in the recipe: > LIC_FILES_CHKSUM = "\ > file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ > > file://testcases/open_posix_testsuite/COPYING;md5=48b1c5ec633e3e30ec2cf884ae699947 > \ > > file://testcases/network/can/filter-tests/COPYING;md5=5b155ea7d7f86eae8e8832955d8b70bc > \ > " Ah, I reduced copying files, thanks for a reminder! Sending v2 in a minute. > FWIW, we've build-tested it (against Sumo :(, changing the override > separator), but have yet to execute the actual tests. Thanks! Kind regards, Petr > Greetings! > Daniel Díaz > daniel.d...@linaro.org -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#156536): https://lists.openembedded.org/g/openembedded-core/message/156536 Mute This Topic: https://lists.openembedded.org/mt/85982038/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/1] ltp: Update to 20210927
New patches to fix functionality:
* 0002-lib-fix-MemAvailable-parsing.patch
* 0003-lapi-rtnetlink.h-Fix-include-guards.patch
* 0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch
* 0005-lapi-if_addr.h-Define-IFA_FLAGS.patch
Removed patch from this release
* 0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch
Rebased patch
* 0001-Remove-OOM-tests-from-runtest-mm.patch
Signed-off-by: Petr Vorel
---
Hi,
@Anders, @Naresh: could you please test it?
Kind regards,
Petr
...001-Remove-OOM-tests-from-runtest-mm.patch | 12 ++--
...s05.c-ioctl_ns06.c-Fix-too-small-buf.patch | 59 --
.../0002-lib-fix-MemAvailable-parsing.patch | 36 +++
...-lapi-rtnetlink.h-Fix-include-guards.patch | 37
...f_addr.h-and-reuse-it-in-rtnetlink.h.patch | 58 ++
...0005-lapi-if_addr.h-Define-IFA_FLAGS.patch | 60 +++
.../ltp/{ltp_20210524.bb => ltp_20210927.bb} | 10 ++--
7 files changed, 205 insertions(+), 67 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0002-lib-fix-MemAvailable-parsing.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0003-lapi-rtnetlink.h-Fix-include-guards.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0004-lapi-Create-if_addr.h-and-reuse-it-in-rtnetlink.h.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0005-lapi-if_addr.h-Define-IFA_FLAGS.patch
rename meta/recipes-extended/ltp/{ltp_20210524.bb => ltp_20210927.bb} (93%)
diff --git
a/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
b/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
index e51950f153..6d945700be 100644
--- a/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
+++ b/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
@@ -1,4 +1,4 @@
-From 93772c511d954d755cc9128c58ed8968a5af541b Mon Sep 17 00:00:00 2001
+From e87c2ad1e16cdbd62ba71b2ace3270503decaa56 Mon Sep 17 00:00:00 2001
From: "Mingde (Matthew) Zeng"
Date: Wed, 29 Jul 2020 08:47:09 -0400
Subject: [PATCH] Remove OOM tests from runtest/mm
@@ -7,16 +7,17 @@ Disable OOM tests, as they might cause oeqa ssh connection
lost
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Mingde (Matthew) Zeng
-
+[ pvorel: rebased for 20210927 ]
+Signed-off-by: Petr Vorel
---
runtest/mm | 6 --
1 file changed, 6 deletions(-)
diff --git a/runtest/mm b/runtest/mm
-index 481d39691..cf207d10e 100644
+index 6537666a9..e5a091a5a 100644
--- a/runtest/mm
+++ b/runtest/mm
-@@ -74,12 +74,6 @@ ksm06_2 ksm06 -n 1
+@@ -73,12 +73,6 @@ ksm06_2 ksm06 -n 8000
cpuset01 cpuset01
@@ -29,3 +30,6 @@ index 481d39691..cf207d10e 100644
swapping01 swapping01 -i 5
thp01 thp01 -I 120
+--
+2.33.0
+
diff --git
a/meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch
b/meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch
deleted file mode 100644
index 08b88a38f3..00
---
a/meta/recipes-extended/ltp/ltp/0001-syscalls-ioctl_ns05.c-ioctl_ns06.c-Fix-too-small-buf.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From af2b6f5ee6b171078b18246dd73f71cf6e350859 Mon Sep 17 00:00:00 2001
-From: Marius Hillenbrand
-Date: Mon, 19 Jul 2021 13:58:35 +0800
-Subject: [PATCH] syscalls/ioctl_ns05.c, ioctl_ns06.c: Fix too small buffer for
- path
-
-commit af2b6f5ee6b171078b18246dd73f71cf6e350859 upstream.
-
-Resize the buffer used for paths into /proc/ to grant enough space
-for long PIDs. While at it, replace sprintf with snprintf to avoid
-buffer overflows if we ever ran out of space again.
-
-Fixes: #847
-Signed-off-by: Marius Hillenbrand
-Reviewed-by: Yang Xu
-Upstream-Status: Backport
-Signed-off-by: Paul Gortmaker
-
-diff --git a/testcases/kernel/syscalls/ioctl/ioctl_ns05.c
b/testcases/kernel/syscalls/ioctl/ioctl_ns05.c
-index a67ddbe2c66f..52613810c7ce 100644
a/testcases/kernel/syscalls/ioctl/ioctl_ns05.c
-+++ b/testcases/kernel/syscalls/ioctl/ioctl_ns05.c
-@@ -59,10 +59,10 @@ static void run(void)
- if (pid == -1)
- tst_brk(TBROK | TERRNO, "ltp_clone failed");
-
-- char child_namespace[20];
-+ char child_namespace[30];
- int my_fd, child_fd, parent_fd;
-
-- sprintf(child_namespace, "/proc/%i/ns/pid", pid);
-+ snprintf(child_namespace, sizeof(child_namespace), "/proc/%i/ns/pid",
pid);
- my_fd = SAFE_OPEN("/proc/self/ns/pid", O_RDONLY);
- child_fd = SAFE_OPEN(child_namespace, O_RDONLY);
- parent_fd = ioctl(child_fd, NS_GET_PARENT);
-diff --git a/testcases/kernel/syscalls/ioctl/ioctl_ns06.c
b/testcases/kernel/syscalls/ioctl/ioctl_ns06.c
-index b6ac80208d02..c30f7de91e09 100644
a/testcases/kernel/syscalls/ioctl/ioctl_ns06.c
-+++ b/testca
[OE-core] [PATCH v3 1/1] ltp: Update to 20210524
Remove patches accepted in this upstream release
* determinism.patch (45530792a, 01fefa08c)
* libswapon.patch (2b64c727f)
* 0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch
(f38172209)
* 0002-Makefile-Avoid-wildcard-determinism-issues.patch (edf60cf6a)
* 0003-syscalls-swapon-swapoff-Move-common-library-to-libs.patch
(ac140ed58)
Removed (test rewritten to new API)
* 0007-Fix-test_proc_kill-hanging.patch
Signed-off-by: Petr Vorel
---
changes v2->v3:
* Remove PR and HASHEQUIV_HASH_VERSION (reported by Daniel Díaz)
Kind regards,
Petr
...uite-generate-makefiles.sh-Avoid-inc.patch | 40 --
...le-Avoid-wildcard-determinism-issues.patch | 310 ---
...-swapoff-Move-common-library-to-libs.patch | 133 ---
.../ltp/0007-Fix-test_proc_kill-hanging.patch | 32 --
.../ltp/ltp/determinism.patch | 43 --
meta/recipes-extended/ltp/ltp/libswapon.patch | 368 --
.../ltp/{ltp_20210121.bb => ltp_20210524.bb} | 11 +-
7 files changed, 1 insertion(+), 936 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0002-Makefile-Avoid-wildcard-determinism-issues.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0003-syscalls-swapon-swapoff-Move-common-library-to-libs.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0007-Fix-test_proc_kill-hanging.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/determinism.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/libswapon.patch
rename meta/recipes-extended/ltp/{ltp_20210121.bb => ltp_20210524.bb} (92%)
diff --git
a/meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch
b/meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch
deleted file mode 100644
index c2a70dcb67..00
---
a/meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2d1d6350af1db28ec520e26d0069a0518950b0a1 Mon Sep 17 00:00:00 2001
-From: Richard Purdie
-Date: Tue, 9 Mar 2021 15:21:11 +
-Subject: [PATCH 1/3] open_posix_testsuite/generate-makefiles.sh: Avoid
- inconsistencies with make version
-
-With make 4.1, INSTALL_TARGETS+= will add a space to the variable whereas
-with make 4.3, it will not. This leads to differing run.sh files in installed
-in packages which is undesireable. If tests is empty we don't have to add
-the line to the makefiles at all which seems like the easiest way to
-avoid the differences in make behaviour.
-
-Signed-off-by: Richard Purdie
-Upstream-Status: Submitted
[http://lists.linux.it/pipermail/ltp/2021-March/021386.html]
-
- .../open_posix_testsuite/scripts/generate-makefiles.sh | 6 +-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
-index 200a631db..4b3aaa4a0 100755
a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
-+++ b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
-@@ -148,8 +148,12 @@ EOF
-
- fi
-
-- cat >> "$makefile.2" <> "$makefile.2" <> "$makefile.2" <
-Date: Tue, 9 Mar 2021 15:21:36 +
-Subject: [PATCH 2/3] Makefile: Avoid wildcard determinism issues
-
-wildcard used in Makefiles preserves the order of the files on disk
-which leads to differences in the order the binaries are linked.
-
-This patch tweaks the usage of wildcard to also have a sort, making
-the binaries reproducible. A previous patch massively improved
-the situation but wider testing showed that these other changes can
-have an effect on some binaries, this patch avoids those issues as
-exposed by our wider testing.
-
-Signed-off-by: Richard Purdie
-Upstream-Status: Submitted
[http://lists.linux.it/pipermail/ltp/2021-March/021388.html]
-
- include/mk/env_post.mk | 2 +-
- include/mk/module.mk | 2 +-
- runtest/Makefile | 2 +-
- scenario_groups/Makefile | 2 +-
- testcases/commands/ldd/datafiles/Makefile | 2 +-
- testcases/kernel/hotplug/memory_hotplug/Makefile | 3 ++-
- testcases/kernel/io/disktest/Makefile | 2 +-
- testcases/kernel/io/disktest/Makefile.linux| 4 ++--
- testcases/kernel/sched/hyperthreading/ht_affinity/Makefile | 2 +-
- testcases/kernel/sched/hyperthreading/ht_enabled/Makefile | 2 +-
- testcases/kernel/sched/sched_stress/Makefile | 2 +-
- testcases/kernel/syscalls/lchown/Makefile | 2 +-
- testcases/kernel/syscalls/migrate_pages/Makefile | 2 +-
- testcases/kernel/syscalls/move_pages/Makefile
Re: [OE-core] [PATCH v2 1/1] ltp: Update to 20210524
Hi Daniel, > Hello! > On Mon, 24 May 2021 at 13:30, Petr Vorel wrote: > [...] > > diff --git a/meta/recipes-extended/ltp/ltp_20210121.bb > > b/meta/recipes-extended/ltp/ltp_20210524.bb > > similarity index 94% > > rename from meta/recipes-extended/ltp/ltp_20210121.bb > > rename to meta/recipes-extended/ltp/ltp_20210524.bb > > index e1ffd0ddf4..bf6e564482 100644 > > --- a/meta/recipes-extended/ltp/ltp_20210121.bb > > +++ b/meta/recipes-extended/ltp/ltp_20210524.bb > > @@ -27,19 +27,14 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer" > > CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" > > CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" > > -SRCREV = "4d005621edd109d119627eb9210b224a63bf22cb" > > +SRCREV = "0fb171f2beddaf64bd27597577c206c0f892b3cd" > > # remove at next version upgrade or when output changes > > PR = "r4" > > HASHEQUIV_HASH_VERSION .= ".4" > Shall we reset/remove this? Thanks, yes it should have been removed. I'll try to send v3 tonight. Kind regards, Petr > Greetings! > Daniel Díaz > daniel.d...@linaro.org -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#152236): https://lists.openembedded.org/g/openembedded-core/message/152236 Mute This Topic: https://lists.openembedded.org/mt/83058726/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2 1/1] ltp: Update to 20210524
Remove patches accepted in this upstream release
* determinism.patch (45530792a, 01fefa08c)
* libswapon.patch (2b64c727f)
* 0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch
(f38172209)
* 0002-Makefile-Avoid-wildcard-determinism-issues.patch (edf60cf6a)
* 0003-syscalls-swapon-swapoff-Move-common-library-to-libs.patch
(ac140ed58)
Removed (test rewritten to new API)
* 0007-Fix-test_proc_kill-hanging.patch
Signed-off-by: Petr Vorel
---
Changes v1->v2:
* update patches list in ltp_20210524.bb
(forget to remove removed patches)
Sorry for invalid previous patch.
Kind regards,
Petr
...uite-generate-makefiles.sh-Avoid-inc.patch | 40 --
...le-Avoid-wildcard-determinism-issues.patch | 310 ---
...-swapoff-Move-common-library-to-libs.patch | 133 ---
.../ltp/0007-Fix-test_proc_kill-hanging.patch | 32 --
.../ltp/ltp/determinism.patch | 43 --
meta/recipes-extended/ltp/ltp/libswapon.patch | 368 --
.../ltp/{ltp_20210121.bb => ltp_20210524.bb} | 7 +-
7 files changed, 1 insertion(+), 932 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0002-Makefile-Avoid-wildcard-determinism-issues.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0003-syscalls-swapon-swapoff-Move-common-library-to-libs.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0007-Fix-test_proc_kill-hanging.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/determinism.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/libswapon.patch
rename meta/recipes-extended/ltp/{ltp_20210121.bb => ltp_20210524.bb} (94%)
diff --git
a/meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch
b/meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch
deleted file mode 100644
index c2a70dcb67..00
---
a/meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2d1d6350af1db28ec520e26d0069a0518950b0a1 Mon Sep 17 00:00:00 2001
-From: Richard Purdie
-Date: Tue, 9 Mar 2021 15:21:11 +
-Subject: [PATCH 1/3] open_posix_testsuite/generate-makefiles.sh: Avoid
- inconsistencies with make version
-
-With make 4.1, INSTALL_TARGETS+= will add a space to the variable whereas
-with make 4.3, it will not. This leads to differing run.sh files in installed
-in packages which is undesireable. If tests is empty we don't have to add
-the line to the makefiles at all which seems like the easiest way to
-avoid the differences in make behaviour.
-
-Signed-off-by: Richard Purdie
-Upstream-Status: Submitted
[http://lists.linux.it/pipermail/ltp/2021-March/021386.html]
-
- .../open_posix_testsuite/scripts/generate-makefiles.sh | 6 +-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
-index 200a631db..4b3aaa4a0 100755
a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
-+++ b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
-@@ -148,8 +148,12 @@ EOF
-
- fi
-
-- cat >> "$makefile.2" <> "$makefile.2" <> "$makefile.2" <
-Date: Tue, 9 Mar 2021 15:21:36 +
-Subject: [PATCH 2/3] Makefile: Avoid wildcard determinism issues
-
-wildcard used in Makefiles preserves the order of the files on disk
-which leads to differences in the order the binaries are linked.
-
-This patch tweaks the usage of wildcard to also have a sort, making
-the binaries reproducible. A previous patch massively improved
-the situation but wider testing showed that these other changes can
-have an effect on some binaries, this patch avoids those issues as
-exposed by our wider testing.
-
-Signed-off-by: Richard Purdie
-Upstream-Status: Submitted
[http://lists.linux.it/pipermail/ltp/2021-March/021388.html]
-
- include/mk/env_post.mk | 2 +-
- include/mk/module.mk | 2 +-
- runtest/Makefile | 2 +-
- scenario_groups/Makefile | 2 +-
- testcases/commands/ldd/datafiles/Makefile | 2 +-
- testcases/kernel/hotplug/memory_hotplug/Makefile | 3 ++-
- testcases/kernel/io/disktest/Makefile | 2 +-
- testcases/kernel/io/disktest/Makefile.linux| 4 ++--
- testcases/kernel/sched/hyperthreading/ht_affinity/Makefile | 2 +-
- testcases/kernel/sched/hyperthreading/ht_enabled/Makefile | 2 +-
- testcases/kernel/sched/sched_stress/Makefile | 2 +-
- testcases/kernel/syscalls/lchown/Makefile | 2 +-
- testcases/kernel/syscalls/migrate_pages/Makefile | 2 +-
[OE-core] [PATCH 1/1] ltp: Update to 20210524
Remove patches accepted in this upstream release
* determinism.patch (45530792a, 01fefa08c)
* libswapon.patch (2b64c727f)
* 0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch
(f38172209)
* 0002-Makefile-Avoid-wildcard-determinism-issues.patch (edf60cf6a)
* 0003-syscalls-swapon-swapoff-Move-common-library-to-libs.patch
(ac140ed58)
Removed (test rewritten to new API)
* 0007-Fix-test_proc_kill-hanging.patch
Signed-off-by: Petr Vorel
---
...uite-generate-makefiles.sh-Avoid-inc.patch | 40 --
...le-Avoid-wildcard-determinism-issues.patch | 310 ---
...-swapoff-Move-common-library-to-libs.patch | 133 ---
.../ltp/0007-Fix-test_proc_kill-hanging.patch | 32 --
.../ltp/ltp/determinism.patch | 43 --
meta/recipes-extended/ltp/ltp/libswapon.patch | 368 --
.../ltp/{ltp_20210121.bb => ltp_20210524.bb} | 2 +-
7 files changed, 1 insertion(+), 927 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0002-Makefile-Avoid-wildcard-determinism-issues.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0003-syscalls-swapon-swapoff-Move-common-library-to-libs.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0007-Fix-test_proc_kill-hanging.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/determinism.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/libswapon.patch
rename meta/recipes-extended/ltp/{ltp_20210121.bb => ltp_20210524.bb} (99%)
diff --git
a/meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch
b/meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch
deleted file mode 100644
index c2a70dcb67..00
---
a/meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2d1d6350af1db28ec520e26d0069a0518950b0a1 Mon Sep 17 00:00:00 2001
-From: Richard Purdie
-Date: Tue, 9 Mar 2021 15:21:11 +
-Subject: [PATCH 1/3] open_posix_testsuite/generate-makefiles.sh: Avoid
- inconsistencies with make version
-
-With make 4.1, INSTALL_TARGETS+= will add a space to the variable whereas
-with make 4.3, it will not. This leads to differing run.sh files in installed
-in packages which is undesireable. If tests is empty we don't have to add
-the line to the makefiles at all which seems like the easiest way to
-avoid the differences in make behaviour.
-
-Signed-off-by: Richard Purdie
-Upstream-Status: Submitted
[http://lists.linux.it/pipermail/ltp/2021-March/021386.html]
-
- .../open_posix_testsuite/scripts/generate-makefiles.sh | 6 +-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
-index 200a631db..4b3aaa4a0 100755
a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
-+++ b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh
-@@ -148,8 +148,12 @@ EOF
-
- fi
-
-- cat >> "$makefile.2" <> "$makefile.2" <> "$makefile.2" <
-Date: Tue, 9 Mar 2021 15:21:36 +
-Subject: [PATCH 2/3] Makefile: Avoid wildcard determinism issues
-
-wildcard used in Makefiles preserves the order of the files on disk
-which leads to differences in the order the binaries are linked.
-
-This patch tweaks the usage of wildcard to also have a sort, making
-the binaries reproducible. A previous patch massively improved
-the situation but wider testing showed that these other changes can
-have an effect on some binaries, this patch avoids those issues as
-exposed by our wider testing.
-
-Signed-off-by: Richard Purdie
-Upstream-Status: Submitted
[http://lists.linux.it/pipermail/ltp/2021-March/021388.html]
-
- include/mk/env_post.mk | 2 +-
- include/mk/module.mk | 2 +-
- runtest/Makefile | 2 +-
- scenario_groups/Makefile | 2 +-
- testcases/commands/ldd/datafiles/Makefile | 2 +-
- testcases/kernel/hotplug/memory_hotplug/Makefile | 3 ++-
- testcases/kernel/io/disktest/Makefile | 2 +-
- testcases/kernel/io/disktest/Makefile.linux| 4 ++--
- testcases/kernel/sched/hyperthreading/ht_affinity/Makefile | 2 +-
- testcases/kernel/sched/hyperthreading/ht_enabled/Makefile | 2 +-
- testcases/kernel/sched/sched_stress/Makefile | 2 +-
- testcases/kernel/syscalls/lchown/Makefile | 2 +-
- testcases/kernel/syscalls/migrate_pages/Makefile | 2 +-
- testcases/kernel/syscalls/move_pages/Makefile | 2 +-
- testcases/kernel/syscalls/utils/compat_16.mk | 2 +-
- testcases/kerne
[OE-core] [PATCH 1/1] ltp: Replace musl patches with do_patch[postfuncs]
MUSL related build fixes are not going to be upstreamed. They just not
compile broken files, thus replace them with upstream solution for CI:
just deleting files for musl (easier to maintain).
Signed-off-by: Petr Vorel
---
.../ltp/0001-Add-more-musl-exclusions.patch | 32
...option-to-select-libc-implementation.patch | 81 ---
meta/recipes-extended/ltp/ltp_20210121.bb | 24 +-
3 files changed, 21 insertions(+), 116 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch
diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
deleted file mode 100644
index f2fc8ee958..00
--- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ad8e73306cb8293f7d32841e1599fd9048801f1f Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin
-Date: Fri, 20 Dec 2019 13:06:05 +0100
-Subject: [PATCH] Add more musl exclusions
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin
-[ pvorel: rebase for 20200515: enable accept4_01 ]
-[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ]
-Signed-off-by: Petr Vorel
- testcases/kernel/syscalls/timer_create/Makefile | 4
- 1 file changed, 4 insertions(+)
-
-diff --git a/testcases/kernel/syscalls/timer_create/Makefile
b/testcases/kernel/syscalls/timer_create/Makefile
-index ada241fe1..d454b01e7 100644
a/testcases/kernel/syscalls/timer_create/Makefile
-+++ b/testcases/kernel/syscalls/timer_create/Makefile
-@@ -5,6 +5,10 @@ top_srcdir?= ../../../..
-
- include $(top_srcdir)/include/mk/testcases.mk
-
-+ifeq ($(LIBC),musl)
-+FILTER_OUT_MAKE_TARGETS:= timer_create01 timer_create03
-+endif
-+
- CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include
-
- LDLIBS+= -lpthread -lrt
---
-2.26.2
-
diff --git
a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch
b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch
deleted file mode 100644
index 29b2bf7e41..00
---
a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 74958c3e341de713b596c8cfd35b2391d6c7bc09 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Thu, 7 Jan 2016 18:19:03 +
-Subject: [PATCH] build: Add option to select libc implementation
-
-There are more than glibc for C library implementation available on
-linux now a days, uclibc cloaked like glibc but musl e.g. is very
-different and does not implement all GNU extensions.
-
-Disable tests specifically not building _yet_ on musl based systems
-
-Upstream-Status: Pending (pvorel: this is not going to be fixed, instead
-each test needs to be fixed)
-
-rt_tgsigqueueinfo fails with:
-rt_tgsigqueueinfo01.c: In function 'sigusr1_handler':
-rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has
no member named '_sifields'; did you mean '__si_fields'?
- 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr;
- | ^
- | __si_fields
-
-Signed-off-by: Khem Raj
-[ pvorel: rebase for 20200515: enable pty, ioctl ]
-[ pvorel: rebase for 20200120: enable mallopt, profil, rpc016,
-rt_sigsuspend, sbrk_mutex, setdomainname, sethostname, sigsuspend,
-testpi-3, testpi-5, testpi-6, ustat; move rt_tgsigqueueinfo
-from 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch ]
-Signed-off-by: Petr Vorel
- Makefile | 5 +
- testcases/kernel/sched/Makefile| 4 +++-
- testcases/kernel/syscalls/Makefile | 4
- 3 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 768ca4606..e9d679a71 100644
a/Makefile
-+++ b/Makefile
-@@ -41,6 +41,11 @@ vpath %.mk
$(top_srcdir)/mk:$(top_srcdir)/mk/include
- UCLINUX ?= 0
- export UCLINUX
-
-+# System C library implementation (glibc,uclibc,musl etc.)
-+# default to glibc if not set
-+LIBC ?= glibc
-+export LIBC
-+
- # CLEAN_TARGETS: Targets which exist solely in clean.
- # COMMON_TARGETS: Targets which exist in all, clean, and install.
- # INSTALL_TARGETS:Targets which exist in clean and install (contains
-diff --git a/testcases/kernel/sched/Makefile b/testcases/kernel/sched/Makefile
-index 6a57d79ee..74bb93370 100644
a/testcases/kernel/sched/Makefile
-+++ b/testcases/kernel/sched/Makefile
-@@ -23,5 +23,7 @@
- top_srcdir?= ../../..
-
- include $(top_srcdir)/include/mk/env_pre.mk
--
-+ifeq ($(LIBC),musl)
-+ FILTER_OUT_DIRS += process_stress
-+endif
- include $(top_srcdir)/include/mk/generic_tr
Re: [OE-core] LTP drop MUSL specific patch
Hi Andre,
...
> > One more question: how to make this function MUSL specific?
> > I noticed some functions has suffix "_libc-musl" (e.g.
> > do_install_append_libc-musl), but I guess this would not work for
> > do_patch[postfuncs], where I specify the name.
> You can either use an intermediate variable in the recipe, e.g.
> PRUNESOURCE = ""
> PRUNESOURCE_libc-musl = "the-real-function"
> do_patch[postfuncs] += "${PRUNESOURCE}"
> Or you can call the script unconditionally and check if [ "${TCLIBC}"
> = "musl" ] from inside it.
Thank you!
Kind regards,
Petr
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#151041):
https://lists.openembedded.org/g/openembedded-core/message/151041
Mute This Topic: https://lists.openembedded.org/mt/82386051/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] LTP drop MUSL specific patch
Hi all, > On Mon, Apr 26, 2021 at 11:53 AM Petr Vorel wrote: > > Hi Khem, Richard, > > I'd like to replace MUSL specific patch > > meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch > > with just removing broken files. We use this in upstream CI for Alpine, I > > ported > > it to Buildroot [2], where works well. It's better because it does allow to > > handle MUSL without rebasing this patch. > > I was looking into the docs, it looks to me that do_configure [3] might be > > good hook > > to add it into. But it looks like by default it contains oe_runmake clean > > [4]. > > Or should I use different hook? And how to find the default content of > > chosen > > hook? (if I need to extend it, I'll have to provide the original as well) > Changes to source files, including removing them, should be done as > part of the do_patch task. Since do_patch is implemented in python you > can't simply _append shell script commands to it, but you can add a > shell function via do_patch[postfuncs]. If you grep for > "do_patch[postfuncs]" in oe-core you should find a few examples. One more question: how to make this function MUSL specific? I noticed some functions has suffix "_libc-musl" (e.g. do_install_append_libc-musl), but I guess this would not work for do_patch[postfuncs], where I specify the name. Kind regards, Petr -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#151039): https://lists.openembedded.org/g/openembedded-core/message/151039 Mute This Topic: https://lists.openembedded.org/mt/82386051/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] LTP drop MUSL specific patch
Hi Andre, > On Mon, Apr 26, 2021 at 11:53 AM Petr Vorel wrote: > > Hi Khem, Richard, > > I'd like to replace MUSL specific patch > > meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch > > with just removing broken files. We use this in upstream CI for Alpine, I > > ported > > it to Buildroot [2], where works well. It's better because it does allow to > > handle MUSL without rebasing this patch. > > I was looking into the docs, it looks to me that do_configure [3] might be > > good hook > > to add it into. But it looks like by default it contains oe_runmake clean > > [4]. > > Or should I use different hook? And how to find the default content of > > chosen > > hook? (if I need to extend it, I'll have to provide the original as well) > Changes to source files, including removing them, should be done as > part of the do_patch task. Since do_patch is implemented in python you > can't simply _append shell script commands to it, but you can add a > shell function via do_patch[postfuncs]. If you grep for > "do_patch[postfuncs]" in oe-core you should find a few examples. Great, thanks a lot! Kind regards, Petr -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#151023): https://lists.openembedded.org/g/openembedded-core/message/151023 Mute This Topic: https://lists.openembedded.org/mt/82386051/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] LTP drop MUSL specific patch
Hi Khem, Richard, I'd like to replace MUSL specific patch meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch with just removing broken files. We use this in upstream CI for Alpine, I ported it to Buildroot [2], where works well. It's better because it does allow to handle MUSL without rebasing this patch. I was looking into the docs, it looks to me that do_configure [3] might be good hook to add it into. But it looks like by default it contains oe_runmake clean [4]. Or should I use different hook? And how to find the default content of chosen hook? (if I need to extend it, I'll have to provide the original as well) Thanks for info. Kind regards, Petr [1] https://github.com/linux-test-project/ltp/blob/master/travis/alpine.sh#L35 [2] https://git.busybox.net/buildroot/tree/package/ltp-testsuite/ltp-testsuite.mk#n72 [3] https://www.yoctoproject.org/docs/2.5/dev-manual/dev-manual.html#new-dependencies [4] https://www.yoctoproject.org/docs/2.5/ref-manual/ref-manual.html#ref-tasks-configure -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#151016): https://lists.openembedded.org/g/openembedded-core/message/151016 Mute This Topic: https://lists.openembedded.org/mt/82386051/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/1] verify-bashisms: Update checkbashisms.pl URL
anonscm.debian.org is not used any more.
Signed-off-by: Petr Vorel
---
NOTE: salsa.debian.org temporarily returns error 503.
Kind regards,
Petr
scripts/verify-bashisms | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/verify-bashisms b/scripts/verify-bashisms
index fb0cc719ea..14d8c298e9 100755
--- a/scripts/verify-bashisms
+++ b/scripts/verify-bashisms
@@ -100,7 +100,7 @@ if __name__=='__main__':
args = parser.parse_args()
if shutil.which("checkbashisms.pl") is None:
-print("Cannot find checkbashisms.pl on $PATH, get it from
https://anonscm.debian.org/cgit/collab-maint/devscripts.git/plain/scripts/checkbashisms.pl";)
+print("Cannot find checkbashisms.pl on $PATH, get it from
https://salsa.debian.org/debian/devscripts/raw/master/scripts/checkbashisms.pl";)
sys.exit(1)
# The order of defining the worker function,
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#149643):
https://lists.openembedded.org/g/openembedded-core/message/149643
Mute This Topic: https://lists.openembedded.org/mt/81437238/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] ltp: Fix format security warnings with gcc10
Hi Khem, I see patch has already merged in upstream. How about adding Upstream status: 58424835952641f4fd60c0ae3ab6c64decca3f8a Kind regards, Petr -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138503): https://lists.openembedded.org/g/openembedded-core/message/138503 Mute This Topic: https://lists.openembedded.org/mt/74343691/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] ltp: Fix format security warnings with gcc10
Hi Khem, > Signed-off-by: Khem Raj > Cc: Petr Vorel > Cc: Daniel Díaz Reviewed-by: Petr Vorel Nice, just easy fix. Please just send patch to LTP ML. Some time ago I tried to add -Wformat-security in upstream LTP travis CI, don't remember why I haven't finished the effort. If this is the only needed fix, we'll enable it. BTW how to add -Wformat-security in for openembedded-core (for next time)? Kind regards, Petr -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138502): https://lists.openembedded.org/g/openembedded-core/message/138502 Mute This Topic: https://lists.openembedded.org/mt/74343691/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/1] ltp: Update to 20200515
Inherit also pkgconfig (required for TI-RPC and Netlink based route
tests), to fix:
configure:6045: error: possibly undefined macro: AC_DEFINE
Refreshed patches (some tests have been fixed for musl)
* 0001-build-Add-option-to-select-libc-implementation.patch
(add a note here)
* 0001-Add-more-musl-exclusions.patch
Removed patches (different fix in upstream)
* 0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch
Removed patches (accepted upstream)
* 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
* 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch
Update upstream status
* 0004-guard-mallocopt-with-__GLIBC__.patch
Signed-off-by: Petr Vorel
---
Hi,
tested:
$ bitbake ltp
Build Configuration:
BB_VERSION = "1.44.0"
BUILD_SYS= "x86_64-linux"
NATIVELSBSTRING = "opensusetumbleweed-20200516"
TARGET_SYS = "x86_64-oe-linux"
MACHINE = "qemux86-64"
DISTRO = "nodistro"
DISTRO_VERSION = "nodistro.0"
TUNE_FEATURES= "m64 core2"
TARGET_FPU = ""
meta =
"ltp/20200515.v1:31cb32ae7321027b25080c9f7be56ca140f1eb35"
$ MACHINE=qemuarm TCLIBC=musl bitbake ltp
Build Configuration:
BB_VERSION = "1.44.0"
BUILD_SYS= "x86_64-linux"
NATIVELSBSTRING = "opensusetumbleweed-20200516"
TARGET_SYS = "arm-oe-linux-musleabi"
MACHINE = "qemuarm"
DISTRO = "nodistro"
DISTRO_VERSION = "nodistro.0"
TUNE_FEATURES= "arm armv7ve vfp thumb neon callconvention-hard"
TARGET_FPU = "hard"
meta =
"ltp/20200515.v1:b66ebb768a2b53f38d62d98249b377c73d5e0b9c"
Kind regards,
Petr
.../ltp/0001-Add-more-musl-exclusions.patch | 28 ++--
...option-to-select-libc-implementation.patch | 47 ++-
...or-time64-unsafe-syscalls-before-usi.patch | 122 --
...BC_PREREQ-is-defined-before-using-it.patch | 55
.../0004-guard-mallocopt-with-__GLIBC__.patch | 4 +-
...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 42 --
.../ltp/{ltp_20200120.bb => ltp_20200515.bb} | 7 +-
7 files changed, 25 insertions(+), 280 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
rename meta/recipes-extended/ltp/{ltp_20200120.bb => ltp_20200515.bb} (93%)
diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
index 02c2fef55b..f2fc8ee958 100644
--- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
+++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
@@ -1,35 +1,22 @@
-From 788c47ceef7f115ab7f7aa17f918e58795f4e6c7 Mon Sep 17 00:00:00 2001
+From ad8e73306cb8293f7d32841e1599fd9048801f1f Mon Sep 17 00:00:00 2001
From: Alexander Kanavin
Date: Fri, 20 Dec 2019 13:06:05 +0100
Subject: [PATCH] Add more musl exclusions
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin
+[ pvorel: rebase for 20200515: enable accept4_01 ]
[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ]
Signed-off-by: Petr Vorel
---
- testcases/kernel/syscalls/accept4/Makefile | 4
testcases/kernel/syscalls/timer_create/Makefile | 4
- 2 files changed, 8 insertions(+)
+ 1 file changed, 4 insertions(+)
-diff --git a/testcases/kernel/syscalls/accept4/Makefile
b/testcases/kernel/syscalls/accept4/Makefile
-index 504042e11..94db06266 100644
a/testcases/kernel/syscalls/accept4/Makefile
-+++ b/testcases/kernel/syscalls/accept4/Makefile
-@@ -20,4 +20,8 @@ top_srcdir ?= ../../../..
-
- include $(top_srcdir)/include/mk/testcases.mk
-
-+ifeq ($(LIBC),musl)
-+FILTER_OUT_MAKE_TARGETS:= accept4_01
-+endif
-+
- include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/timer_create/Makefile
b/testcases/kernel/syscalls/timer_create/Makefile
-index 8de247075..eb240f432 100644
+index ada241fe1..d454b01e7 100644
--- a/testcases/kernel/syscalls/timer_create/Makefile
+++ b/testcases/kernel/syscalls/timer_create/Makefile
-@@ -20,6 +20,10 @@ top_srcdir ?= ../../../..
+@@ -5,6 +5,10 @@ top_srcdir?= ../../../..
include $(top_srcdir)/include/mk/testcases.mk
@@ -40,5 +27,6 @@ index 8de247075..eb240f432 100644
CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include
LDLIBS+= -lpthread -lrt
---
-2.25.1
+--
+2.26.2
+
diff --git
a/meta/recipes-extended
Re: [OE-core] [PATCH v7 1/2] ltp: Update to 20200120
Hi, > Removed ffsb copying file and associated runtest file fs_ext4 > (both removed in this release). It compiles OK on my workstation. $ MACHINE=qemuarm TCLIBC=musl bitbake ltp ... Loaded 1305 entries from dependency cache. NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION = "1.44.0" BUILD_SYS= "x86_64-linux" NATIVELSBSTRING = "opensusetumbleweed-20200226" TARGET_SYS = "arm-oe-linux-musleabi" MACHINE = "qemuarm" DISTRO = "nodistro" DISTRO_VERSION = "nodistro.0" TUNE_FEATURES= "arm armv7ve vfp thumb neon callconvention-hard" TARGET_FPU = "hard" meta = "ltp/20200120.v7:adbe622d75374a2dcba803c509ad6d43515c40d8" Initialising tasks: 100% || Time: 0:00:00 Sstate summary: Wanted 299 Found 1 Missed 298 Current 99 (0% match, 25% complete) NOTE: Executing Tasks NOTE: Setscene tasks completed NOTE: Tasks Summary: Attempted 1512 tasks of which 878 didn't need to be rerun and all succeeded. Kind regards, Petr -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v5 1/2] ltp: Update to 20200120
Hi Richard, Khem, > I was able to confirm that fts is in the recipe sysroot and that the > compile step is running "make -j 88 LIBC=musl LIBS=-lfts", i.e. its > being passed in to ltp. Beyond that I'm a little out my depth to know > how/why its not ending up where it should unfortunately. At least the > issue does appear to reproduce though... Is there a way to compile only LTP and the necessary build dependencies? if I run this: . oe-init-build-env MACHINE=qemuarm TCLIBC=musl bitbake ltp It takes ages and compiles many things (gnutls, iptables, expat, procps, tar, ...). Kind regards, Petr -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v5 1/2] ltp: Update to 20200120
Hi Richard, > Grep suggests LIBS is a configure option, not a makefile one. I tried: > diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb > b/meta/recipes-extended/ltp/ltp_20200120.bb > index 847f267b0b7..5be9489a756 100644 > --- a/meta/recipes-extended/ltp/ltp_20200120.bb > +++ b/meta/recipes-extended/ltp/ltp_20200120.bb > @@ -16,7 +16,8 @@ LIC_FILES_CHKSUM = "\ > DEPENDS = "attr libaio libcap acl openssl zip-native" > DEPENDS_append_libc-musl = " fts " > -EXTRA_OEMAKE_append_libc-musl = " LIBC=musl LIBS=-lfts " > +EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " > +EXTRA_OECONF_append_libc-musl = " LIBS=-lfts " Thanks a lot for an explanation. Next time I need to read carefully. Kind regards, Petr -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v6 1/2] ltp: Update to 20200120
Hi Khem, Anuj, > > * 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch > > IMHO this one shouldn't be needed not, but CI still fails without it Khem, thanks for fixing it! It'd take me long time. > Is this patch still needed after the change in v6? I've sent v7 where I removed it. It actually wasn't used, because although I put the file itself back in v5 (+ it was in v6 from Khem), it wasn't actually listed in SRC_URI, so I expect it wasn't used. Kind regards, Petr -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v7 2/2] ltp: Remove mips related open_posix_testsuite patch
Upstream just disagree on this patch
https://patchwork.ozlabs.org/comment/2012045/
Signed-off-by: Petr Vorel
Signed-off-by: Khem Raj
---
Changes v6->v7: NONE
...suite-mmap24-2-Relax-condition-a-bit.patch | 68 ---
meta/recipes-extended/ltp/ltp_20200120.bb | 1 -
2 files changed, 69 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
diff --git
a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
deleted file mode 100644
index d32ac1dd7c..00
---
a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001
-From: "Hongzhi.Song"
-Date: Wed, 10 Oct 2018 22:07:05 -0400
-Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit
-
-Mips will return EINVAL instead of ENOMEM as expected
-if the range [addr + len) exceeds TASK_SIZE.
-
-Linux kernel code: arch/mips/mm/mmap.c
-if (flags & MAP_FIXED) {
-/* Even MAP_FIXED mappings must reside within TASK_SIZE */
-if (TASK_SIZE - len < addr)
-return -EINVAL;
-
-Relax the condition and accept both ENOMEM and EINVAL
-as expected outcome.
-
-Upstream-Status: Submitted
[https://lists.linux.it/pipermail/ltp/2018-October/009624.html]
-
-Signed-off-by: Hongzhi.Song
- .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c| 10 +-
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
-index 9cf83d9..55090a6 100644
a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
-+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
-@@ -7,7 +7,7 @@
- * source tree.
- *
- * The mmap() function shall fail if:
-- * [ENOMEM] MAP_FIXED was specified,
-+ * [ENOMEM or EINVAL] MAP_FIXED was specified,
- * and the range [addr,addr+len) exceeds that allowed
- * for the address space of a process; or, if MAP_FIXED was not specified and
- * there is insufficient room in the address space to effect the mapping.
-@@ -15,7 +15,7 @@
- * Test Step:
- * 1. Map a shared memory object, with size exceeding the value get from
- *rlim_cur of resource RLIMIT_AS, setting MAP_FIXED;
-- * 3. Should get ENOMEM.
-+ * 3. Should get ENOMEM or EINVAL.
- */
-
- #include
-@@ -92,8 +92,8 @@ int main(void)
- (unsigned long)len);
- pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd,
- 0);
-- if (pa == MAP_FAILED && errno == ENOMEM) {
-- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno));
-+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) {
-+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n",
strerror(errno));
- exit(PTS_PASS);
- }
-
-@@ -102,6 +102,6 @@ int main(void)
- else
- munmap(pa, len);
- close(fd);
-- printf("Test Fail: Did not get ENOMEM as expected\n");
-+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n");
- return PTS_FAIL;
- }
---
-2.7.4
-
diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb
b/meta/recipes-extended/ltp/ltp_20200120.bb
index 3cc10afa0c..5be9489a75 100644
--- a/meta/recipes-extended/ltp/ltp_20200120.bb
+++ b/meta/recipes-extended/ltp/ltp_20200120.bb
@@ -35,7 +35,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://0004-guard-mallocopt-with-__GLIBC__.patch \
file://0007-Fix-test_proc_kill-hanging.patch \
file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
-
file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \
file://0001-Add-more-musl-exclusions.patch \
file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \
"
--
2.25.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v7 1/2] ltp: Update to 20200120
Removed ffsb copying file and associated runtest file fs_ext4
(both removed in this release).
Added LIBS=-lfts for MUSL.
Removed patches (accepted upstream)
* 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch
* 0001-testcases-fix-an-absent-format-string-issue.patch
* 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch
Merged patches
* 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch
(into 0001-build-Add-option-to-select-libc-implementation.patch as they
touch the same files)
Refreshed patches (some tests have been fixed for musl)
* 0001-Add-more-musl-exclusions.patch
* 0001-build-Add-option-to-select-libc-implementation.patch
* 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch
IMHO this one shouldn't be needed not, but CI still fails without it
Updated status
* 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
* 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch
Signed-off-by: Petr Vorel
Signed-off-by: Khem Raj
---
Changes v6->v7:
* Drop 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch
Patch was in v5 and v6, but I forget to put it back into SRC_URI, so it
wasn't actually used.
Could anybody once more verify it's working on musl?
Hope this is a last version.
Khem, thanks a lot for fixing fts issue!
Kind regards,
Petr
meta/lib/oeqa/runtime/cases/ltp.py| 2 +-
.../ltp/0001-Add-more-musl-exclusions.patch | 36 +--
...option-to-select-libc-implementation.patch | 102 +-
...udevadm-trigger-before-swap-verifica.patch | 35 --
...ix-zeros-of-the-addresses-output-by-.patch | 43
...or-time64-unsafe-syscalls-before-usi.patch | 40 +--
...es-fix-an-absent-format-string-issue.patch | 24 -
...rs-Link-with-libfts-explicitly-on-mu.patch | 47
..._tgsigqueueinfo-disable-test-on-musl.patch | 35 --
...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 ++---
.../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 9 +-
11 files changed, 79 insertions(+), 321 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch
rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (90%)
diff --git a/meta/lib/oeqa/runtime/cases/ltp.py
b/meta/lib/oeqa/runtime/cases/ltp.py
index b8b7300435..6dc5ef22ad 100644
--- a/meta/lib/oeqa/runtime/cases/ltp.py
+++ b/meta/lib/oeqa/runtime/cases/ltp.py
@@ -59,7 +59,7 @@ class LtpTest(LtpTestBase):
ltp_groups = ["math", "syscalls", "dio", "io", "mm", "ipc", "sched",
"nptl", "pty", "containers", "controllers", "filecaps", "cap_bounds",
"fcntl-locktests", "connectors", "commands", "net.ipv6_lib",
"input","fs_perms_simple"]
-ltp_fs = ["fs", "fsx", "fs_bind", "fs_ext4"]
+ltp_fs = ["fs", "fsx", "fs_bind"]
# skip kernel cpuhotplug
ltp_kernel = ["power_management_tests", "hyperthreading ", "kernel_misc",
"hugetlb"]
ltp_groups += ltp_fs
diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
index d3af31f34a..02c2fef55b 100644
--- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
+++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin
+[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ]
+Signed-off-by: Petr Vorel
---
testcases/kernel/syscalls/accept4/Makefile | 4
- testcases/kernel/syscalls/fanotify/Makefile | 6 ++
- testcases/kernel/syscalls/setxattr/Makefile | 4
testcases/kernel/syscalls/timer_create/Makefile | 4
- 4 files changed, 18 insertions(+)
+ 2 files changed, 8 insertions(+)
diff --git a/testcases/kernel/syscalls/accept4/Makefile
b/testcases/kernel/syscalls/accept4/Makefile
index 504042e11..94db06266 100644
@@ -23,34 +23,6 @@ index 504042e11..94db06266 100644
+ifeq ($(LIBC),musl)
+FILTER_OUT_MAKE_TARGETS:= accept4_01
+endif
-+
- include $(top_srcdir)/include/mk/generic_leaf_target.mk
-diff --git a/testcases/kernel/syscalls/fanotify/Makefile
b/
Re: [OE-core] [PATCH v5 1/2] ltp: Update to 20200120
Hi Richard, Khem, > > Changes v4->v5: > > * Put back 0002-kernel-controllers-Link-with-libfts-explicitly-on- > > mu.patch > > as it still needed on MUSL (although it should not be needed, > > strange). > > Reported by Anuj Mittal > I'm sorry to say that this still isn't quite right for musl: > https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1634 > https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1630 > Still having the fts issue :( OK, step1b is still problematic: /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux-musl/../../libexec/x86_64-poky-linux-musl/gcc/x86_64-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3224: undefined reference to `fts_read' /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux-musl/../../libexec/x86_64-poky-linux-musl/gcc/x86_64-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3224: undefined reference to `fts_read' /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux-musl/../../libexec/x86_64-poky-linux-musl/gcc/x86_64-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3269: undefined reference to `fts_close' /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux-musl/../../libexec/x86_64-poky-linux-musl/gcc/x86_64-poky-linux-musl/9.2.0/ld: /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3277: undefined reference to `fts_close' At least we know, that once we solve this problem, we can remove 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch Please, how to reproduce this build locally? Is it: . oe-init-build-env TCLIBC=musl bitbake ltp Or do I need to put something into config files conf/local.conf or conf/bblayers.conf ? I need to double check if musl-fts is really built and whether the order of -lfts is correct. But all this has been solved even for static build for Buildroot, so I guess it's some issue related to openembedded. Unfortunately, I'm not much experienced in openembedded (stepped in, because nobody else has updated LTP package yet). Khem, any idea, what can be wrong? Kind regards, Petr -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v5 1/2] ltp: Update to 20200120
Removed ffsb copying file and associated runtest file fs_ext4
(both removed in this release).
Added LIBS=-lfts for MUSL.
Removed patches (accepted upstream)
* 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch
* 0001-testcases-fix-an-absent-format-string-issue.patch
* 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch
Merged patches
* 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch
(into 0001-build-Add-option-to-select-libc-implementation.patch as they
touch the same files)
Refreshed patches (some tests have been fixed for musl)
* 0001-Add-more-musl-exclusions.patch
* 0001-build-Add-option-to-select-libc-implementation.patch
* 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch
IMHO this one shouldn't be needed not, but CI still fails without it
Updated status
* 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
* 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch
Signed-off-by: Petr Vorel
---
Changes v4->v5:
* Put back 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch
as it still needed on MUSL (although it should not be needed, strange).
Reported by Anuj Mittal
* Remove fs_ext4 to fix build error.
https://autobuilder.yoctoproject.org/typhoon/#/builders/95/builds/574
Reported by Richard Purdie
@Anuj, @Richard: could you please test this version? (at least on MUSL)?
Kind regards,
Petr
meta/lib/oeqa/runtime/cases/ltp.py| 2 +-
.../ltp/0001-Add-more-musl-exclusions.patch | 37 +--
...option-to-select-libc-implementation.patch | 103 +-
...udevadm-trigger-before-swap-verifica.patch | 35 --
...ix-zeros-of-the-addresses-output-by-.patch | 43
...or-time64-unsafe-syscalls-before-usi.patch | 41 +--
...es-fix-an-absent-format-string-issue.patch | 24
...rs-Link-with-libfts-explicitly-on-mu.patch | 20 ++--
..._tgsigqueueinfo-disable-test-on-musl.patch | 35 --
...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 ++---
.../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 10 +-
11 files changed, 95 insertions(+), 282 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch
rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (89%)
diff --git a/meta/lib/oeqa/runtime/cases/ltp.py
b/meta/lib/oeqa/runtime/cases/ltp.py
index b8b7300435..6dc5ef22ad 100644
--- a/meta/lib/oeqa/runtime/cases/ltp.py
+++ b/meta/lib/oeqa/runtime/cases/ltp.py
@@ -59,7 +59,7 @@ class LtpTest(LtpTestBase):
ltp_groups = ["math", "syscalls", "dio", "io", "mm", "ipc", "sched",
"nptl", "pty", "containers", "controllers", "filecaps", "cap_bounds",
"fcntl-locktests", "connectors", "commands", "net.ipv6_lib",
"input","fs_perms_simple"]
-ltp_fs = ["fs", "fsx", "fs_bind", "fs_ext4"]
+ltp_fs = ["fs", "fsx", "fs_bind"]
# skip kernel cpuhotplug
ltp_kernel = ["power_management_tests", "hyperthreading ", "kernel_misc",
"hugetlb"]
ltp_groups += ltp_fs
diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
index d3af31f34a..773844d442 100644
--- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
+++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin
+[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ]
+Signed-off-by: Petr Vorel
---
testcases/kernel/syscalls/accept4/Makefile | 4
- testcases/kernel/syscalls/fanotify/Makefile | 6 ++
- testcases/kernel/syscalls/setxattr/Makefile | 4
testcases/kernel/syscalls/timer_create/Makefile | 4
- 4 files changed, 18 insertions(+)
+ 2 files changed, 8 insertions(+)
diff --git a/testcases/kernel/syscalls/accept4/Makefile
b/testcases/kernel/syscalls/accept4/Makefile
index 504042e11..94db06266 100644
@@ -23,34 +23,6 @@ index 504042e11..94db06266 100644
+ifeq ($(LIBC),musl)
+FILTER_OUT_MAKE_TARGETS:= accept4_01
+endif
-+
- include $(top_srcdir)/include/mk/generic_leaf_target.mk
-diff --git a/testcases/kernel/syscalls/fanotify/Makefile
b/testcases/kernel/syscalls/fanotify/Makefile
-index
[OE-core] [PATCH v5 2/2] ltp: Remove mips related open_posix_testsuite patch
Upstream just disagree on this patch
https://patchwork.ozlabs.org/comment/2012045/
Signed-off-by: Petr Vorel
---
Changes v4->v5: NONE
...suite-mmap24-2-Relax-condition-a-bit.patch | 68 ---
meta/recipes-extended/ltp/ltp_20200120.bb | 1 -
2 files changed, 69 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
diff --git
a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
deleted file mode 100644
index d32ac1dd7c..00
---
a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001
-From: "Hongzhi.Song"
-Date: Wed, 10 Oct 2018 22:07:05 -0400
-Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit
-
-Mips will return EINVAL instead of ENOMEM as expected
-if the range [addr + len) exceeds TASK_SIZE.
-
-Linux kernel code: arch/mips/mm/mmap.c
-if (flags & MAP_FIXED) {
-/* Even MAP_FIXED mappings must reside within TASK_SIZE */
-if (TASK_SIZE - len < addr)
-return -EINVAL;
-
-Relax the condition and accept both ENOMEM and EINVAL
-as expected outcome.
-
-Upstream-Status: Submitted
[https://lists.linux.it/pipermail/ltp/2018-October/009624.html]
-
-Signed-off-by: Hongzhi.Song
- .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c| 10 +-
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
-index 9cf83d9..55090a6 100644
a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
-+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
-@@ -7,7 +7,7 @@
- * source tree.
- *
- * The mmap() function shall fail if:
-- * [ENOMEM] MAP_FIXED was specified,
-+ * [ENOMEM or EINVAL] MAP_FIXED was specified,
- * and the range [addr,addr+len) exceeds that allowed
- * for the address space of a process; or, if MAP_FIXED was not specified and
- * there is insufficient room in the address space to effect the mapping.
-@@ -15,7 +15,7 @@
- * Test Step:
- * 1. Map a shared memory object, with size exceeding the value get from
- *rlim_cur of resource RLIMIT_AS, setting MAP_FIXED;
-- * 3. Should get ENOMEM.
-+ * 3. Should get ENOMEM or EINVAL.
- */
-
- #include
-@@ -92,8 +92,8 @@ int main(void)
- (unsigned long)len);
- pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd,
- 0);
-- if (pa == MAP_FAILED && errno == ENOMEM) {
-- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno));
-+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) {
-+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n",
strerror(errno));
- exit(PTS_PASS);
- }
-
-@@ -102,6 +102,6 @@ int main(void)
- else
- munmap(pa, len);
- close(fd);
-- printf("Test Fail: Did not get ENOMEM as expected\n");
-+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n");
- return PTS_FAIL;
- }
---
-2.7.4
-
diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb
b/meta/recipes-extended/ltp/ltp_20200120.bb
index 312eeca114..847f267b0b 100644
--- a/meta/recipes-extended/ltp/ltp_20200120.bb
+++ b/meta/recipes-extended/ltp/ltp_20200120.bb
@@ -34,7 +34,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://0004-guard-mallocopt-with-__GLIBC__.patch \
file://0007-Fix-test_proc_kill-hanging.patch \
file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
-
file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \
file://0001-Add-more-musl-exclusions.patch \
file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \
"
--
2.25.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v4 1/2] ltp: Update to 20200120
Hi Richard, > > Changes v3->v4: > > * Fix musl build with LIBS=-lfts > Unfortunately the musl build is still failing with this version: > https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1627 > https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/1631 Any idea, how to fix it? libcgroup uses the same flag LIBS=-lfts. Maybe the variable isn't propagated. Or is the dependency expressed enough? DEPENDS_append_libc-musl = " fts " EXTRA_OEMAKE_append_libc-musl = " LIBC=musl LIBS=-lfts " I'll have to put back patch 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch, but that's bad, buildroot works without it. Kind regards, Petr -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 1/2] ltp: Update to 20200120
Hi Khem, > > It looks like this is failing with musl: > > /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: > > > > /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_memory_test/../cpuset_lib/libcpu_set.a(libcpuset.o): > > in function `cpuset_fts_open': > > /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3214: > > undefined reference to `fts_open' > > /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: > > > > /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3224: > > undefined reference to `fts_read' > > /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: > > > > /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3269: > > undefined reference to `fts_close' > > /home/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/ltp/20200120-r0/recipe-sysroot-native/usr/bin/i686-poky-linux-musl/../../libexec/i686-poky-linux-musl/gcc/i686-poky-linux-musl/9.2.0/ld: > > > > /usr/src/debug/ltp/20200120-r0/git/testcases/kernel/controllers/cpuset/cpuset_lib/libcpuset.c:3277: > > undefined reference to `fts_close' > I think we need to add > DEPENDS_append_libc-musl = " fts " > EXTRA_OEMAKE_append_libc-musl = " LIBS=-lfts" Thanks! LIBS=-lfts should fix missing fts. I've sent it as v4. I'm trying to test it on TARGET_SYS = "x86_64-oe-linux-musl" (run via TCLIBC=musl bitbake ltp, I should probably test it also on other arch: MACHINE=qemuarm TCLIBC=musl bitbake ltp). Anuj, can you test it as well? Kind regards, Petr -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 1/2] ltp: Update to 20200120
Removed ffsb copying file (tool removed from upstream)
Added LIBS=-lfts for MUSL.
Removed patches (accepted upstream)
* 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch
* 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch
* 0001-testcases-fix-an-absent-format-string-issue.patch
* 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch
Merged patches
* 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch
(into 0001-build-Add-option-to-select-libc-implementation.patch as they
touch the same files)
Refreshed patches (some tests have been fixed for musl)
* 0001-Add-more-musl-exclusions.patch
* 0001-build-Add-option-to-select-libc-implementation.patch
Updated status
* 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
* 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch
Signed-off-by: Petr Vorel
---
Changes v3->v4:
* Fix musl build with LIBS=-lfts
.../ltp/0001-Add-more-musl-exclusions.patch | 37 +--
...option-to-select-libc-implementation.patch | 103 +-
...udevadm-trigger-before-swap-verifica.patch | 35 --
...ix-zeros-of-the-addresses-output-by-.patch | 43
...or-time64-unsafe-syscalls-before-usi.patch | 41 +--
...es-fix-an-absent-format-string-issue.patch | 24
...rs-Link-with-libfts-explicitly-on-mu.patch | 47
..._tgsigqueueinfo-disable-test-on-musl.patch | 35 --
...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 ++---
.../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 10 +-
10 files changed, 81 insertions(+), 321 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch
rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (89%)
diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
index d3af31f34a..773844d442 100644
--- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
+++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin
+[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ]
+Signed-off-by: Petr Vorel
---
testcases/kernel/syscalls/accept4/Makefile | 4
- testcases/kernel/syscalls/fanotify/Makefile | 6 ++
- testcases/kernel/syscalls/setxattr/Makefile | 4
testcases/kernel/syscalls/timer_create/Makefile | 4
- 4 files changed, 18 insertions(+)
+ 2 files changed, 8 insertions(+)
diff --git a/testcases/kernel/syscalls/accept4/Makefile
b/testcases/kernel/syscalls/accept4/Makefile
index 504042e11..94db06266 100644
@@ -23,34 +23,6 @@ index 504042e11..94db06266 100644
+ifeq ($(LIBC),musl)
+FILTER_OUT_MAKE_TARGETS:= accept4_01
+endif
-+
- include $(top_srcdir)/include/mk/generic_leaf_target.mk
-diff --git a/testcases/kernel/syscalls/fanotify/Makefile
b/testcases/kernel/syscalls/fanotify/Makefile
-index 5d01b4825..0263a6e20 100644
a/testcases/kernel/syscalls/fanotify/Makefile
-+++ b/testcases/kernel/syscalls/fanotify/Makefile
-@@ -20,4 +20,10 @@ top_srcdir ?= ../../../..
- fanotify11: CFLAGS+=-pthread
- include $(top_srcdir)/include/mk/testcases.mk
-
-+ifeq ($(LIBC),musl)
-+FILTER_OUT_MAKE_TARGETS:= fanotify13 fanotify15
-+endif
-+
- include $(top_srcdir)/include/mk/generic_leaf_target.mk
-+
-+
-diff --git a/testcases/kernel/syscalls/setxattr/Makefile
b/testcases/kernel/syscalls/setxattr/Makefile
-index 72544c13e..7f20b2780 100644
a/testcases/kernel/syscalls/setxattr/Makefile
-+++ b/testcases/kernel/syscalls/setxattr/Makefile
-@@ -20,4 +20,8 @@ top_srcdir ?= ../../../..
-
- include $(top_srcdir)/include/mk/testcases.mk
-
-+ifeq ($(LIBC),musl)
-+FILTER_OUT_MAKE_TARGETS:= setxattr03
-+endif
+
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/timer_create/Makefile
b/testcases/kernel/syscalls/timer_create/Makefile
@@ -68,3 +40,6 @@ index 8de247075..eb240f432 100644
CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include
LDLIBS+= -lpthread -lrt
+--
+2.25.1
+
diff --git
a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch
b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch
index 1705abcf19..0598046b28 100644
---
a/met
[OE-core] [PATCH v4 2/2] ltp: Remove mips related open_posix_testsuite patch
Upstream just disagree on this patch
https://patchwork.ozlabs.org/comment/2012045/
Signed-off-by: Petr Vorel
---
Changes v3->v4: NONE
...suite-mmap24-2-Relax-condition-a-bit.patch | 68 ---
meta/recipes-extended/ltp/ltp_20200120.bb | 1 -
2 files changed, 69 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
diff --git
a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
deleted file mode 100644
index d32ac1dd7c..00
---
a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001
-From: "Hongzhi.Song"
-Date: Wed, 10 Oct 2018 22:07:05 -0400
-Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit
-
-Mips will return EINVAL instead of ENOMEM as expected
-if the range [addr + len) exceeds TASK_SIZE.
-
-Linux kernel code: arch/mips/mm/mmap.c
-if (flags & MAP_FIXED) {
-/* Even MAP_FIXED mappings must reside within TASK_SIZE */
-if (TASK_SIZE - len < addr)
-return -EINVAL;
-
-Relax the condition and accept both ENOMEM and EINVAL
-as expected outcome.
-
-Upstream-Status: Submitted
[https://lists.linux.it/pipermail/ltp/2018-October/009624.html]
-
-Signed-off-by: Hongzhi.Song
- .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c| 10 +-
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
-index 9cf83d9..55090a6 100644
a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
-+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
-@@ -7,7 +7,7 @@
- * source tree.
- *
- * The mmap() function shall fail if:
-- * [ENOMEM] MAP_FIXED was specified,
-+ * [ENOMEM or EINVAL] MAP_FIXED was specified,
- * and the range [addr,addr+len) exceeds that allowed
- * for the address space of a process; or, if MAP_FIXED was not specified and
- * there is insufficient room in the address space to effect the mapping.
-@@ -15,7 +15,7 @@
- * Test Step:
- * 1. Map a shared memory object, with size exceeding the value get from
- *rlim_cur of resource RLIMIT_AS, setting MAP_FIXED;
-- * 3. Should get ENOMEM.
-+ * 3. Should get ENOMEM or EINVAL.
- */
-
- #include
-@@ -92,8 +92,8 @@ int main(void)
- (unsigned long)len);
- pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd,
- 0);
-- if (pa == MAP_FAILED && errno == ENOMEM) {
-- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno));
-+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) {
-+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n",
strerror(errno));
- exit(PTS_PASS);
- }
-
-@@ -102,6 +102,6 @@ int main(void)
- else
- munmap(pa, len);
- close(fd);
-- printf("Test Fail: Did not get ENOMEM as expected\n");
-+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n");
- return PTS_FAIL;
- }
---
-2.7.4
-
diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb
b/meta/recipes-extended/ltp/ltp_20200120.bb
index 312eeca114..847f267b0b 100644
--- a/meta/recipes-extended/ltp/ltp_20200120.bb
+++ b/meta/recipes-extended/ltp/ltp_20200120.bb
@@ -34,7 +34,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://0004-guard-mallocopt-with-__GLIBC__.patch \
file://0007-Fix-test_proc_kill-hanging.patch \
file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
-
file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \
file://0001-Add-more-musl-exclusions.patch \
file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \
"
--
2.25.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 1/2] ltp: Update to 20200120
Removed ffsb copying file (tool removed from upstream)
Removed patches (accepted upstream)
* 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch
* 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch
* 0001-testcases-fix-an-absent-format-string-issue.patch
* 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch
Merged patches
* 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch
(into 0001-build-Add-option-to-select-libc-implementation.patch as they
touch the same files)
Refreshed patches (some tests have been fixed for musl)
* 0001-Add-more-musl-exclusions.patch
* 0001-build-Add-option-to-select-libc-implementation.patch
Updated status
* 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
* 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch
Signed-off-by: Petr Vorel
---
Changes v2->v3:
ffsb-6.0-rc2 has been removed => remove it from upstream.
Kind regards,
Petr
.../ltp/0001-Add-more-musl-exclusions.patch | 37 +--
...option-to-select-libc-implementation.patch | 103 +-
...udevadm-trigger-before-swap-verifica.patch | 35 --
...ix-zeros-of-the-addresses-output-by-.patch | 43
...or-time64-unsafe-syscalls-before-usi.patch | 41 +--
...es-fix-an-absent-format-string-issue.patch | 24
...rs-Link-with-libfts-explicitly-on-mu.patch | 47
..._tgsigqueueinfo-disable-test-on-musl.patch | 35 --
...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 ++---
.../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 8 +-
10 files changed, 80 insertions(+), 320 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch
rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (90%)
diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
index d3af31f34a..773844d442 100644
--- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
+++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin
+[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ]
+Signed-off-by: Petr Vorel
---
testcases/kernel/syscalls/accept4/Makefile | 4
- testcases/kernel/syscalls/fanotify/Makefile | 6 ++
- testcases/kernel/syscalls/setxattr/Makefile | 4
testcases/kernel/syscalls/timer_create/Makefile | 4
- 4 files changed, 18 insertions(+)
+ 2 files changed, 8 insertions(+)
diff --git a/testcases/kernel/syscalls/accept4/Makefile
b/testcases/kernel/syscalls/accept4/Makefile
index 504042e11..94db06266 100644
@@ -23,34 +23,6 @@ index 504042e11..94db06266 100644
+ifeq ($(LIBC),musl)
+FILTER_OUT_MAKE_TARGETS:= accept4_01
+endif
-+
- include $(top_srcdir)/include/mk/generic_leaf_target.mk
-diff --git a/testcases/kernel/syscalls/fanotify/Makefile
b/testcases/kernel/syscalls/fanotify/Makefile
-index 5d01b4825..0263a6e20 100644
a/testcases/kernel/syscalls/fanotify/Makefile
-+++ b/testcases/kernel/syscalls/fanotify/Makefile
-@@ -20,4 +20,10 @@ top_srcdir ?= ../../../..
- fanotify11: CFLAGS+=-pthread
- include $(top_srcdir)/include/mk/testcases.mk
-
-+ifeq ($(LIBC),musl)
-+FILTER_OUT_MAKE_TARGETS:= fanotify13 fanotify15
-+endif
-+
- include $(top_srcdir)/include/mk/generic_leaf_target.mk
-+
-+
-diff --git a/testcases/kernel/syscalls/setxattr/Makefile
b/testcases/kernel/syscalls/setxattr/Makefile
-index 72544c13e..7f20b2780 100644
a/testcases/kernel/syscalls/setxattr/Makefile
-+++ b/testcases/kernel/syscalls/setxattr/Makefile
-@@ -20,4 +20,8 @@ top_srcdir ?= ../../../..
-
- include $(top_srcdir)/include/mk/testcases.mk
-
-+ifeq ($(LIBC),musl)
-+FILTER_OUT_MAKE_TARGETS:= setxattr03
-+endif
+
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/timer_create/Makefile
b/testcases/kernel/syscalls/timer_create/Makefile
@@ -68,3 +40,6 @@ index 8de247075..eb240f432 100644
CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include
LDLIBS+= -lpthread -lrt
+--
+2.25.1
+
diff --git
a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch
b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch
index 1705abcf19..0598046b28 1
[OE-core] [PATCH v3 2/2] ltp: Remove mips related open_posix_testsuite patch
Upstream just disagree on this patch
https://patchwork.ozlabs.org/comment/2012045/
Signed-off-by: Petr Vorel
---
Changes v2->v3: NONE
...suite-mmap24-2-Relax-condition-a-bit.patch | 68 ---
meta/recipes-extended/ltp/ltp_20200120.bb | 1 -
2 files changed, 69 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
diff --git
a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
deleted file mode 100644
index d32ac1dd7c..00
---
a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001
-From: "Hongzhi.Song"
-Date: Wed, 10 Oct 2018 22:07:05 -0400
-Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit
-
-Mips will return EINVAL instead of ENOMEM as expected
-if the range [addr + len) exceeds TASK_SIZE.
-
-Linux kernel code: arch/mips/mm/mmap.c
-if (flags & MAP_FIXED) {
-/* Even MAP_FIXED mappings must reside within TASK_SIZE */
-if (TASK_SIZE - len < addr)
-return -EINVAL;
-
-Relax the condition and accept both ENOMEM and EINVAL
-as expected outcome.
-
-Upstream-Status: Submitted
[https://lists.linux.it/pipermail/ltp/2018-October/009624.html]
-
-Signed-off-by: Hongzhi.Song
- .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c| 10 +-
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
-index 9cf83d9..55090a6 100644
a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
-+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
-@@ -7,7 +7,7 @@
- * source tree.
- *
- * The mmap() function shall fail if:
-- * [ENOMEM] MAP_FIXED was specified,
-+ * [ENOMEM or EINVAL] MAP_FIXED was specified,
- * and the range [addr,addr+len) exceeds that allowed
- * for the address space of a process; or, if MAP_FIXED was not specified and
- * there is insufficient room in the address space to effect the mapping.
-@@ -15,7 +15,7 @@
- * Test Step:
- * 1. Map a shared memory object, with size exceeding the value get from
- *rlim_cur of resource RLIMIT_AS, setting MAP_FIXED;
-- * 3. Should get ENOMEM.
-+ * 3. Should get ENOMEM or EINVAL.
- */
-
- #include
-@@ -92,8 +92,8 @@ int main(void)
- (unsigned long)len);
- pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd,
- 0);
-- if (pa == MAP_FAILED && errno == ENOMEM) {
-- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno));
-+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) {
-+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n",
strerror(errno));
- exit(PTS_PASS);
- }
-
-@@ -102,6 +102,6 @@ int main(void)
- else
- munmap(pa, len);
- close(fd);
-- printf("Test Fail: Did not get ENOMEM as expected\n");
-+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n");
- return PTS_FAIL;
- }
---
-2.7.4
-
diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb
b/meta/recipes-extended/ltp/ltp_20200120.bb
index 579a763431..537cc72644 100644
--- a/meta/recipes-extended/ltp/ltp_20200120.bb
+++ b/meta/recipes-extended/ltp/ltp_20200120.bb
@@ -34,7 +34,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://0004-guard-mallocopt-with-__GLIBC__.patch \
file://0007-Fix-test_proc_kill-hanging.patch \
file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
-
file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \
file://0001-Add-more-musl-exclusions.patch \
file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \
"
--
2.25.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] ltp: Remove mips related open_posix_testsuite patch
Hi Khem, > > please don't deliver this patch to users, it's wrong. > Thanks Petr, is there an alternative approach we can take ? Cyril suggested at the time to skipping the test in the testrunner. Is that feasible? He also asked how do you run the test. i.e. not changing the code of the test, just don't run it. https://patchwork.ozlabs.org/comment/2012168/ Kind regards, Petr PS: better to ask on LTP ML, Cc Cyril and me. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/2] ltp: Update to 20200120
Removed patches (accepted upstream)
* 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch
* 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch
* 0001-testcases-fix-an-absent-format-string-issue.patch
* 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch
Merged patches
* 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch
(into 0001-build-Add-option-to-select-libc-implementation.patch as they
touch the same files)
Refreshed patches (some tests have been fixed for musl)
* 0001-Add-more-musl-exclusions.patch
* 0001-build-Add-option-to-select-libc-implementation.patch
Updated status
* 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
* 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch
Signed-off-by: Petr Vorel
---
Changes v1->v2:
* fix rebasing 0001-build-Add-option-to-select-libc-implementation.patch
Kind regards,
Petr
.../ltp/0001-Add-more-musl-exclusions.patch | 37 +--
...option-to-select-libc-implementation.patch | 103 +-
...udevadm-trigger-before-swap-verifica.patch | 35 --
...ix-zeros-of-the-addresses-output-by-.patch | 43
...or-time64-unsafe-syscalls-before-usi.patch | 41 +--
...es-fix-an-absent-format-string-issue.patch | 24
...rs-Link-with-libfts-explicitly-on-mu.patch | 47
..._tgsigqueueinfo-disable-test-on-musl.patch | 35 --
...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 ++---
.../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 7 +-
10 files changed, 80 insertions(+), 319 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch
rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (92%)
diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
index d3af31f34a..773844d442 100644
--- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
+++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Add more musl exclusions
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin
+[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ]
+Signed-off-by: Petr Vorel
---
testcases/kernel/syscalls/accept4/Makefile | 4
- testcases/kernel/syscalls/fanotify/Makefile | 6 ++
- testcases/kernel/syscalls/setxattr/Makefile | 4
testcases/kernel/syscalls/timer_create/Makefile | 4
- 4 files changed, 18 insertions(+)
+ 2 files changed, 8 insertions(+)
diff --git a/testcases/kernel/syscalls/accept4/Makefile
b/testcases/kernel/syscalls/accept4/Makefile
index 504042e11..94db06266 100644
@@ -23,34 +23,6 @@ index 504042e11..94db06266 100644
+ifeq ($(LIBC),musl)
+FILTER_OUT_MAKE_TARGETS:= accept4_01
+endif
-+
- include $(top_srcdir)/include/mk/generic_leaf_target.mk
-diff --git a/testcases/kernel/syscalls/fanotify/Makefile
b/testcases/kernel/syscalls/fanotify/Makefile
-index 5d01b4825..0263a6e20 100644
a/testcases/kernel/syscalls/fanotify/Makefile
-+++ b/testcases/kernel/syscalls/fanotify/Makefile
-@@ -20,4 +20,10 @@ top_srcdir ?= ../../../..
- fanotify11: CFLAGS+=-pthread
- include $(top_srcdir)/include/mk/testcases.mk
-
-+ifeq ($(LIBC),musl)
-+FILTER_OUT_MAKE_TARGETS:= fanotify13 fanotify15
-+endif
-+
- include $(top_srcdir)/include/mk/generic_leaf_target.mk
-+
-+
-diff --git a/testcases/kernel/syscalls/setxattr/Makefile
b/testcases/kernel/syscalls/setxattr/Makefile
-index 72544c13e..7f20b2780 100644
a/testcases/kernel/syscalls/setxattr/Makefile
-+++ b/testcases/kernel/syscalls/setxattr/Makefile
-@@ -20,4 +20,8 @@ top_srcdir ?= ../../../..
-
- include $(top_srcdir)/include/mk/testcases.mk
-
-+ifeq ($(LIBC),musl)
-+FILTER_OUT_MAKE_TARGETS:= setxattr03
-+endif
+
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/timer_create/Makefile
b/testcases/kernel/syscalls/timer_create/Makefile
@@ -68,3 +40,6 @@ index 8de247075..eb240f432 100644
CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include
LDLIBS+= -lpthread -lrt
+--
+2.25.1
+
diff --git
a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch
b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch
index 1705abcf19..0598046b28 100644
---
a/meta/recipes-extended/ltp/ltp/0001-
[OE-core] [PATCH v2 2/2] ltp: Remove mips related open_posix_testsuite patch
Upstream just disagree on this patch
https://patchwork.ozlabs.org/comment/2012045/
Signed-off-by: Petr Vorel
---
Changes v1->v2: NONE
...suite-mmap24-2-Relax-condition-a-bit.patch | 68 ---
meta/recipes-extended/ltp/ltp_20200120.bb | 1 -
2 files changed, 69 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
diff --git
a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
deleted file mode 100644
index d32ac1dd7c..00
---
a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001
-From: "Hongzhi.Song"
-Date: Wed, 10 Oct 2018 22:07:05 -0400
-Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit
-
-Mips will return EINVAL instead of ENOMEM as expected
-if the range [addr + len) exceeds TASK_SIZE.
-
-Linux kernel code: arch/mips/mm/mmap.c
-if (flags & MAP_FIXED) {
-/* Even MAP_FIXED mappings must reside within TASK_SIZE */
-if (TASK_SIZE - len < addr)
-return -EINVAL;
-
-Relax the condition and accept both ENOMEM and EINVAL
-as expected outcome.
-
-Upstream-Status: Submitted
[https://lists.linux.it/pipermail/ltp/2018-October/009624.html]
-
-Signed-off-by: Hongzhi.Song
- .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c| 10 +-
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
-index 9cf83d9..55090a6 100644
a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
-+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
-@@ -7,7 +7,7 @@
- * source tree.
- *
- * The mmap() function shall fail if:
-- * [ENOMEM] MAP_FIXED was specified,
-+ * [ENOMEM or EINVAL] MAP_FIXED was specified,
- * and the range [addr,addr+len) exceeds that allowed
- * for the address space of a process; or, if MAP_FIXED was not specified and
- * there is insufficient room in the address space to effect the mapping.
-@@ -15,7 +15,7 @@
- * Test Step:
- * 1. Map a shared memory object, with size exceeding the value get from
- *rlim_cur of resource RLIMIT_AS, setting MAP_FIXED;
-- * 3. Should get ENOMEM.
-+ * 3. Should get ENOMEM or EINVAL.
- */
-
- #include
-@@ -92,8 +92,8 @@ int main(void)
- (unsigned long)len);
- pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd,
- 0);
-- if (pa == MAP_FAILED && errno == ENOMEM) {
-- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno));
-+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) {
-+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n",
strerror(errno));
- exit(PTS_PASS);
- }
-
-@@ -102,6 +102,6 @@ int main(void)
- else
- munmap(pa, len);
- close(fd);
-- printf("Test Fail: Did not get ENOMEM as expected\n");
-+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n");
- return PTS_FAIL;
- }
---
-2.7.4
-
diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb
b/meta/recipes-extended/ltp/ltp_20200120.bb
index 38fd0f6f87..069d9c2e0b 100644
--- a/meta/recipes-extended/ltp/ltp_20200120.bb
+++ b/meta/recipes-extended/ltp/ltp_20200120.bb
@@ -35,7 +35,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://0004-guard-mallocopt-with-__GLIBC__.patch \
file://0007-Fix-test_proc_kill-hanging.patch \
file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
-
file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \
file://0001-Add-more-musl-exclusions.patch \
file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \
"
--
2.25.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] ltp: Remove mips related open_posix_testsuite patch
Upstream just disagree on this patch
https://patchwork.ozlabs.org/comment/2012045/
Signed-off-by: Petr Vorel
---
Hi,
please don't deliver this patch to users, it's wrong.
Kind regards,
Petr
...suite-mmap24-2-Relax-condition-a-bit.patch | 68 ---
meta/recipes-extended/ltp/ltp_20200120.bb | 1 -
2 files changed, 69 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
diff --git
a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
deleted file mode 100644
index d32ac1dd7c..00
---
a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001
-From: "Hongzhi.Song"
-Date: Wed, 10 Oct 2018 22:07:05 -0400
-Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit
-
-Mips will return EINVAL instead of ENOMEM as expected
-if the range [addr + len) exceeds TASK_SIZE.
-
-Linux kernel code: arch/mips/mm/mmap.c
-if (flags & MAP_FIXED) {
-/* Even MAP_FIXED mappings must reside within TASK_SIZE */
-if (TASK_SIZE - len < addr)
-return -EINVAL;
-
-Relax the condition and accept both ENOMEM and EINVAL
-as expected outcome.
-
-Upstream-Status: Submitted
[https://lists.linux.it/pipermail/ltp/2018-October/009624.html]
-
-Signed-off-by: Hongzhi.Song
- .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c| 10 +-
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
-index 9cf83d9..55090a6 100644
a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
-+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
-@@ -7,7 +7,7 @@
- * source tree.
- *
- * The mmap() function shall fail if:
-- * [ENOMEM] MAP_FIXED was specified,
-+ * [ENOMEM or EINVAL] MAP_FIXED was specified,
- * and the range [addr,addr+len) exceeds that allowed
- * for the address space of a process; or, if MAP_FIXED was not specified and
- * there is insufficient room in the address space to effect the mapping.
-@@ -15,7 +15,7 @@
- * Test Step:
- * 1. Map a shared memory object, with size exceeding the value get from
- *rlim_cur of resource RLIMIT_AS, setting MAP_FIXED;
-- * 3. Should get ENOMEM.
-+ * 3. Should get ENOMEM or EINVAL.
- */
-
- #include
-@@ -92,8 +92,8 @@ int main(void)
- (unsigned long)len);
- pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd,
- 0);
-- if (pa == MAP_FAILED && errno == ENOMEM) {
-- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno));
-+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) {
-+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n",
strerror(errno));
- exit(PTS_PASS);
- }
-
-@@ -102,6 +102,6 @@ int main(void)
- else
- munmap(pa, len);
- close(fd);
-- printf("Test Fail: Did not get ENOMEM as expected\n");
-+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n");
- return PTS_FAIL;
- }
---
-2.7.4
-
diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb
b/meta/recipes-extended/ltp/ltp_20200120.bb
index 38fd0f6f87..069d9c2e0b 100644
--- a/meta/recipes-extended/ltp/ltp_20200120.bb
+++ b/meta/recipes-extended/ltp/ltp_20200120.bb
@@ -35,7 +35,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://0004-guard-mallocopt-with-__GLIBC__.patch \
file://0007-Fix-test_proc_kill-hanging.patch \
file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
-
file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \
file://0001-Add-more-musl-exclusions.patch \
file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \
"
--
2.25.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] ltp: Update to 20200120
Removed patches (accepted upstream)
* 0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch
* 0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch
* 0001-testcases-fix-an-absent-format-string-issue.patch
* 0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch
Merged patches
* 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch
(into 0001-build-Add-option-to-select-libc-implementation.patch as they
touch the same files)
Refreshed patches (some tests have been fixed for musl)
* 0001-Add-more-musl-exclusions.patch
* 0001-build-Add-option-to-select-libc-implementation.patch
Updated status
* 0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
* 0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch
Signed-off-by: Petr Vorel
---
Hi,
tested only on glibc. But upstream release is tested also on MUSL
(travis, via Alpine + glibc) and tested also on Buildroot (uclibc, musl,
glibc).
Actual list of MUSL incompatible tests is in travis/alpine.sh [1].
Kind regards,
Petr
[1] https://github.com/linux-test-project/ltp/blob/master/travis/alpine.sh
.../ltp/0001-Add-more-musl-exclusions.patch | 32 +
...option-to-select-libc-implementation.patch | 72 ---
...udevadm-trigger-before-swap-verifica.patch | 35 -
...ix-zeros-of-the-addresses-output-by-.patch | 43 ---
...or-time64-unsafe-syscalls-before-usi.patch | 41 ---
...es-fix-an-absent-format-string-issue.patch | 24 ---
...rs-Link-with-libfts-explicitly-on-mu.patch | 47
..._tgsigqueueinfo-disable-test-on-musl.patch | 35 -
...k-nfsv4-acl-acl1.c-Security-fix-on-s.patch | 27 +++
.../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 7 +-
10 files changed, 60 insertions(+), 303 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-nm01-Remove-prefix-zeros-of-the-addresses-output-by-.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0002-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0006-rt_tgsigqueueinfo-disable-test-on-musl.patch
rename meta/recipes-extended/ltp/{ltp_20190930.bb => ltp_20200120.bb} (92%)
diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
index d3af31f34a..baf28bbecb 100644
--- a/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
+++ b/meta/recipes-extended/ltp/ltp/0001-Add-more-musl-exclusions.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add more musl exclusions
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin
+[ pvorel: rebase for 20200120: enable fanotify13, fanotify15, setxattr03 ]
+Signed-off-by: Petr Vorel
---
testcases/kernel/syscalls/accept4/Makefile | 4
- testcases/kernel/syscalls/fanotify/Makefile | 6 ++
- testcases/kernel/syscalls/setxattr/Makefile | 4
testcases/kernel/syscalls/timer_create/Makefile | 4
4 files changed, 18 insertions(+)
@@ -23,34 +23,6 @@ index 504042e11..94db06266 100644
+ifeq ($(LIBC),musl)
+FILTER_OUT_MAKE_TARGETS:= accept4_01
+endif
-+
- include $(top_srcdir)/include/mk/generic_leaf_target.mk
-diff --git a/testcases/kernel/syscalls/fanotify/Makefile
b/testcases/kernel/syscalls/fanotify/Makefile
-index 5d01b4825..0263a6e20 100644
a/testcases/kernel/syscalls/fanotify/Makefile
-+++ b/testcases/kernel/syscalls/fanotify/Makefile
-@@ -20,4 +20,10 @@ top_srcdir ?= ../../../..
- fanotify11: CFLAGS+=-pthread
- include $(top_srcdir)/include/mk/testcases.mk
-
-+ifeq ($(LIBC),musl)
-+FILTER_OUT_MAKE_TARGETS:= fanotify13 fanotify15
-+endif
-+
- include $(top_srcdir)/include/mk/generic_leaf_target.mk
-+
-+
-diff --git a/testcases/kernel/syscalls/setxattr/Makefile
b/testcases/kernel/syscalls/setxattr/Makefile
-index 72544c13e..7f20b2780 100644
a/testcases/kernel/syscalls/setxattr/Makefile
-+++ b/testcases/kernel/syscalls/setxattr/Makefile
-@@ -20,4 +20,8 @@ top_srcdir ?= ../../../..
-
- include $(top_srcdir)/include/mk/testcases.mk
-
-+ifeq ($(LIBC),musl)
-+FILTER_OUT_MAKE_TARGETS:= setxattr03
-+endif
+
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/timer_create/Makefile
b/testcases/kernel/syscalls/timer_create/Makefile
diff --git
a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch
b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch
index 1705abcf19..e0cd860935 100644
---
a/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch
+++
b/meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation
Re: [OE-core] [OE-Core][PATCH] iputils: upgrade to s20190709
Hi, > build system is changed to meson. > Signed-off-by: Changhyeok Bae Reviewed-by: Petr Vorel BTW It'd be worth to add this patch which fixes regression in s20190709: 18f14be arping: revert partially - fix sent vs received packages return value Kind regards, Petr -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] ltp: getrlimit03: adjust-a-bit-of-code-to-compatiable-with mips32
Hi Hongzhi, > > ... > > > --- /dev/null > > > +++ > > > b/meta/recipes-extended/ltp/ltp/0001-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch > > > @@ -0,0 +1,62 @@ > > > +From e79652a3839869b1983d65999e5d5dcb50bc9cd7 Mon Sep 17 00:00:00 2001 > > > +From: "Hongzhi.Song" > > > +Date: Mon, 15 Jul 2019 03:39:06 -0400 > > > +Subject: [PATCH] getrlimit03: adjust a bit of code to compatiable with > > > mips32 > > ... > > > +Signed-off-by: Jan Stancek > > > +Signed-off-by: Hongzhi.Song > > > + > > > +Upstream-Status: Backport > > > +Signed-off-by: Hongzhi.Song > > > +--- > > > + testcases/kernel/syscalls/getrlimit/getrlimit03.c | 8 +++- > > > + 1 file changed, 7 insertions(+), 1 deletion(-) > > I have to say I prefer policy when only build fixes are backported / added. > > (approach which e.g. buildroot has). Having many patches (25 atm) makes > > updating > > a bit difficult (ok, not that much, 'Upstream-Status: Backport' shows what > > has > > been merged since last release) and sometimes brings users patches which > > weren't > > accepted by upstream (your mips patch [1] was not accepted [2] > Thanks for your kindly remind. > Agree with you. It's time to uprev ltp recipe. > From now, if the "Submitting or Backport" is appropriate, > I will make sure the patch was merged by ltp before it was sent to oe-core. Great! Feel free to Cc me when sending patches. > > ). > > But I understand that LTP 3 months release cycle can be to > > slow for some LTP users. > > Kind regards, > > Petr > > PS: I'm slowly working on fixing all musl issues in LTP upstream. It's a > > long > > term run but were moving towards that goal. > > Patch "build: Add option to select libc implementation" [3] is a not a good > > approach. Instead it's needed to find for each failure why it's not > > presented > > in musl. Mostly because it uses non POSIX features or deprecated API, which > > needs to be avoided or used kernel headers where it's available. > > [1] > > http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch > I am working on this patch. Good. > > [2] https://patchwork.ozlabs.org/patch/982194/#2012168 > This patch has been merge by ltp finally. To LTP upstream? I don't see it [4]. That's the patch you working on. > --Hongzhi > > [3] > > http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch [4] https://github.com/linux-test-project/ltp/commits/master/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] ltp: upgrade 20190115 -> 20190517
Hi Yi,
> Drop the following patches since the issues have been fixed upstream:
> 0001-file01.sh-Fix-in-was-not-recognized.patch
> 0001-lapi-Define-TST_ABI-32-64-to-detect-target-type.patch
> 0001-syscalls-setrlimit03.c-read-proc-sys-fs-nr_open-for-.patch
> 0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch
> 0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch
> 0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch
> 0023-ptrace-Use-int-instead-of-enum-__ptrace_request.patch
> 0024-rt_sigaction-rt_sigprocmark-Define-_GNU_SOURCE.patch
> 0026-crash01-Define-_GNU_SOURCE.patch
> 0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch
> 0034-periodic_output.patch
> 0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch
> define-sigrtmin-and-sigrtmax-for-musl.patch
> setregid01-security-string-formatting.patch
> Refresh the following patches:
> 0004-build-Add-option-to-select-libc-implementation.patch
> 0005-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch
> 0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch
> 0018-guard-mallocopt-with-__GLIBC__.patch
> 0020-getdents-define-getdents-getdents64-only-for-glibc.patch
> 0035-fix-test_proc_kill-hang.patch
> 0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
> 0001-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
> 0001-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
> 0001-diotest4-Let-kernel-pick-an-address-when-calling-mma.patch
> 0001-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch
> Add patch:
> 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch
+rt_tgsigqueueinfo01.c: In function 'sigusr1_handler':
+rt_tgsigqueueinfo01.c:42:22: error: 'siginfo_t' {aka 'struct '} has
no member named '_sifields'; did you mean '__si_fields'?
+ 42 | sigval_rcv = uinfo->_sifields._rt.SI_SIGVAL.sival_ptr;
+ | ^~~~~
+ | __si_fields
Interesting, I didn't notice this musl error.
> Signed-off-by: Yi Zhao
Reviewed-by: Petr Vorel
Kind regards,
Petr
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] ltp: getrlimit03: adjust-a-bit-of-code-to-compatiable-with mips32
Hi Hongzhi, ... > --- /dev/null > +++ > b/meta/recipes-extended/ltp/ltp/0001-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch > @@ -0,0 +1,62 @@ > +From e79652a3839869b1983d65999e5d5dcb50bc9cd7 Mon Sep 17 00:00:00 2001 > +From: "Hongzhi.Song" > +Date: Mon, 15 Jul 2019 03:39:06 -0400 > +Subject: [PATCH] getrlimit03: adjust a bit of code to compatiable with mips32 ... > +Signed-off-by: Jan Stancek > +Signed-off-by: Hongzhi.Song > + > +Upstream-Status: Backport > +Signed-off-by: Hongzhi.Song > +--- > + testcases/kernel/syscalls/getrlimit/getrlimit03.c | 8 +++- > + 1 file changed, 7 insertions(+), 1 deletion(-) I have to say I prefer policy when only build fixes are backported / added. (approach which e.g. buildroot has). Having many patches (25 atm) makes updating a bit difficult (ok, not that much, 'Upstream-Status: Backport' shows what has been merged since last release) and sometimes brings users patches which weren't accepted by upstream (your mips patch [1] was not accepted [2]). But I understand that LTP 3 months release cycle can be to slow for some LTP users. Kind regards, Petr PS: I'm slowly working on fixing all musl issues in LTP upstream. It's a long term run but were moving towards that goal. Patch "build: Add option to select libc implementation" [3] is a not a good approach. Instead it's needed to find for each failure why it's not presented in musl. Mostly because it uses non POSIX features or deprecated API, which needs to be avoided or used kernel headers where it's available. [1] http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch [2] https://patchwork.ozlabs.org/patch/982194/#2012168 [3] http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 1/1] ltp: Update to 20190115
Hi Richard, Khem,
> > security_flags.inc:SECURITY_STRINGFORMAT ?= "-Wformat -Wformat-security
> > -Werror=format-security"
> > security_flags.inc:SECURITY_CFLAGS ?= "${SECURITY_STACK_PROTECTOR}
> > ${SECURITY_PIE_CFLAGS} ${lcl_maybe_fortify} ${SECURITY_STRINGFORMAT}"
> > so the reproducer should be to add "-Wformat -Wformat-security
> > -Werror=format-security" to CFLAGS when building ltp.
> I think this must be new, we are carrying patches to fix similar
> issues in other parts of ltp. Probably something to consider for
> upstreaming
> e.g.
> https://git.openembedded.org/openembedded-core/tree/meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
I was testing it, but this one was ok. Found problems with setregid01.c,
to realize that it was already posted to LTP mailing list, so pushed it.
Kind regards,
Petr
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 1/1] ltp: Update to 20190115
Hi Richard, Khem, > > Thanks for looking at this. Unfortunately it failed in testing on most > > targets: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/46/builds/181/steps/7/logs/step1b > > (one failure given as an example). > > Warnings as errors are good during development but sometimes less > > useful during release due to the variety of end user configurations. > with glibc 2.29 in play > http://errors.yoctoproject.org/Errors/Details/216829/ Thanks for your reports. Is there any way I could easily reproduce it? Some config I can download? I'm testing with default config. I'm sorry for dummy question, I'm more experienced with Buildroot. Kind regards, Petr -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/1] ltp: Update to 20190115
Updated patches
* 0004-build-Add-option-to-select-libc-implementation.patch
* 0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch
* 0001-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
Removed patches (accepted in upstream)
* 0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch
* 0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch
* 0001-setrlimit05-Use-another-method-to-get-bad-address.patch
* 0001-sigwaitinfo01-recent-glibc-calls-syscall-directly.patch
* 0001-statx-fix-compile-errors.patch
* 0001-syscalls-fcntl-make-OFD-command-use-fcntl64-syscall-.patch
(accepted v2 version, see
http://lists.linux.it/pipermail/ltp/2018-October/009691.html)
Signed-off-by: Petr Vorel
---
Changes v1->v2:
* Update SRCREV (previous version used old version)
* Refresh patches
---
...getcpu-to-avoid-conflict-with-glibc-.patch | 57 --
...use-ping-6-when-ping6-is-not-avaliab.patch | 45 -
...suite-mmap24-2-Relax-condition-a-bit.patch | 6 +-
...se-another-method-to-get-bad-address.patch | 61 --
...-recent-glibc-calls-syscall-directly.patch | 75 ---
.../ltp/0001-statx-fix-compile-errors.patch | 35
...ake-OFD-command-use-fcntl64-syscall-.patch | 184 --
...option-to-select-libc-implementation.patch | 3 +-
...BC_PREREQ-is-defined-before-using-it.patch | 124
.../ltp/{ltp_20180926.bb => ltp_20190115.bb} | 8 +-
10 files changed, 5 insertions(+), 593 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-setrlimit05-Use-another-method-to-get-bad-address.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-sigwaitinfo01-recent-glibc-calls-syscall-directly.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-statx-fix-compile-errors.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-syscalls-fcntl-make-OFD-command-use-fcntl64-syscall-.patch
rename meta/recipes-extended/ltp/{ltp_20180926.bb => ltp_20190115.bb} (91%)
diff --git
a/meta/recipes-extended/ltp/ltp/0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch
b/meta/recipes-extended/ltp/ltp/0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch
deleted file mode 100644
index d0c847774d..00
---
a/meta/recipes-extended/ltp/ltp/0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From c9edb0eaaca83c18ac7b5ea3330faad8d47d3fd1 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Fri, 14 Dec 2018 06:44:02 -0800
-Subject: [PATCH] getcpu01: Rename getcpu to avoid conflict with glibc >= 2.29
-
-glibc has added getcpu() API starting with glibc 2.29 release, this
-makes the static function in conflict and signatures are not same as
-well.
-
-Renaming helps to keep ltp build going
-
-Upstream-Status: Submitted
[http://lists.linux.it/pipermail/ltp/2018-December/010321.html]
-
-Signed-off-by: Khem Raj
- testcases/kernel/syscalls/getcpu/getcpu01.c | 10 +-
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/testcases/kernel/syscalls/getcpu/getcpu01.c
b/testcases/kernel/syscalls/getcpu/getcpu01.c
-index c927512ca..e850fe844 100644
a/testcases/kernel/syscalls/getcpu/getcpu01.c
-+++ b/testcases/kernel/syscalls/getcpu/getcpu01.c
-@@ -82,7 +82,7 @@ int sys_support = 0;
-
- void cleanup(void);
- void setup(void);
--static inline int getcpu(unsigned int *, unsigned int *, void *);
-+static inline int get_cpu(unsigned int *, unsigned int *, void *);
- unsigned int set_cpu_affinity(void);
- unsigned int get_nodeid(unsigned int);
- unsigned int max_cpuid(size_t, cpu_set_t *);
-@@ -124,7 +124,7 @@ int main(int ac, char **av)
- #ifdef __i386__
- node_set = get_nodeid(cpu_set);
- #endif
-- TEST(getcpu(&cpu_id, &node_id, NULL));
-+ TEST(get_cpu(&cpu_id, &node_id, NULL));
- if (TEST_RETURN == 0) {
- if (cpu_id != cpu_set) {
- tst_resm(TFAIL, "getcpu() returned wrong value"
-@@ -157,10 +157,10 @@ int main(int ac, char **av)
- }
-
- /*
-- * getcpu() - calls the system call
-+ * get_cpu() - calls the system call
- */
--static inline int getcpu(unsigned *cpu_id, unsigned *node_id,
-- void *cache_struct)
-+static inline int get_cpu(unsigned *cpu_id, unsigned *node_id,
-+void *cache_struct)
- {
- #if defined(__i386__)
- return syscall(318, cpu_id, node_id, cache_struct);
---
-2.20.0
-
diff --git
a/meta/recipes-extended/ltp/ltp/0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch
b/meta/recipes-extended/ltp/ltp/0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch
deleted file mode 100644
index 32e7a0eb25..0
Re: [OE-core] [PATCH 1/1] ltp: Update to 20190115
Hi, > Removed patches (accepted in upstream) > * 0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch > * 0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch > * 0001-setrlimit05-Use-another-method-to-get-bad-address.patch > * 0001-sigwaitinfo01-recent-glibc-calls-syscall-directly.patch > * 0001-statx-fix-compile-errors.patch > * 0001-syscalls-fcntl-make-OFD-command-use-fcntl64-syscall-.patch > (accepted v2 version, see > http://lists.linux.it/pipermail/ltp/2018-October/009691.html) Patch is wrong, going to send v2. Kind regards, Petr -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] ltp: Update to 20190115
Removed patches (accepted in upstream)
* 0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch
* 0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch
* 0001-setrlimit05-Use-another-method-to-get-bad-address.patch
* 0001-sigwaitinfo01-recent-glibc-calls-syscall-directly.patch
* 0001-statx-fix-compile-errors.patch
* 0001-syscalls-fcntl-make-OFD-command-use-fcntl64-syscall-.patch
(accepted v2 version, see
http://lists.linux.it/pipermail/ltp/2018-October/009691.html)
Signed-off-by: Petr Vorel
---
...getcpu-to-avoid-conflict-with-glibc-.patch | 57 --
...use-ping-6-when-ping6-is-not-avaliab.patch | 45 -
...se-another-method-to-get-bad-address.patch | 61 --
...-recent-glibc-calls-syscall-directly.patch | 75 ---
.../ltp/0001-statx-fix-compile-errors.patch | 35
...ake-OFD-command-use-fcntl64-syscall-.patch | 184 --
.../ltp/{ltp_20180926.bb => ltp_20190115.bb} | 6 -
7 files changed, 463 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-setrlimit05-Use-another-method-to-get-bad-address.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-sigwaitinfo01-recent-glibc-calls-syscall-directly.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-statx-fix-compile-errors.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-syscalls-fcntl-make-OFD-command-use-fcntl64-syscall-.patch
rename meta/recipes-extended/ltp/{ltp_20180926.bb => ltp_20190115.bb} (92%)
diff --git
a/meta/recipes-extended/ltp/ltp/0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch
b/meta/recipes-extended/ltp/ltp/0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch
deleted file mode 100644
index d0c847774d..00
---
a/meta/recipes-extended/ltp/ltp/0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From c9edb0eaaca83c18ac7b5ea3330faad8d47d3fd1 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Fri, 14 Dec 2018 06:44:02 -0800
-Subject: [PATCH] getcpu01: Rename getcpu to avoid conflict with glibc >= 2.29
-
-glibc has added getcpu() API starting with glibc 2.29 release, this
-makes the static function in conflict and signatures are not same as
-well.
-
-Renaming helps to keep ltp build going
-
-Upstream-Status: Submitted
[http://lists.linux.it/pipermail/ltp/2018-December/010321.html]
-
-Signed-off-by: Khem Raj
- testcases/kernel/syscalls/getcpu/getcpu01.c | 10 +-
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/testcases/kernel/syscalls/getcpu/getcpu01.c
b/testcases/kernel/syscalls/getcpu/getcpu01.c
-index c927512ca..e850fe844 100644
a/testcases/kernel/syscalls/getcpu/getcpu01.c
-+++ b/testcases/kernel/syscalls/getcpu/getcpu01.c
-@@ -82,7 +82,7 @@ int sys_support = 0;
-
- void cleanup(void);
- void setup(void);
--static inline int getcpu(unsigned int *, unsigned int *, void *);
-+static inline int get_cpu(unsigned int *, unsigned int *, void *);
- unsigned int set_cpu_affinity(void);
- unsigned int get_nodeid(unsigned int);
- unsigned int max_cpuid(size_t, cpu_set_t *);
-@@ -124,7 +124,7 @@ int main(int ac, char **av)
- #ifdef __i386__
- node_set = get_nodeid(cpu_set);
- #endif
-- TEST(getcpu(&cpu_id, &node_id, NULL));
-+ TEST(get_cpu(&cpu_id, &node_id, NULL));
- if (TEST_RETURN == 0) {
- if (cpu_id != cpu_set) {
- tst_resm(TFAIL, "getcpu() returned wrong value"
-@@ -157,10 +157,10 @@ int main(int ac, char **av)
- }
-
- /*
-- * getcpu() - calls the system call
-+ * get_cpu() - calls the system call
- */
--static inline int getcpu(unsigned *cpu_id, unsigned *node_id,
-- void *cache_struct)
-+static inline int get_cpu(unsigned *cpu_id, unsigned *node_id,
-+void *cache_struct)
- {
- #if defined(__i386__)
- return syscall(318, cpu_id, node_id, cache_struct);
---
-2.20.0
-
diff --git
a/meta/recipes-extended/ltp/ltp/0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch
b/meta/recipes-extended/ltp/ltp/0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch
deleted file mode 100644
index 32e7a0eb25..00
---
a/meta/recipes-extended/ltp/ltp/0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 76d8343ad300f6507233abcdf97629290e35848a Mon Sep 17 00:00:00 2001
-From: Lei Yang
-Date: Wed, 29 Aug 2018 11:51:24 +0800
-Subject: [PATCH] netns_helper.sh: use 'ping -6' when ping6 is not avaliable
-
-ping6 has been merged into ping since 2015 by using "ping -6"
-in some distributions (e.g. OpenEmbedded) they dropped ping6 comple
Re: [OE-core] [PATCH v2 1/1] ltp: Update to 20180926
Hello Daniel, I've rebased patch for actual master and sent it as v2. Please use this one. > > New patches > > * 0001-statx-fix-compile-errors.patch > Oh, boy, thanks for finding that patch -- caused me lots of troubles. :-) About patches bellow. LTP is full of patches, if you want to have best LTP use git master branch. That's why I'm for including only build fixes, release is roughly each 4 months. I kept patches bellow, let's keep them, but IMHO they're not that important. > Since you sent v2 of this patch there's been a couple of patches added: > * 0001-sigwaitinfo01-recent-glibc-calls-syscall-directly.patch This one was accepted. > * 0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch This one as well. There is more effective fix for ping6 for all networking tests which use new shell API (IMHO the only relevant tests): 7f10a1910 tst_net.sh: Fix ping detection d57ac0b7a net: Fix missing ping6 > * 0001-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch We're waiting for v2 of this patch. > Do we want those in? > > Rebased patches > > * 0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch > > Removed removed (accepted in upstream) > > * 0041-cve-2017-5669-shmat-for-0-or-PAGESIZE-with-RND-flag-.patch > > * 0042-fs-ftest-ftest06.c-Fix-too-small-name-string-and-rel.patch > > * 0043-open-creat-skip-S_ISGID-check-on-files-created-by-no.patch > Patch 0040-read_all-Define-FNM_EXTMATCH-if-not-already-like-und.patch > also made it upstream, albeit with a different implementation. See > commit 822ad20433799193e2180862137c36f24e5d27d6. Well, I haven't replaced this one with upgrade :(. Shell I post v3? Or will you do it in separate commit? > Thanks and greetings! > Daniel Díaz > daniel.d...@linaro.org Kind regards, Petr -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/1] ltp: Update to 20180926
New patches
* 0001-statx-fix-compile-errors.patch
Rebased patches
* 0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch
Removed removed (accepted in upstream)
* 0041-cve-2017-5669-shmat-for-0-or-PAGESIZE-with-RND-flag-.patch
* 0042-fs-ftest-ftest06.c-Fix-too-small-name-string-and-rel.patch
* 0043-open-creat-skip-S_ISGID-check-on-files-created-by-no.patch
Removed patches (different fix accepted in upstream)
* 0001-mmap15-mips64-return-EINVAL.patch
Signed-off-by: Petr Vorel
---
Changes v1->v2:
* Resolved rebase errors
---
.../0001-mmap15-mips64-return-EINVAL.patch| 41
.../ltp/0001-statx-fix-compile-errors.patch | 34 +++
...1-Fix-for-test-in-deterministic-mode.patch | 42
...mat-for-0-or-PAGESIZE-with-RND-flag-.patch | 97 ---
c-Fix-too-small-name-string-and-rel.patch | 34 ---
...S_ISGID-check-on-files-created-by-no.patch | 81
.../ltp/{ltp_20180515.bb => ltp_20180926.bb} | 8 +-
7 files changed, 58 insertions(+), 279 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-mmap15-mips64-return-EINVAL.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0001-statx-fix-compile-errors.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0041-cve-2017-5669-shmat-for-0-or-PAGESIZE-with-RND-flag-.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0042-fs-ftest-ftest06.c-Fix-too-small-name-string-and-rel.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0043-open-creat-skip-S_ISGID-check-on-files-created-by-no.patch
rename meta/recipes-extended/ltp/{ltp_20180515.bb => ltp_20180926.bb} (93%)
diff --git
a/meta/recipes-extended/ltp/ltp/0001-mmap15-mips64-return-EINVAL.patch
b/meta/recipes-extended/ltp/ltp/0001-mmap15-mips64-return-EINVAL.patch
deleted file mode 100644
index 18eba27c2d..00
--- a/meta/recipes-extended/ltp/ltp/0001-mmap15-mips64-return-EINVAL.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From b909805b4fc1b72e0ce299afb4abc02720ee81da Mon Sep 17 00:00:00 2001
-From: Dengke Du
-Date: Wed, 12 Sep 2018 14:24:35 +0800
-Subject: [PATCH] mmap15: mips64 return EINVAL
-
-In mips64 kernel, system check the addr that passed to mmap:
-
-if (TASK_SIZE - len < addr)
-return -EINVAL;
-
-Link: https://github.com/torvalds/linux/blob/master/arch/mips/mm/mmap.c#L71
-
-Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/394]
-
-Signed-off-by: Dengke Du
- testcases/kernel/syscalls/mmap/mmap15.c | 5 +
- 1 file changed, 5 insertions(+)
-
-diff --git a/testcases/kernel/syscalls/mmap/mmap15.c
b/testcases/kernel/syscalls/mmap/mmap15.c
-index eff27d6..a10b5c7 100644
a/testcases/kernel/syscalls/mmap/mmap15.c
-+++ b/testcases/kernel/syscalls/mmap/mmap15.c
-@@ -81,9 +81,14 @@ int main(int ac, char **av)
- }
-
- if (errno != ENOMEM) {
-+#ifdef __mips__
-+ tst_resm(TPASS | TERRNO, "mmap into high region "
-+ "failed as expected");
-+#else
- tst_resm(TFAIL | TERRNO, "mmap into high region "
-"failed unexpectedly - expect "
-"errno=ENOMEM, got");
-+#endif
- } else {
- tst_resm(TPASS | TERRNO, "mmap into high region "
-"failed as expected");
---
-2.7.4
-
diff --git a/meta/recipes-extended/ltp/ltp/0001-statx-fix-compile-errors.patch
b/meta/recipes-extended/ltp/ltp/0001-statx-fix-compile-errors.patch
new file mode 100644
index 00..c4fd8d0223
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-statx-fix-compile-errors.patch
@@ -0,0 +1,34 @@
+From a945304b6a2286d0665c70250cc5475eb07fd21e Mon Sep 17 00:00:00 2001
+From: Thadeu Lima de Souza Cascardo
+Date: Wed, 26 Sep 2018 11:15:45 -0300
+Subject: [PATCH] statx: fix compile errors
+
+struct statx is only defined in sys/stat.h when _GNU_SOURCE is defined.
+The testcases do define _GNU_SOURCE, but not the m4 struct check.
+
+Signed-off-by: Thadeu Lima de Souza Cascardo
+Acked-by: Cyril Hrubis
+---
+ m4/ltp-statx.m4 | 9 +++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/m4/ltp-statx.m4 b/m4/ltp-statx.m4
+index 44303d30c..5f79a94cd 100644
+--- a/m4/ltp-statx.m4
b/m4/ltp-statx.m4
+@@ -23,6 +23,11 @@ dnl
+ AC_DEFUN([LTP_CHECK_STATX],[
+ AC_CHECK_FUNCS(statx,,,[[#include ]])
+ AC_CHECK_HEADER(linux/fs.h,,,)
+-AC_CHECK_TYPES([struct statx],,,[[#include ]])
+-AC_CHECK_TYPES([struct statx_timestamp],,,[[#include ]])
++AC_CHECK_TYPES([struct statx],,,[[
++ #define _GNU_SOURCE
++ #include
++]])
++AC_CHECK_TYPES([struct statx_timestamp],,,[[
++ #define _GNU_SOURCE
++ #include ]])
+ ])
+--
+2.19.1
diff --git
a/meta/recipes-extended/ltp/ltp/0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch
b/meta/recipes-extended/lt
Re: [OE-core] ✗ patchtest: failure for ltp: Update to 20180926
Hi, > == Series Details == > Series: ltp: Update to 20180926 > Revision: 1 > URL : https://patchwork.openembedded.org/series/14398/ > State : failure Replaced by v2, where addressed the issues. Kind regards, Petr -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/1] ltp: Update to 20180926
License-Update: Removed pounder21 in 20180926
New patches
* 0001-statx-fix-compile-errors.patch
Rebased patches
* 0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch
Removed removed (accepted in upstream)
* 0041-cve-2017-5669-shmat-for-0-or-PAGESIZE-with-RND-flag-.patch
* 0042-fs-ftest-ftest06.c-Fix-too-small-name-string-and-rel.patch
* 0043-open-creat-skip-S_ISGID-check-on-files-created-by-no.patch
Removed patches (different fix accepted in upstream)
* 0001-mmap15-mips64-return-EINVAL.patch
Signed-off-by: Petr Vorel
---
Changes v1->v2:
* Fixed LIC_FILES_CHKSUM error (add "License-Update: Removed pounder21
in 20180926" to commit message)
* Add missing Upstream-Status for 0001-statx-fix-compile-errors.patch
Kind regards,
Petr
---
.../0001-mmap15-mips64-return-EINVAL.patch| 41
.../ltp/0001-statx-fix-compile-errors.patch | 38
...1-Fix-for-test-in-deterministic-mode.patch | 42
...mat-for-0-or-PAGESIZE-with-RND-flag-.patch | 97 ---
c-Fix-too-small-name-string-and-rel.patch | 34 ---
...S_ISGID-check-on-files-created-by-no.patch | 81
.../ltp/{ltp_20180515.bb => ltp_20180926.bb} | 8 +-
7 files changed, 62 insertions(+), 279 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-mmap15-mips64-return-EINVAL.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0001-statx-fix-compile-errors.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0041-cve-2017-5669-shmat-for-0-or-PAGESIZE-with-RND-flag-.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0042-fs-ftest-ftest06.c-Fix-too-small-name-string-and-rel.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0043-open-creat-skip-S_ISGID-check-on-files-created-by-no.patch
rename meta/recipes-extended/ltp/{ltp_20180515.bb => ltp_20180926.bb} (93%)
diff --git
a/meta/recipes-extended/ltp/ltp/0001-mmap15-mips64-return-EINVAL.patch
b/meta/recipes-extended/ltp/ltp/0001-mmap15-mips64-return-EINVAL.patch
deleted file mode 100644
index 18eba27c2d..00
--- a/meta/recipes-extended/ltp/ltp/0001-mmap15-mips64-return-EINVAL.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From b909805b4fc1b72e0ce299afb4abc02720ee81da Mon Sep 17 00:00:00 2001
-From: Dengke Du
-Date: Wed, 12 Sep 2018 14:24:35 +0800
-Subject: [PATCH] mmap15: mips64 return EINVAL
-
-In mips64 kernel, system check the addr that passed to mmap:
-
-if (TASK_SIZE - len < addr)
-return -EINVAL;
-
-Link: https://github.com/torvalds/linux/blob/master/arch/mips/mm/mmap.c#L71
-
-Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/394]
-
-Signed-off-by: Dengke Du
- testcases/kernel/syscalls/mmap/mmap15.c | 5 +
- 1 file changed, 5 insertions(+)
-
-diff --git a/testcases/kernel/syscalls/mmap/mmap15.c
b/testcases/kernel/syscalls/mmap/mmap15.c
-index eff27d6..a10b5c7 100644
a/testcases/kernel/syscalls/mmap/mmap15.c
-+++ b/testcases/kernel/syscalls/mmap/mmap15.c
-@@ -81,9 +81,14 @@ int main(int ac, char **av)
- }
-
- if (errno != ENOMEM) {
-+#ifdef __mips__
-+ tst_resm(TPASS | TERRNO, "mmap into high region "
-+ "failed as expected");
-+#else
- tst_resm(TFAIL | TERRNO, "mmap into high region "
-"failed unexpectedly - expect "
-"errno=ENOMEM, got");
-+#endif
- } else {
- tst_resm(TPASS | TERRNO, "mmap into high region "
-"failed as expected");
---
-2.7.4
-
diff --git a/meta/recipes-extended/ltp/ltp/0001-statx-fix-compile-errors.patch
b/meta/recipes-extended/ltp/ltp/0001-statx-fix-compile-errors.patch
new file mode 100644
index 00..021b70012a
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-statx-fix-compile-errors.patch
@@ -0,0 +1,38 @@
+From a945304b6a2286d0665c70250cc5475eb07fd21e Mon Sep 17 00:00:00 2001
+From: Thadeu Lima de Souza Cascardo
+Date: Wed, 26 Sep 2018 11:15:45 -0300
+Subject: [PATCH] statx: fix compile errors
+
+struct statx is only defined in sys/stat.h when _GNU_SOURCE is defined.
+The testcases do define _GNU_SOURCE, but not the m4 struct check.
+
+Signed-off-by: Thadeu Lima de Souza Cascardo
+Acked-by: Cyril Hrubis
+
+Upstream-Status: Backport
+[a945304b6 statx: fix compile errors]
+---
+ m4/ltp-statx.m4 | 9 +++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/m4/ltp-statx.m4 b/m4/ltp-statx.m4
+index 44303d30c..5f79a94cd 100644
+--- a/m4/ltp-statx.m4
b/m4/ltp-statx.m4
+@@ -23,6 +23,11 @@ dnl
+ AC_DEFUN([LTP_CHECK_STATX],[
+ AC_CHECK_FUNCS(statx,,,[[#include ]])
+ AC_CHECK_HEADER(linux/fs.h,,,)
+-AC_CHECK_TYPES([struct statx],,,[[#include ]])
+-AC_CHECK_TYPES([struct statx_timestamp],,,[[#include ]])
++AC_CHECK_TYPES([struct statx],,,[[
[OE-core] [PATCH 1/1] ltp: Update to 20180926
New patches
* 0001-statx-fix-compile-errors.patch
Rebased patches
* 0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch
Removed removed (accepted in upstream)
* 0041-cve-2017-5669-shmat-for-0-or-PAGESIZE-with-RND-flag-.patch
* 0042-fs-ftest-ftest06.c-Fix-too-small-name-string-and-rel.patch
* 0043-open-creat-skip-S_ISGID-check-on-files-created-by-no.patch
Removed patches (different fix accepted in upstream)
* 0001-mmap15-mips64-return-EINVAL.patch
Signed-off-by: Petr Vorel
---
.../0001-mmap15-mips64-return-EINVAL.patch| 41
.../ltp/0001-statx-fix-compile-errors.patch | 35 +++
...1-Fix-for-test-in-deterministic-mode.patch | 42
...mat-for-0-or-PAGESIZE-with-RND-flag-.patch | 97 ---
c-Fix-too-small-name-string-and-rel.patch | 34 ---
...S_ISGID-check-on-files-created-by-no.patch | 81
.../ltp/{ltp_20180515.bb => ltp_20180926.bb} | 8 +-
7 files changed, 59 insertions(+), 279 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0001-mmap15-mips64-return-EINVAL.patch
create mode 100644
meta/recipes-extended/ltp/ltp/0001-statx-fix-compile-errors.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0041-cve-2017-5669-shmat-for-0-or-PAGESIZE-with-RND-flag-.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0042-fs-ftest-ftest06.c-Fix-too-small-name-string-and-rel.patch
delete mode 100644
meta/recipes-extended/ltp/ltp/0043-open-creat-skip-S_ISGID-check-on-files-created-by-no.patch
rename meta/recipes-extended/ltp/{ltp_20180515.bb => ltp_20180926.bb} (93%)
diff --git
a/meta/recipes-extended/ltp/ltp/0001-mmap15-mips64-return-EINVAL.patch
b/meta/recipes-extended/ltp/ltp/0001-mmap15-mips64-return-EINVAL.patch
deleted file mode 100644
index 18eba27c2d..00
--- a/meta/recipes-extended/ltp/ltp/0001-mmap15-mips64-return-EINVAL.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From b909805b4fc1b72e0ce299afb4abc02720ee81da Mon Sep 17 00:00:00 2001
-From: Dengke Du
-Date: Wed, 12 Sep 2018 14:24:35 +0800
-Subject: [PATCH] mmap15: mips64 return EINVAL
-
-In mips64 kernel, system check the addr that passed to mmap:
-
-if (TASK_SIZE - len < addr)
-return -EINVAL;
-
-Link: https://github.com/torvalds/linux/blob/master/arch/mips/mm/mmap.c#L71
-
-Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/394]
-
-Signed-off-by: Dengke Du
- testcases/kernel/syscalls/mmap/mmap15.c | 5 +
- 1 file changed, 5 insertions(+)
-
-diff --git a/testcases/kernel/syscalls/mmap/mmap15.c
b/testcases/kernel/syscalls/mmap/mmap15.c
-index eff27d6..a10b5c7 100644
a/testcases/kernel/syscalls/mmap/mmap15.c
-+++ b/testcases/kernel/syscalls/mmap/mmap15.c
-@@ -81,9 +81,14 @@ int main(int ac, char **av)
- }
-
- if (errno != ENOMEM) {
-+#ifdef __mips__
-+ tst_resm(TPASS | TERRNO, "mmap into high region "
-+ "failed as expected");
-+#else
- tst_resm(TFAIL | TERRNO, "mmap into high region "
-"failed unexpectedly - expect "
-"errno=ENOMEM, got");
-+#endif
- } else {
- tst_resm(TPASS | TERRNO, "mmap into high region "
-"failed as expected");
---
-2.7.4
-
diff --git a/meta/recipes-extended/ltp/ltp/0001-statx-fix-compile-errors.patch
b/meta/recipes-extended/ltp/ltp/0001-statx-fix-compile-errors.patch
new file mode 100644
index 00..53076a6a0f
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-statx-fix-compile-errors.patch
@@ -0,0 +1,35 @@
+From a945304b6a2286d0665c70250cc5475eb07fd21e Mon Sep 17 00:00:00 2001
+From: Thadeu Lima de Souza Cascardo
+Date: Wed, 26 Sep 2018 11:15:45 -0300
+Subject: [PATCH] statx: fix compile errors
+
+struct statx is only defined in sys/stat.h when _GNU_SOURCE is defined.
+The testcases do define _GNU_SOURCE, but not the m4 struct check.
+
+Signed-off-by: Thadeu Lima de Souza Cascardo
+Acked-by: Cyril Hrubis
+---
+ m4/ltp-statx.m4 | 9 +++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/m4/ltp-statx.m4 b/m4/ltp-statx.m4
+index 44303d30c..5f79a94cd 100644
+--- a/m4/ltp-statx.m4
b/m4/ltp-statx.m4
+@@ -23,6 +23,11 @@ dnl
+ AC_DEFUN([LTP_CHECK_STATX],[
+ AC_CHECK_FUNCS(statx,,,[[#include ]])
+ AC_CHECK_HEADER(linux/fs.h,,,)
+-AC_CHECK_TYPES([struct statx],,,[[#include ]])
+-AC_CHECK_TYPES([struct statx_timestamp],,,[[#include ]])
++AC_CHECK_TYPES([struct statx],,,[[
++ #define _GNU_SOURCE
++ #include
++]])
++AC_CHECK_TYPES([struct statx_timestamp],,,[[
++ #define _GNU_SOURCE
++ #include ]])
+ ])
+--
+2.19.1
+
diff --git
a/meta/recipes-extended/ltp/ltp/0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch
b/meta/recipes-extended/ltp/ltp/0039-commands-ar01-Fix-for-test-in-d
