Skip to contentSkip to conversation

rpm: upgrade to 4.15.1

PATCH In review Alexander Kanavin 7 participants 62 messages Dec 12, 2019 – Jan 1, 2020 Arm/Amlogic Meson SoC support Page 1 of 2

lore
Share & tools
lore
#0 lore raw

PATCH 1/30 rpm: upgrade to 4.15.1

Drop patches that were merged upstream.

0001-mono-find-provides-requires-do-not-use-monodis-from-.patch modifies a file that was removed upstream.

Add a 0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch as unfortunately the new parallel file classification feature from upstream trips over somewhere in libmagic when inspected files are compressed:
https://github.com/rpm-software-management/rpm/issues/756

---
 ...satisfiable-dependency-when-building.patch |  28 +-
 ...lib-rpm-as-the-installation-path-for.patch |  14 +-
 ...kage-building-into-a-separate-functi.patch |  84 -----
 ...es-requires-do-not-use-monodis-from-.patch |  58 ---
 ...-run-file-classification-in-parallel.patch |  65 ++++
 ...ry-package-creation-via-thread-pools.patch | 127 -------
 ...e-operations-over-string-pools-threa.patch | 207 -----------
 ...ove-static-local-variables-from-buil.patch | 336 ------------------
 .../rpm/{rpm_4.14.2.1.bb => rpm_4.15.1.bb}    |  15 +-
 9 files changed, 90 insertions(+), 844 deletions(-)
 delete mode 100644 meta/recipes-devtools/rpm/files/0001-Split-binary-package-building-into-a-separate-functi.patch
 delete mode 100644 meta/recipes-devtools/rpm/files/0001-mono-find-provides-requires-do-not-use-monodis-from-.patch
 create mode 100644 meta/recipes-devtools/rpm/files/0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch
 delete mode 100644 meta/recipes-devtools/rpm/files/0002-Run-binary-package-creation-via-thread-pools.patch
 delete mode 100644 meta/recipes-devtools/rpm/files/0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch
 delete mode 100644 meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch
 rename meta/recipes-devtools/rpm/{rpm_4.14.2.1.bb => rpm_4.15.1.bb} (90%)
meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch +13 -15
index 80e2f0fad70..4029233fb70 100644
@@ -1,4 +1,4 @@
-From 87cfc0db1ed6fe381a5ed5f0016d8c3344a31a11 Mon Sep 17 00:00:00 2001
+From f39c28eb52f12ae6e82db360ffd5a903ac8faca5 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Mon, 9 Jan 2017 18:52:11 +0200
 Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in
@@ -9,25 +9,23 @@ hand produces rpms that way by design.
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <[email protected]>
+
 ---
  build/pack.c | 4 ----
  1 file changed, 4 deletions(-)
 
 diff --git a/build/pack.c b/build/pack.c
-index 1261cdbba..bb2d6f4f6 100644
+index e6cec1816..810cd7351 100644
 --- a/build/pack.c
 +++ b/build/pack.c
-@@ -595,10 +595,6 @@ rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)
- 	    headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16);
- 	}
+@@ -724,10 +724,6 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch
+ 	headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16);
+     }
+ 
+-    if (cheating) {
+-	(void) rpmlibNeedsFeature(pkg, "ShortCircuited", "4.9.0-1");
+-    }
+-
+     if ((rc = getPkgFilename(pkg->header, filename)))
+ 	return rc;
  
--	if (cheating) {
--	    (void) rpmlibNeedsFeature(pkg, "ShortCircuited", "4.9.0-1");
--	}
--	
- 	{   char *binFormat = rpmGetPath("%{_rpmfilename}", NULL);
- 	    char *binRpm, *binDir;
- 	    binRpm = headerFormat(pkg->header, binFormat, &errorString);
--- 
-2.11.0
-
meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch +7 -7
index 82e7328757f..52440d68180 100644
@@ -1,4 +1,4 @@
-From bd08eb0ae1312f347f49949481daa7c923752df2 Mon Sep 17 00:00:00 2001
+From 2f3d1619b6510bc131c4375827caf912559f0fa2 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Mon, 27 Feb 2017 09:43:30 +0200
 Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 09af7c4..9bd6903 100644
+index d3aeab86e..1a1f3f91f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1055,7 +1055,7 @@ else
+@@ -1086,7 +1086,7 @@ else
      usrprefix=$prefix
  fi
  
@@ -27,10 +27,10 @@ index 09af7c4..9bd6903 100644
  
  AC_SUBST(OBJDUMP)
 diff --git a/macros.in b/macros.in
-index a3aa7a9..62cee5c 100644
+index fe9803aad..d128675bf 100644
 --- a/macros.in
 +++ b/macros.in
-@@ -970,7 +970,7 @@ package or when debugging this package.\
+@@ -985,7 +985,7 @@ package or when debugging this package.\
  %_sharedstatedir	%{_prefix}/com
  %_localstatedir		%{_prefix}/var
  %_lib			lib
@@ -40,7 +40,7 @@ index a3aa7a9..62cee5c 100644
  %_infodir		%{_datadir}/info
  %_mandir		%{_datadir}/man
 diff --git a/rpm.am b/rpm.am
-index 82c2d7c..6341b51 100644
+index 40b4ec55f..3139ce8f6 100644
 --- a/rpm.am
 +++ b/rpm.am
 @@ -1,10 +1,10 @@
@@ -55,4 +55,4 @@ index 82c2d7c..6341b51 100644
 +rpmconfigdir = $(libdir)/rpm
  
  # Libtool version (current-revision-age) for all our libraries
- rpm_version_info = 9:0:1
+ rpm_version_info = 9:1:0
meta/recipes-devtools/rpm/files/0001-Split-binary-package-building-into-a-separate-functi.patch deleted +0 -84

84 lines not on this page · raw message

meta/recipes-devtools/rpm/files/0001-mono-find-provides-requires-do-not-use-monodis-from-.patch deleted +0 -58

58 lines not on this page · raw message

meta/recipes-devtools/rpm/files/0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch new file +65 -0

65 lines not on this page · raw message

meta/recipes-devtools/rpm/files/0002-Run-binary-package-creation-via-thread-pools.patch deleted +0 -127

127 lines not on this page · raw message

meta/recipes-devtools/rpm/files/0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch deleted +0 -207

207 lines not on this page · raw message

meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch deleted +0 -336

336 lines not on this page · raw message

meta/recipes-devtools/rpm/rpm_4.15.1.bb renamed from meta/recipes-devtools/rpm/rpm_4.14.2.1.bb +5 -10
similarity index 90%
rename from meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
rename to meta/recipes-devtools/rpm/rpm_4.15.1.bb
index c37330eb4c6..5896e78e734 100644
@@ -24,7 +24,7 @@ HOMEPAGE = "http://www.rpm.org"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c0bf017c0fd1920e6158a333acabfd4a"
 
-SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.14.x \
+SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.15.x \
            file://0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch \
            file://0001-Do-not-read-config-files-from-HOME.patch \
            file://0001-When-cross-installing-execute-package-scriptlets-wit.patch \
@@ -34,18 +34,14 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.14.x \
            file://0001-Fix-build-with-musl-C-library.patch \
            file://0001-Add-a-color-setting-for-mips64_n32-binaries.patch \
            file://0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch \
-           file://0001-Split-binary-package-building-into-a-separate-functi.patch \
-           file://0002-Run-binary-package-creation-via-thread-pools.patch \
-           file://0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch \
-           file://0004-build-pack.c-remove-static-local-variables-from-buil.patch \
            file://0001-perl-disable-auto-reqs.patch \
            file://0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch \
            file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \
-           file://0001-mono-find-provides-requires-do-not-use-monodis-from-.patch \
+           file://0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch \
            "
 
 PE = "1"
-SRCREV = "4a9440006398646583f0d9ae1837dad2875013aa"
+SRCREV = "ab2179452c5be276a6b96c591afded485c7e58c3"
 
 S = "${WORKDIR}/git"
 
@@ -59,7 +55,7 @@ export PYTHON_ABI
 EXTRA_AUTORECONF_append = " --exclude=gnu-configize"
 
 EXTRA_OECONF_append = " --without-lua --enable-python"
-EXTRA_OECONF_append_libc-musl = " --disable-nls"
+EXTRA_OECONF_append_libc-musl = " --disable-nls --disable-openmp"
 
 # --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs
 #
@@ -125,8 +121,7 @@ do_install_append () {
 	    ${D}/${libdir}/rpm/macros
 
 	sed -i -e 's|/usr/bin/python|${USRBINPATH}/env ${PYTHON_PN}|' \
-	    ${D}${libdir}/rpm/pythondistdeps.py \
-	    ${D}${libdir}/rpm/python-macro-helper
+	    ${D}${libdir}/rpm/pythondistdeps.py
 }
 
 FILES_${PN} += "${libdir}/rpm-plugins/*.so \
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/30 gettext-minimal-native: update to 0.20.1

Rather than update a tarball, I took m4 files directly from an install of 0.20.1.

The patch is dropped as guile has long been removed from oe-core.

---
 ...H-Disable-the-test-to-convert-euc-jp.patch |  38 -
 .../gettext-minimal-0.19.8.1/aclocal.tgz      | Bin 40014 -> 0 bytes
 .../COPYING                                   |   0
 .../Makefile.in.in                            | 124 +--
 .../gettext-minimal-0.20.1/aclocal/gettext.m4 | 386 +++++++++
 .../aclocal/host-cpu-c-abi.m4                 | 644 +++++++++++++++
 .../gettext-minimal-0.20.1/aclocal/iconv.m4   | 288 +++++++
 .../aclocal/intlmacosx.m4                     |  72 ++
 .../gettext-minimal-0.20.1/aclocal/lib-ld.m4  | 168 ++++
 .../aclocal/lib-link.m4                       | 774 ++++++++++++++++++
 .../aclocal/lib-prefix.m4                     | 249 ++++++
 .../gettext-minimal-0.20.1/aclocal/nls.m4     |  32 +
 .../gettext-minimal-0.20.1/aclocal/po.m4      | 450 ++++++++++
 .../aclocal/progtest.m4                       |  91 ++
 .../config.rpath                              |   2 +-
 .../remove-potcdate.sin                       |   8 +-
 ....1.bb => gettext-minimal-native_0.20.1.bb} |   5 +-
 17 files changed, 3236 insertions(+), 95 deletions(-)
 delete mode 100644 meta/recipes-core/gettext/gettext-minimal-0.19.8.1/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
 delete mode 100644 meta/recipes-core/gettext/gettext-minimal-0.19.8.1/aclocal.tgz
 rename meta/recipes-core/gettext/{gettext-minimal-0.19.8.1 => gettext-minimal-0.20.1}/COPYING (100%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.19.8.1 => gettext-minimal-0.20.1}/Makefile.in.in (78%)
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/gettext.m4
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/host-cpu-c-abi.m4
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/iconv.m4
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/intlmacosx.m4
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-ld.m4
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-link.m4
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-prefix.m4
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/nls.m4
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/po.m4
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/progtest.m4
 rename meta/recipes-core/gettext/{gettext-minimal-0.19.8.1 => gettext-minimal-0.20.1}/config.rpath (99%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.19.8.1 => gettext-minimal-0.20.1}/remove-potcdate.sin (50%)
 rename meta/recipes-core/gettext/{gettext-minimal-native_0.19.8.1.bb => gettext-minimal-native_0.20.1.bb} (86%)
meta/recipes-core/gettext/gettext-minimal-0.19.8.1/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch deleted +0 -38
deleted file mode 100644
index 29ef2a5a63d..00000000000
@@ -1,38 +0,0 @@
-[PATCH] Disable the test to convert euc-jp
-
-Remove the test "Test against HP-UX 11.11 bug:
-No converter from EUC-JP to UTF-8 is provided"
-since we don't support HP-UX and if the euc-jp is not
-installed on the host, the dependence will be built without
-iconv support and will cause guile-native building fail.
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Roy Li <[email protected]>
----
- iconv.m4 | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/iconv.m4 b/iconv.m4
-index 4e37363..35f54bd 100644
---- a/iconv.m4
-+++ b/iconv.m4
-@@ -165,6 +165,7 @@ AC_DEFUN([AM_ICONV_LINK],
-       }
-   }
- #endif
-+#if 0
-   /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
-      provided.  */
-   if (/* Try standardized names.  */
-@@ -176,6 +177,7 @@ AC_DEFUN([AM_ICONV_LINK],
-       /* Try HP-UX names.  */
-       && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-     result |= 16;
-+#endif
-   return result;
- ]])],
-           [am_cv_func_iconv_works=yes], ,
--- 
-2.0.1
-
meta/recipes-core/gettext/gettext-minimal-0.19.8.1/aclocal.tgz deleted binary +0 -0
deleted file mode 100644
index 9b2d1f561d734df608c9c7a6e29e08131296a5fd..0000000000000000000000000000000000000000
GIT binary patch
meta/recipes-core/gettext/gettext-minimal-0.20.1/COPYING renamed from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/COPYING +0 -0
similarity index 100%
rename from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/COPYING
rename to meta/recipes-core/gettext/gettext-minimal-0.20.1/COPYING
meta/recipes-core/gettext/gettext-minimal-0.20.1/Makefile.in.in renamed from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/Makefile.in.in +72 -52

244 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/gettext.m4 new file +386 -0

386 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/host-cpu-c-abi.m4 new file +644 -0

644 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/iconv.m4 new file +288 -0

288 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/intlmacosx.m4 new file +72 -0

72 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-ld.m4 new file +168 -0

168 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-link.m4 new file +774 -0

774 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-prefix.m4 new file +249 -0

249 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/nls.m4 new file +32 -0
new file mode 100644
index 00000000000..b62f6148570
@@ -0,0 +1,32 @@
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019 Free Software
+dnl Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <[email protected]>, 1995-2000.
+dnl   Bruno Haible <[email protected]>, 2000-2003.
+
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_NLS],
+[
+  AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  AC_ARG_ENABLE([nls],
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)
+  AC_MSG_RESULT([$USE_NLS])
+  AC_SUBST([USE_NLS])
+])
meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/po.m4 new file +450 -0

105 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/progtest.m4 new file +91 -0

91 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.20.1/config.rpath renamed from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/config.rpath +1 -1
similarity index 99%
rename from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/config.rpath
rename to meta/recipes-core/gettext/gettext-minimal-0.20.1/config.rpath
index 98183ff2f2e..be202c1a9e7 100755

Lines of this file are not shown. View the raw message.

meta/recipes-core/gettext/gettext-minimal-0.20.1/remove-potcdate.sin renamed from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/remove-potcdate.sin +7 -1
similarity index 50%
rename from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/remove-potcdate.sin
rename to meta/recipes-core/gettext/gettext-minimal-0.20.1/remove-potcdate.sin
index 2436c49e786..8c70dfbf148 100644

Lines of this file are not shown. View the raw message.

meta/recipes-core/gettext/gettext-minimal-native_0.20.1.bb renamed from meta/recipes-core/gettext/gettext-minimal-native_0.19.8.1.bb +2 -3
similarity index 86%
rename from meta/recipes-core/gettext/gettext-minimal-native_0.19.8.1.bb
rename to meta/recipes-core/gettext/gettext-minimal-native_0.20.1.bb
index 26ff19975d2..7a4dcbec57b 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.17.1

Part of the diff is not shown here. View the raw message.

#2 lore raw

PATCH 3/30 gettext: update to 0.20.1

In reply to Alexander Kanavin

License-Update: URLs changed from http to https

---
 .../gettext-0.19.8.1/fix-CVE-2018-18751.patch | 141 ----
 .../gettext/gettext-0.19.8.1/parallel.patch   |  23 -
 .../gettext-0.19.8.1/use-pkgconfig.patch      | 321 --------
 .../add-with-bisonlocaledir.patch             |   0
 ...nt.c-timsort.h-fix-formatting-issues.patch |  30 +-
 .../gettext/gettext-0.20.1/parallel.patch     |  32 +
 .../run-ptest                                 |   0
 .../serial-tests-config.patch                 |  26 +-
 .../gettext-0.20.1/use-pkgconfig.patch        | 713 ++++++++++++++++++
 ...{gettext_0.19.8.1.bb => gettext_0.20.1.bb} |  23 +-
 10 files changed, 775 insertions(+), 534 deletions(-)
 delete mode 100644 meta/recipes-core/gettext/gettext-0.19.8.1/fix-CVE-2018-18751.patch
 delete mode 100644 meta/recipes-core/gettext/gettext-0.19.8.1/parallel.patch
 delete mode 100644 meta/recipes-core/gettext/gettext-0.19.8.1/use-pkgconfig.patch
 rename meta/recipes-core/gettext/{gettext-0.19.8.1 => gettext-0.20.1}/add-with-bisonlocaledir.patch (100%)
 rename meta/recipes-core/gettext/{gettext-0.19.8.1 => gettext-0.20.1}/cr-statement.c-timsort.h-fix-formatting-issues.patch (68%)
 create mode 100644 meta/recipes-core/gettext/gettext-0.20.1/parallel.patch
 rename meta/recipes-core/gettext/{gettext-0.19.8.1 => gettext-0.20.1}/run-ptest (100%)
 rename meta/recipes-core/gettext/{gettext-0.19.8.1 => gettext-0.20.1}/serial-tests-config.patch (75%)
 create mode 100644 meta/recipes-core/gettext/gettext-0.20.1/use-pkgconfig.patch
 rename meta/recipes-core/gettext/{gettext_0.19.8.1.bb => gettext_0.20.1.bb} (94%)
meta/recipes-core/gettext/gettext-0.19.8.1/fix-CVE-2018-18751.patch deleted +0 -141
deleted file mode 100644
index 6dfe200d654..00000000000
@@ -1,141 +0,0 @@
-Upstream-Status: Backport [https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commit;h=dce3a16]
-CVE: CVE-2018-18751
-
-Signed-off-by: Kai Kang <[email protected]>
-
-From dce3a16e5e9368245735e29bf498dcd5e3e474a4 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <[email protected]>
-Date: Thu, 15 Sep 2016 13:57:24 +0200
-Subject: [PATCH] xgettext: Fix crash with *.po file input
-
-When xgettext was given two *.po files with the same msgid_plural, it
-crashed with double-free.  Problem reported by Davlet Panech in:
-http://lists.gnu.org/archive/html/bug-gettext/2016-09/msg00001.html
-* gettext-tools/src/po-gram-gen.y: Don't free msgid_pluralform after
-calling do_callback_message, assuming that it takes ownership.
-* gettext-tools/src/read-catalog.c (default_add_message): Free
-msgid_plural after calling message_alloc.
-* gettext-tools/tests/xgettext-po-2: New file.
-* gettext-tools/tests/Makefile.am (TESTS): Add new test.
----
- gettext-tools/src/po-gram-gen.y   | 13 ++++-----
- gettext-tools/src/read-catalog.c  |  2 ++
- gettext-tools/tests/Makefile.am   |  2 +-
- gettext-tools/tests/xgettext-po-2 | 55 +++++++++++++++++++++++++++++++++++++++
- 4 files changed, 63 insertions(+), 9 deletions(-)
- create mode 100755 gettext-tools/tests/xgettext-po-2
-
-diff --git a/gettext-tools/src/po-gram-gen.y b/gettext-tools/src/po-gram-gen.y
-index becf5e6..4428e77 100644
---- a/gettext-tools/src/po-gram-gen.y
-+++ b/gettext-tools/src/po-gram-gen.y
-@@ -221,14 +221,11 @@ message
-                   check_obsolete ($1, $3);
-                   check_obsolete ($1, $4);
-                   if (!$1.obsolete || pass_obsolete_entries)
--                    {
--                      do_callback_message ($1.ctxt, string2, &$1.pos, $3.string,
--                                           $4.rhs.msgstr, $4.rhs.msgstr_len, &$4.pos,
--                                           $1.prev_ctxt,
--                                           $1.prev_id, $1.prev_id_plural,
--                                           $1.obsolete);
--                      free ($3.string);
--                    }
-+                    do_callback_message ($1.ctxt, string2, &$1.pos, $3.string,
-+                                         $4.rhs.msgstr, $4.rhs.msgstr_len, &$4.pos,
-+                                         $1.prev_ctxt,
-+                                         $1.prev_id, $1.prev_id_plural,
-+                                         $1.obsolete);
-                   else
-                     {
-                       free_message_intro ($1);
-diff --git a/gettext-tools/src/read-catalog.c b/gettext-tools/src/read-catalog.c
-index 571d18e..6af6d20 100644
---- a/gettext-tools/src/read-catalog.c
-+++ b/gettext-tools/src/read-catalog.c
-@@ -397,6 +397,8 @@ default_add_message (default_catalog_reader_ty *this,
-          appropriate.  */
-       mp = message_alloc (msgctxt, msgid, msgid_plural, msgstr, msgstr_len,
-                           msgstr_pos);
-+      if (msgid_plural != NULL)
-+        free (msgid_plural);
-       mp->prev_msgctxt = prev_msgctxt;
-       mp->prev_msgid = prev_msgid;
-       mp->prev_msgid_plural = prev_msgid_plural;
-diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
-index 23b09b1..0dfb4d8 100644
---- a/gettext-tools/tests/Makefile.am
-+++ b/gettext-tools/tests/Makefile.am
-@@ -95,7 +95,7 @@ TESTS = gettext-1 gettext-2 gettext-3 gettext-4 gettext-5 gettext-6 gettext-7 \
- 	xgettext-perl-1 xgettext-perl-2 xgettext-perl-3 xgettext-perl-4 \
- 	xgettext-perl-5 xgettext-perl-6 xgettext-perl-7 xgettext-perl-8 \
- 	xgettext-php-1 xgettext-php-2 xgettext-php-3 xgettext-php-4 \
--	xgettext-po-1 \
-+	xgettext-po-1 xgettext-po-2 \
- 	xgettext-properties-1 \
- 	xgettext-python-1 xgettext-python-2 xgettext-python-3 \
- 	xgettext-python-4 \
-diff --git a/gettext-tools/tests/xgettext-po-2 b/gettext-tools/tests/xgettext-po-2
-new file mode 100755
-index 0000000..c4bd9d0
---- /dev/null
-+++ b/gettext-tools/tests/xgettext-po-2
-@@ -0,0 +1,55 @@
-+#! /bin/sh
-+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
-+
-+# Test PO extractors with multiple input files.
-+
-+cat <<EOF > xg-po-2-1.po
-+msgid "first msgid"
-+msgid_plural "first msgid (plural)"
-+msgstr[0] ""
-+msgstr[1] ""
-+
-+msgid "second msgid"
-+msgid_plural "second msgid (plural)"
-+msgstr[0] ""
-+msgstr[1] ""
-+EOF
-+
-+cat <<EOF > xg-po-2-2.po
-+msgid "third msgid"
-+msgid_plural "third msgid (plural)"
-+msgstr[0] ""
-+msgstr[1] ""
-+
-+msgid "second msgid"
-+msgid_plural "second msgid (plural)"
-+msgstr[0] ""
-+msgstr[1] ""
-+EOF
-+
-+: ${XGETTEXT=xgettext}
-+${XGETTEXT} --omit-header xg-po-2-1.po xg-po-2-2.po -o xg-po-2.tmp.po || Exit 1
-+LC_ALL=C tr -d '\r' < xg-po-2.tmp.po > xg-po-2.po || Exit 1
-+
-+cat <<EOF > xg-po-2.ok
-+msgid "first msgid"
-+msgid_plural "first msgid (plural)"
-+msgstr[0] ""
-+msgstr[1] ""
-+
-+msgid "second msgid"
-+msgid_plural "second msgid (plural)"
-+msgstr[0] ""
-+msgstr[1] ""
-+
-+msgid "third msgid"
-+msgid_plural "third msgid (plural)"
-+msgstr[0] ""
-+msgstr[1] ""
-+EOF
-+
-+: ${DIFF=diff}
-+${DIFF} xg-po-2.ok xg-po-2.po
-+result=$?
-+
-+exit $result
--- 
-1.9.1
-
meta/recipes-core/gettext/gettext-0.19.8.1/parallel.patch deleted +0 -23
deleted file mode 100644
index c8e2c94af0e..00000000000
@@ -1,23 +0,0 @@
-instal libgettextlib.a before removing it
-
-In a multiple job build, Makefile can simultaneously
-be installing and removing libgettextlib.a.  We serialize
-the operations.
-
-Upstream-Status: Pending
-
-Signed-off-by: Joe Slater <[email protected]>
-
---- a/gettext-tools/gnulib-lib/Makefile.am
-+++ b/gettext-tools/gnulib-lib/Makefile.am
-@@ -57,6 +57,10 @@ endif
- # Rules generated and collected by gnulib-tool.
- include Makefile.gnulib
- 
-+# defined in Makefile.gnulib but missing this dependency
-+#
-+install-exec-clean: install-libLTLIBRARIES
-+
- # Which classes to export from the shared library.
- MOOPPFLAGS += --dllexport=styled_ostream
- 
meta/recipes-core/gettext/gettext-0.19.8.1/use-pkgconfig.patch deleted +0 -321

321 lines not on this page · raw message

meta/recipes-core/gettext/gettext-0.20.1/add-with-bisonlocaledir.patch renamed from meta/recipes-core/gettext/gettext-0.19.8.1/add-with-bisonlocaledir.patch +0 -0
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.19.8.1/add-with-bisonlocaledir.patch
rename to meta/recipes-core/gettext/gettext-0.20.1/add-with-bisonlocaledir.patch
meta/recipes-core/gettext/gettext-0.20.1/cr-statement.c-timsort.h-fix-formatting-issues.patch renamed from meta/recipes-core/gettext/gettext-0.19.8.1/cr-statement.c-timsort.h-fix-formatting-issues.patch +7 -23
similarity index 68%
rename from meta/recipes-core/gettext/gettext-0.19.8.1/cr-statement.c-timsort.h-fix-formatting-issues.patch
rename to meta/recipes-core/gettext/gettext-0.20.1/cr-statement.c-timsort.h-fix-formatting-issues.patch
index 6af16041987..0561ed7d32c 100644
@@ -1,4 +1,4 @@
-From e546de65a333789e83f5485757967cee29ee3681 Mon Sep 17 00:00:00 2001
+From f6245ef5530fc37a6243e798df34162fbbeab6f0 Mon Sep 17 00:00:00 2001
 From: Robert Yang <[email protected]>
 Date: Sun, 19 Feb 2017 23:32:46 -0800
 Subject: [PATCH] cr-statement.c/timsort.h: fix formatting issues
@@ -15,15 +15,15 @@ gettext-tools/gnulib-lib/libxml/timsort.h:326:80: warning: format '%lu' expects
 Upstream-Status: Pending
 
 Signed-off-by: Robert Yang <[email protected]>
+
 ---
- gettext-tools/gnulib-lib/libcroco/cr-statement.c | 10 +++++-----
- gettext-tools/gnulib-lib/libxml/timsort.h        |  2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ libtextstyle/lib/libcroco/cr-statement.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/gettext-tools/gnulib-lib/libcroco/cr-statement.c b/gettext-tools/gnulib-lib/libcroco/cr-statement.c
+diff --git a/libtextstyle/lib/libcroco/cr-statement.c b/libtextstyle/lib/libcroco/cr-statement.c
 index 617520f..100104b 100644
---- a/gettext-tools/gnulib-lib/libcroco/cr-statement.c
-+++ b/gettext-tools/gnulib-lib/libcroco/cr-statement.c
+--- a/libtextstyle/lib/libcroco/cr-statement.c
++++ b/libtextstyle/lib/libcroco/cr-statement.c
 @@ -2607,7 +2607,7 @@ cr_statement_dump_ruleset (CRStatement * a_this, FILE * a_fp, glong a_indent)
          g_return_if_fail (a_fp && a_this);
          str = cr_statement_ruleset_to_string (a_this, a_indent);
@@ -69,19 +69,3 @@ index 617520f..100104b 100644
                  g_free (str) ;
                  str = NULL ;
          }
-diff --git a/gettext-tools/gnulib-lib/libxml/timsort.h b/gettext-tools/gnulib-lib/libxml/timsort.h
-index 795f272..443918a 100644
---- a/gettext-tools/gnulib-lib/libxml/timsort.h
-+++ b/gettext-tools/gnulib-lib/libxml/timsort.h
-@@ -323,7 +323,7 @@ static void TIM_SORT_RESIZE(TEMP_STORAGE_T *store, const size_t new_size)
-     SORT_TYPE *tempstore = (SORT_TYPE *)realloc(store->storage, new_size * sizeof(SORT_TYPE));
-     if (tempstore == NULL)
-     {
--      fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size);
-+      fprintf(stderr, "Error allocating temporary storage for tim sort: need %zu bytes", sizeof(SORT_TYPE) * new_size);
-       exit(1);
-     }
-     store->storage = tempstore;
--- 
-2.10.2
-
meta/recipes-core/gettext/gettext-0.20.1/parallel.patch new file +32 -0
new file mode 100644
index 00000000000..d96a376b7d1
@@ -0,0 +1,32 @@
+From 4a2a0a93b469093b60ffd0bec55d33d1e03d4713 Mon Sep 17 00:00:00 2001
+From: Joe Slater <[email protected]>
+Date: Thu, 7 Jun 2012 16:37:01 -0700
+Subject: [PATCH] instal libgettextlib.a before removing it
+
+In a multiple job build, Makefile can simultaneously
+be installing and removing libgettextlib.a.  We serialize
+the operations.
+
+Upstream-Status: Pending
+
+Signed-off-by: Joe Slater <[email protected]>
+
+---
+ gettext-tools/gnulib-lib/Makefile.am | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/gettext-tools/gnulib-lib/Makefile.am b/gettext-tools/gnulib-lib/Makefile.am
+index 2126699..d2dd7e4 100644
+--- a/gettext-tools/gnulib-lib/Makefile.am
++++ b/gettext-tools/gnulib-lib/Makefile.am
+@@ -58,6 +58,10 @@ endif
+ # Rules generated and collected by gnulib-tool.
+ include Makefile.gnulib
+ 
++# defined in Makefile.gnulib but missing this dependency
++#
++install-exec-clean: install-libLTLIBRARIES
++
+ # OS/2 does not support a DLL name longer than 8 characters.
+ if OS2
+ libgettextlib_la_LDFLAGS += -os2dllname gtlib
meta/recipes-core/gettext/gettext-0.20.1/run-ptest renamed from meta/recipes-core/gettext/gettext-0.19.8.1/run-ptest +0 -0
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.19.8.1/run-ptest
rename to meta/recipes-core/gettext/gettext-0.20.1/run-ptest
meta/recipes-core/gettext/gettext-0.20.1/serial-tests-config.patch renamed from meta/recipes-core/gettext/gettext-0.19.8.1/serial-tests-config.patch +12 -14
similarity index 75%
rename from meta/recipes-core/gettext/gettext-0.19.8.1/serial-tests-config.patch
rename to meta/recipes-core/gettext/gettext-0.20.1/serial-tests-config.patch
index 31ff9138a91..93f7c03334a 100644
@@ -1,4 +1,4 @@
-From c4b1f3a0c7b7c40b343be9b95deb84e0485643be Mon Sep 17 00:00:00 2001
+From ed64a5724ef7d6eb4e9a876f817ea266a536e195 Mon Sep 17 00:00:00 2001
 From: "Hongjun.Yang" <[email protected]>
 Date: Thu, 28 Jul 2016 12:36:15 +0800
 Subject: [PATCH] fix for ptest
@@ -8,6 +8,7 @@ Add serial-tests support, ptest need it
 Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Changqing Li <[email protected]>
+
 ---
  configure.ac                 | 2 +-
  gettext-runtime/configure.ac | 2 +-
@@ -15,24 +16,24 @@ Signed-off-by: Changqing Li <[email protected]>
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 5e996fa..880581f 100644
+index 38db6fd..f019ae0 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -23,7 +23,7 @@ AC_INIT([gettext],
- 	[[email protected]])
+@@ -22,7 +22,7 @@ AC_INIT([gettext],
+ 	[[email protected]])
  AC_CONFIG_SRCDIR([gettext-tools/src/msgfmt.c])
  AC_CONFIG_AUX_DIR([build-aux])
--AM_INIT_AUTOMAKE([1.13 silent-rules parallel-tests dist-xz dist-lzip])
-+AM_INIT_AUTOMAKE([1.13 silent-rules serial-tests dist-xz dist-lzip])
+-AM_INIT_AUTOMAKE([1.13 silent-rules parallel-tests tar-ustar])
++AM_INIT_AUTOMAKE([1.13 silent-rules serial-tests tar-ustar])
  
  dnl Override automake's tar command used for creating distributions.
- am__tar='${AMTAR} chof - --owner=root --group=root "$$tardir"'
+ am__tar='${AMTAR} chf - --format=ustar --owner=root --group=root "$$tardir"'
 diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
-index e9299b6..d4f5528 100644
+index de203e7..138a07f 100644
 --- a/gettext-runtime/configure.ac
 +++ b/gettext-runtime/configure.ac
 @@ -22,7 +22,7 @@ AC_INIT([gettext-runtime],
- 	[[email protected]])
+ 	[[email protected]])
  AC_CONFIG_SRCDIR([intl/dcigettext.c])
  AC_CONFIG_AUX_DIR([../build-aux])
 -AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
@@ -41,11 +42,11 @@ index e9299b6..d4f5528 100644
  
  dnl Installation directories.
 diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
-index 920eeb6..c507434 100644
+index cf1dd73..b544d6d 100644
 --- a/gettext-tools/configure.ac
 +++ b/gettext-tools/configure.ac
 @@ -22,7 +22,7 @@ AC_INIT([gettext-tools],
- 	[[email protected]])
+ 	[[email protected]])
  AC_CONFIG_SRCDIR([src/msgfmt.c])
  AC_CONFIG_AUX_DIR([../build-aux])
 -AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
@@ -53,6 +54,3 @@ index 920eeb6..c507434 100644
  AC_CONFIG_HEADERS([config.h])
  
  dnl Installation directories.
--- 
-2.1.4
-
meta/recipes-core/gettext/gettext-0.20.1/use-pkgconfig.patch new file +713 -0

713 lines not on this page · raw message

meta/recipes-core/gettext/gettext_0.20.1.bb renamed from meta/recipes-core/gettext/gettext_0.19.8.1.bb +11 -12
similarity index 94%
rename from meta/recipes-core/gettext/gettext_0.19.8.1.bb
rename to meta/recipes-core/gettext/gettext_0.20.1.bb
index 30121ad23e1..fc05ef2e0a3 100644
@@ -6,7 +6,7 @@ a few stand-alone programs to massage in various ways the sets of translatable a
 HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
 SECTION = "libs"
 LICENSE = "GPLv3+ & LGPL-2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e"
 
 # Because po-gram-gen.y has been modified by fix-CVE-2018-18751.patch,
 # it requires yacc which provided by bison-native
@@ -17,17 +17,16 @@ PROVIDES = "virtual/libintl virtual/gettext"
 PROVIDES_class-native = "virtual/gettext-native"
 RCONFLICTS_${PN} = "proxy-libintl"
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
-	   file://parallel.patch \
-	   file://add-with-bisonlocaledir.patch \
-	   file://cr-statement.c-timsort.h-fix-formatting-issues.patch \
-	   file://use-pkgconfig.patch \
-	   file://fix-CVE-2018-18751.patch \
-	   file://run-ptest \
-	   file://serial-tests-config.patch \
-"
+           file://parallel.patch \
+           file://add-with-bisonlocaledir.patch \
+           file://cr-statement.c-timsort.h-fix-formatting-issues.patch \
+           file://use-pkgconfig.patch \
+           file://run-ptest \
+           file://serial-tests-config.patch \
+           "
 
-SRC_URI[md5sum] = "97e034cf8ce5ba73a28ff6c3c0638092"
-SRC_URI[sha256sum] = "ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43"
+SRC_URI[md5sum] = "bb5b0c0caa028105f3ca1905ddc306e2"
+SRC_URI[sha256sum] = "66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c"
 
 inherit autotools texinfo pkgconfig ptest
 
@@ -127,7 +126,7 @@ do_install_append_class-native () {
 	rm ${D}${datadir}/gettext/po/remove-potcdate.sin
 
         create_wrapper ${D}${bindir}/msgfmt \
-                GETTEXTDATADIR="${STAGING_DATADIR_NATIVE}/gettext-0.19.8/"
+                GETTEXTDATADIR="${STAGING_DATADIR_NATIVE}/gettext-0.20/"
 
 }
 
Signature · 1 line
2.17.1
#3 lore raw

Re: [PATCH 03/30] gettext: update to 0.20.1

Quoted 2 lines · Alexander Kanavin

License-Update: URLs changed from http to https

In an effort to try and get to the bottom of which patches cause which failures I ran the gettext updates pieces by themselves (patches 2-5).

systemtap fails:

https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/1354

the main a-full build in case there are other issues:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/580

I know there is a fix for the check-layer/mingw pieces in master-next of meta-mingw, just forgot to set that branch.

Cheers,

Richard

#4 lore raw

Re: [PATCH 03/30] gettext: update to 0.20.1

Quoted 9 lines · Richard Purdie
Quoted 2 lines · Alexander Kanavin

License-Update: URLs changed from http to https

In an effort to try and get to the bottom of which patches cause which failures I ran the gettext updates pieces by themselves (patches 2-5).

systemtap fails:

Quoted 9 lines

https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/1354

the main a-full build in case there are other issues:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/580

I know there is a fix for the check-layer/mingw pieces in master-next of meta-mingw, just forgot to set that branch.

Thanks, there are also failures in meta-gpl2, for which I will also make patches.
Systemtap issue is now fixed.

Alex

#5 lore raw

Re: [PATCH 03/30] gettext: update to 0.20.1

Quoted 12 lines · Alexander Kanavin

In an effort to try and get to the bottom of which patches cause which

Quoted 10 lines

failures I ran the gettext updates pieces by themselves (patches 2-5).

systemtap fails:

https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/1354

the main a-full build in case there are other issues:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/580

Quoted 8 lines
Quoted 3 lines

I know there is a fix for the check-layer/mingw pieces in master-next of meta-mingw, just forgot to set that branch.

Thanks, there are also failures in meta-gpl2, for which I will also make patches.
Systemtap issue is now fixed.

I have now sent the meta-gplv2 patches to yocto@ and the patchset for gettext+systemtap here.

Alex

#6 lore raw

Re: [PATCH 03/30] gettext: update to 0.20.1

Quoted 19 lines · Alexander Kanavin
Quoted 17 lines · Alexander Kanavin
Quoted 15 lines

In an effort to try and get to the bottom of which patches cause which failures I ran the gettext updates pieces by themselves (patches 2-5).

systemtap fails:

https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/1354

the main a-full build in case there are other issues:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/580

I know there is a fix for the check-layer/mingw pieces in master-next of meta-mingw, just forgot to set that branch.

Quoted 7 lines
Quoted 2 lines

Thanks, there are also failures in meta-gpl2, for which I will also make patches. Systemtap issue is now fixed.

I have now sent the meta-gplv2 patches to yocto@ and the patchset for gettext+systemtap here.

Alex

few meta-oe failures with poky/master-next

https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/173/steps/8/logs/step1b

#7 lore raw

Re: [PATCH 03/30] gettext: update to 0.20.1

hddtemp is dead upstream and hasn't seen an upstream update in 14 years, so prime candidate for removal.

gtkperf is similarly ancient, and gtk2 only.

netcat is just as ancient, and superseded by netcat-openbsd.

A patch for the other three (sharutils/indent/enscript) is now on the oe-devel list.

Alex

Quoted 37 lines · Khem Raj
Quoted 2 lines · Alexander Kanavin

On Mon, 16 Dec 2019 at 14:25, Alexander Kanavin <[email protected]>

Quoted 11 lines · wrote:
Quoted 11 lines
Quoted 11 lines

In an effort to try and get to the bottom of which patches cause which failures I ran the gettext updates pieces by themselves (patches 2-5).

systemtap fails:

https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/1354

the main a-full build in case there are other issues:

Quoted 7 lines
Quoted 7 lines
Quoted 4 lines

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/580

I know there is a fix for the check-layer/mingw pieces in master-next of meta-mingw, just forgot to set that branch.

Thanks, there are also failures in meta-gpl2, for which I will also

make patches.

Quoted 4 lines
Quoted 1 line

Systemtap issue is now fixed.

I have now sent the meta-gplv2 patches to yocto@ and the patchset for

gettext+systemtap here.

Quoted 2 lines

Alex

few meta-oe failures with poky/master-next

https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/173/steps/8/logs/step1b

#8 lore raw

Re: [PATCH 03/30] gettext: update to 0.20.1

Quoted 9 lines · Alexander Kanavin

hddtemp is dead upstream and hasn't seen an upstream update in 14 years, so prime candidate for removal.

gtkperf is similarly ancient, and gtk2 only.

netcat is just as ancient, and superseded by netcat-openbsd.

A patch for the other three (sharutils/indent/enscript) is now on the oe-devel list.

I have fixes for hddtemp, gtkperf and netcat as well as vorbis-tools, so now we are left with one package
udisks2 which seems to be exposing a bug in gettext see

http://errors.yoctoproject.org/Errors/Details/301238/

The relevant discussion is here

https://lists.gnu.org/archive/html/bug-gettext/2019-05/msg00125.html

we need to backport

https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commitdiff;h=2336451ed68d91ff4b5ae1acbc1eca30e47a86a9

to gettext which should help above case.

I have cooked up a patch and sent it to ml, it should apply on oe-core/master-next

Please give it a whirl.

Quoted 36 lines

Alex

Quoted 33 lines · Khem Raj
Quoted 19 lines · Alexander Kanavin
Quoted 17 lines · Alexander Kanavin
Quoted 15 lines

In an effort to try and get to the bottom of which patches cause which failures I ran the gettext updates pieces by themselves (patches 2-5).

systemtap fails:

https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/1354

the main a-full build in case there are other issues:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/580

I know there is a fix for the check-layer/mingw pieces in master-next of meta-mingw, just forgot to set that branch.

Quoted 7 lines
Quoted 2 lines

Thanks, there are also failures in meta-gpl2, for which I will also make patches. Systemtap issue is now fixed.

I have now sent the meta-gplv2 patches to yocto@ and the patchset for gettext+systemtap here.

Alex

few meta-oe failures with poky/master-next

https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/173/steps/8/logs/step1b

#9 lore raw

PATCH 4/30 psmisc: revert to default autopoint exclusion

In reply to Alexander Kanavin

Otherwise, builds break with latest gettext.

---
 meta/recipes-extended/psmisc/psmisc.inc | 1 -
 1 file changed, 1 deletion(-)
meta/recipes-extended/psmisc/psmisc.inc +0 -1
index 594a10cf222..a75b04702c3 100644
@@ -19,7 +19,6 @@ inherit autotools gettext
 # Upstream has a custom autogen.sh which invokes po/update-potfiles as they 
 # don't ship a po/POTFILES.in (which is silly).  Without that file gettext 
 # doesn't believe po/ is a gettext directory and won't generate po/Makefile.
-EXTRA_AUTORECONF_remove = "--exclude=autopoint"
 do_configure_prepend() {
     ( cd ${S} && po/update-potfiles )
 }
Signature · 1 line
2.17.1
#10 lore raw

PATCH 5/30 gettext: fix failing ptests

In reply to Alexander Kanavin

Results:

pass 400
fail 0
skip 32

---
 meta/recipes-core/gettext/gettext_0.20.1.bb | 23 +++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)
meta/recipes-core/gettext/gettext_0.20.1.bb +21 -2
index fc05ef2e0a3..a6fc2195685 100644
@@ -44,6 +44,10 @@ EXTRA_OECONF += "--without-lispdir \
                 "
 EXTRA_OECONF_append_class-target = " \
                  --with-bisonlocaledir=${datadir}/locale \
+                 gt_cv_locale_fr_utf8=fr_FR \
+                 gt_cv_locale_fr=fr_FR.ISO-8859-1 \
+                 gt_cv_locale_de_utf8=de_DE \
+                 gt_cv_locale_de=de_DE.ISO-8859-1 \
 "
 
 PACKAGECONFIG ??= "croco glib libxml"
@@ -143,13 +147,17 @@ do_install_ptest() {
         mkdir -p                                        ${D}${PTEST_PATH}/src
         mkdir -p                                        ${D}${PTEST_PATH}/po
         mkdir -p                                        ${D}${PTEST_PATH}/misc
+        mkdir -p                                        ${D}${PTEST_PATH}/its
+        mkdir -p                                        ${D}${PTEST_PATH}/styles
+        cp -rf ${S}/gettext-tools/its/*                 ${D}${PTEST_PATH}/its
+        cp -rf ${S}/gettext-tools/styles/*              ${D}${PTEST_PATH}/styles
         cp -rf ${S}/gettext-tools/tests/*               ${D}${PTEST_PATH}/tests
         cp -rf ${B}/gettext-tools/tests/.libs/*         ${D}${PTEST_PATH}/tests
         cp -rf ${B}/gettext-runtime/intl/.libs/libgnuintl.so.8*         ${D}${libdir}/
         cp -rf ${B}/gettext-tools/tests/Makefile        ${D}${PTEST_PATH}/tests
+        cp -rf ${B}/gettext-tools/tests/init-env        ${D}${PTEST_PATH}/tests
         sed -i '/^Makefile:/c Makefile:'                ${D}${PTEST_PATH}/tests/Makefile
-        sed -i -e 's:CONFIG_SHELL=.*:& LOCALE_FR='fr_FR.iso88591' LOCALE_FR_UTF8='fr_FR.utf8' LOCALE_JA='ja_JP.eucjp':g' \
-            -e 's:lang-c lang-c++:lang-c++:g' ${D}${PTEST_PATH}/tests/Makefile
+        sed -i -e 's:lang-c lang-c++:lang-c++:g'        ${D}${PTEST_PATH}/tests/Makefile
         install ${S}/gettext-tools/src/msgunfmt.tcl     ${D}${PTEST_PATH}/src
         install ${S}/gettext-tools/src/project-id       ${D}${PTEST_PATH}/src
         install ${B}/gettext-runtime/src/gettext.sh     ${D}${PTEST_PATH}/src
@@ -177,8 +185,19 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = "\
     glibc-gconv-koi8-r \
     glibc-gconv-iso8859-2 \
     glibc-charmap-iso-8859-2 \
+    glibc-gconv-iso8859-1 \
+    glibc-charmap-iso-8859-1 \
     glibc-gconv-euc-kr \
     glibc-charmap-euc-kr \
+    glibc-gconv-euc-jp \
+    glibc-charmap-euc-jp \
+    locale-base-de-de \
+    locale-base-fr-fr \
+"
+
+RRECOMMENDS_${PN}-ptest_append_libc-glibc = "\
+    locale-base-de-de.iso-8859-1 \
+    locale-base-fr-fr.iso-8859-1 \
 "
 
 INSANE_SKIP_${PN}-ptest += "ldflags"
Signature · 1 line
2.17.1
#11 lore raw

PATCH 6/30 python3: update to 3.8.0

In reply to Alexander Kanavin

Drop backports, rebase other patches.

One patch I wasn't able to rebase as upstream code changed too much:
0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch Please determine if it is still needed, produce a new version, and work with upstream to get it merged.

0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch is removed as the use case (allowing python 2 and 3 to coexist in SDKs) is no longer relevant with Python 2.x reaching end of line and upstream has refactored the code making a rebase difficult. If needed, please re-add the patch to py2, rather than py3.

Python 3.8 no longer adds "m" to "3.8" in paths, so adjust the recipes and classes accordingly.

The manifest for the 3.8.0 version is updated; particularly pkgutil module is now packaged in -core (as other things in core need it); this also necessitates allowing empty -pkgutil package to avoid breakage across layers.

---
 meta/classes/python3-dir.bbclass              |   4 +-
 ...ib-termcap-to-linker-flags-to-avoid-.patch |  14 +-
 ...lib-as-location-for-site-packages-an.patch | 156 ++++++++------
 ...-detection-of-mips-architecture-for-.patch |  16 +-
 ...fig-append-STAGING_LIBDIR-python-sys.patch |   2 +-
 ...ON3HOME-is-set-use-instead-of-PYTHON.patch |  47 -----
 ...asename-to-replace-CC-for-checking-c.patch |  37 ++--
 ...runtime-test-to-get-float-byte-order.patch | 199 ------------------
 ...ssing-libraries-to-Extension-for-mul.patch |  80 -------
 ...report-missing-dependencies-for-disa.patch |  11 +-
 ...tutils-prefix-is-inside-staging-area.patch |   2 +-
 .../python3/avoid_warning_about_tkinter.patch |  33 ++-
 .../python/python3/python-config.patch        |  24 ++-
 .../python/python3/python3-manifest.json      | 106 +++++-----
 .../{python3_3.7.5.bb => python3_3.8.0.bb}    |  29 ++-
 15 files changed, 226 insertions(+), 534 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch
 delete mode 100644 meta/recipes-devtools/python/python3/0002-Don-t-do-runtime-test-to-get-float-byte-order.patch
 delete mode 100644 meta/recipes-devtools/python/python3/0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch
 rename meta/recipes-devtools/python/{python3_3.7.5.bb => python3_3.8.0.bb} (91%)
meta/classes/python3-dir.bbclass +2 -2
index 7dd130bad99..036d7140d99 100644
@@ -1,5 +1,5 @@
-PYTHON_BASEVERSION = "3.7"
-PYTHON_ABI = "m"
+PYTHON_BASEVERSION = "3.8"
+PYTHON_ABI = ""
 PYTHON_DIR = "python${PYTHON_BASEVERSION}"
 PYTHON_PN = "python3"
 PYTHON_SITEPACKAGES_DIR = "${libdir}/${PYTHON_DIR}/site-packages"
meta/recipes-devtools/python/python3/0001-Do-not-add-usr-lib-termcap-to-linker-flags-to-avoid-.patch +7 -7
index 09f279ba1d7..59592821d7f 100644
@@ -1,4 +1,4 @@
-From 23294c6ba6896115828293fdb7e67b47b38ba675 Mon Sep 17 00:00:00 2001
+From 039c53dd5baddec3359a05be0bff46a3b32bbb84 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Fri, 25 Jan 2019 19:04:13 +0100
 Subject: [PATCH] Do not add /usr/lib/termcap to linker flags to avoid host
@@ -12,14 +12,14 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  1 file changed, 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index b4357e3..fbec00d 100644
+index 20d7f35..ab18ff0 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -856,7 +856,6 @@ class PyBuildExt(build_ext):
+@@ -957,7 +957,6 @@ class PyBuildExt(build_ext):
                                                       'termcap'):
                  readline_libs.append('termcap')
-             exts.append( Extension('readline', ['readline.c'],
--                                   library_dirs=['/usr/lib/termcap'],
-                                    extra_link_args=readline_extra_link_args,
-                                    libraries=readline_libs) )
+             self.add(Extension('readline', ['readline.c'],
+-                               library_dirs=['/usr/lib/termcap'],
+                                extra_link_args=readline_extra_link_args,
+                                libraries=readline_libs))
          else:
meta/recipes-devtools/python/python3/0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch +87 -69

232 lines not on this page · raw message

meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch +8 -8
index e7af88654da..fe0aa8aabed 100644
@@ -1,4 +1,4 @@
-From 7535c39951b9d15dd64c4669092a8582ba555466 Mon Sep 17 00:00:00 2001
+From 2581ebe3cd9686089aed223651e1b8bf0b862b48 Mon Sep 17 00:00:00 2001
 From: Matthias Schoepfer <[email protected]>
 Date: Fri, 31 May 2019 15:34:34 +0200
 Subject: [PATCH] bpo-36852: proper detection of mips architecture for soft
@@ -12,15 +12,16 @@ to do this in a more autoconf/autotools manner.
 
 Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196]
 Signed-off-by: Matthias Schoepfer <[email protected]>
+
 ---
- configure.ac | 169 ++++++---------------------------------------------
- 1 file changed, 17 insertions(+), 152 deletions(-)
+ configure.ac | 171 +++++----------------------------------------------
+ 1 file changed, 17 insertions(+), 154 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index a7de901e08..a73e2de51b 100644
+index 0f85486..0ca7e24 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -727,158 +727,23 @@ fi
+@@ -704,160 +704,23 @@ fi
  MULTIARCH=$($CC --print-multiarch 2>/dev/null)
  AC_SUBST(MULTIARCH)
  
@@ -163,6 +164,8 @@ index a7de901e08..a73e2de51b 100644
 -        i386-gnu
 -#elif defined(__APPLE__)
 -        darwin
+-#elif defined(__VXWORKS__)
+-        vxworks
 -#else
 -# error unknown platform triplet
 -#endif
@@ -196,6 +199,3 @@ index a7de901e08..a73e2de51b 100644
  
  if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
    if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
--- 
-2.21.0
-
meta/recipes-devtools/python/python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch +1 -1
index 1709011be8a..ee37f6bd52d 100644
@@ -1,4 +1,4 @@
-From eff903c600f4c40f5753e95ab1557126fc6e0c9c Mon Sep 17 00:00:00 2001
+From cf676775109c0a7fb38058bb60b453ff8f1a166b Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Thu, 31 Jan 2019 16:46:30 +0100
 Subject: [PATCH] distutils/sysconfig: append
meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch deleted +0 -47

47 lines not on this page · raw message

meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch +19 -18
index a0ea897f4e8..fb10ca94b31 100644
@@ -1,4 +1,4 @@
-From 2645317fef09afe31b01bb2c1d4fe5b9afdbb11a Mon Sep 17 00:00:00 2001
+From 994783da5c21cab81b6589ed2d4275e665a946f9 Mon Sep 17 00:00:00 2001
 From: Changqing Li <[email protected]>
 Date: Mon, 22 Oct 2018 15:19:51 +0800
 Subject: [PATCH] python3: use cc_basename to replace CC for checking compiler
@@ -21,12 +21,13 @@ Signed-off-by: Li Zhou <[email protected]>
 patch originally from Li Zhou, I just rework it to new version
 
 Signed-off-by: Changqing Li <[email protected]>
+
 ---
  configure.ac | 19 ++++++++++---------
  1 file changed, 10 insertions(+), 9 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index a7de901..4a3681f 100644
+index a189d42..0f85486 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -54,6 +54,7 @@ AC_CONFIG_HEADER(pyconfig.h)
@@ -37,7 +38,7 @@ index a7de901..4a3681f 100644
  
  # pybuilddir.txt will be created by --generate-posix-vars in the Makefile
  rm -f pybuilddir.txt
-@@ -695,7 +696,7 @@ AC_MSG_RESULT($with_cxx_main)
+@@ -671,7 +672,7 @@ AC_MSG_RESULT($with_cxx_main)
  preset_cxx="$CXX"
  if test -z "$CXX"
  then
@@ -46,7 +47,7 @@ index a7de901..4a3681f 100644
          gcc)    AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;;
          cc)     AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;;
          clang|*/clang)     AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;;
-@@ -979,7 +980,7 @@ rmdir CaseSensitiveTestDir
+@@ -957,7 +958,7 @@ rmdir CaseSensitiveTestDir
  
  case $ac_sys_system in
  hp*|HP*)
@@ -55,7 +56,7 @@ index a7de901..4a3681f 100644
      cc|*/cc) CC="$CC -Ae";;
      esac;;
  esac
-@@ -1336,7 +1337,7 @@ else
+@@ -1335,7 +1336,7 @@ else
  fi],
  [AC_MSG_RESULT(no)])
  if test "$Py_LTO" = 'true' ; then
@@ -64,7 +65,7 @@ index a7de901..4a3681f 100644
      *clang*)
        AC_SUBST(LLVM_AR)
        AC_PATH_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path})
-@@ -1426,7 +1427,7 @@ then
+@@ -1425,7 +1426,7 @@ then
    fi
  fi
  LLVM_PROF_ERR=no
@@ -73,16 +74,16 @@ index a7de901..4a3681f 100644
    *clang*)
      # Any changes made here should be reflected in the GCC+Darwin case below
      PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
-@@ -1500,7 +1501,7 @@ then
-            WRAP="-fwrapv"
-         fi
+@@ -1486,7 +1487,7 @@ esac
+ # compiler and platform.  BASECFLAGS tweaks need to be made even if the
+ # user set OPT.
  
--        case $CC in
-+        case $cc_basename in
-             *clang*)
-                 cc_is_clang=1
-                 ;;
-@@ -1623,7 +1624,7 @@ yes)
+-case $CC in
++case $cc_basename in
+     *clang*)
+         cc_is_clang=1
+         ;;
+@@ -1622,7 +1623,7 @@ yes)
  
      # ICC doesn't recognize the option, but only emits a warning
      ## XXX does it emit an unused result warning and can it be disabled?
@@ -91,7 +92,7 @@ index a7de901..4a3681f 100644
      *icc*)
      ac_cv_disable_unused_result_warning=no
      ;;
-@@ -1965,7 +1966,7 @@ yes)
+@@ -1943,7 +1944,7 @@ yes)
  esac
  
  # ICC needs -fp-model strict or floats behave badly
@@ -100,7 +101,7 @@ index a7de901..4a3681f 100644
  *icc*)
      CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict"
      ;;
-@@ -2727,7 +2728,7 @@ then
+@@ -2711,7 +2712,7 @@ then
  		then
  			LINKFORSHARED="-Wl,--export-dynamic"
  		fi;;
@@ -109,7 +110,7 @@ index a7de901..4a3681f 100644
  		  *gcc*)
  		    if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
  		    then
-@@ -5429,7 +5430,7 @@ if test "$have_gcc_asm_for_x87" = yes; then
+@@ -5362,7 +5363,7 @@ if test "$have_gcc_asm_for_x87" = yes; then
      # Some versions of gcc miscompile inline asm:
      # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491
      # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html
meta/recipes-devtools/python/python3/0002-Don-t-do-runtime-test-to-get-float-byte-order.patch deleted +0 -199

199 lines not on this page · raw message

meta/recipes-devtools/python/python3/0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch deleted +0 -80

80 lines not on this page · raw message

meta/recipes-devtools/python/python3/0017-setup.py-do-not-report-missing-dependencies-for-disa.patch +6 -5
index c15295c034c..4bd98f62fd6 100644
@@ -1,4 +1,4 @@
-From e3b59cb9658e1d3efa3535840939a0fa92a70a5a Mon Sep 17 00:00:00 2001
+From a2dd127b4163aff6cc35af0d0251321964232ad4 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Mon, 7 Oct 2019 13:22:14 +0200
 Subject: [PATCH] setup.py: do not report missing dependencies for disabled
@@ -10,22 +10,23 @@ build completeness checker which relies on the report.
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <[email protected]>
+
 ---
  setup.py | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/setup.py b/setup.py
-index 4b53668..0097643 100644
+index 7691258..ec3f2a4 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -365,6 +365,10 @@ class PyBuildExt(build_ext):
+@@ -408,6 +408,10 @@ class PyBuildExt(build_ext):
                  print("%-*s   %-*s   %-*s" % (longest, e, longest, f,
                                                longest, g))
  
 +        # There is no need to report missing module dependencies,
 +        # if the modules have been disabled in the first place.
-+        missing = list(set(missing) - set(sysconf_dis))
++        self.missing = list(set(self.missing) - set(sysconf_dis))
 +
-         if missing:
+         if self.missing:
              print()
              print("Python build finished successfully!")
meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +1 -1
index d49604ba4d9..219b3551b8b 100644
@@ -1,4 +1,4 @@
-From a274ba778838824efcacaba57c415b7262f779ec Mon Sep 17 00:00:00 2001
+From 93b2c26467b0ea9a18c178e4e1371d52e917a68b Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Tue, 14 May 2013 15:00:26 -0700
 Subject: [PATCH] python3: Add target and native recipes
meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch +14 -19
index 24e67b4ca14..184540e794c 100644
@@ -1,4 +1,4 @@
-From fead48c8b501a8d7c3db21df2e599f90f38f11d3 Mon Sep 17 00:00:00 2001
+From ba7202700578d435b07cfdfb7b57e83185752800 Mon Sep 17 00:00:00 2001
 From: Andrei Gherzan <[email protected]>
 Date: Mon, 28 Jan 2019 15:57:54 +0000
 Subject: [PATCH] _tkinter module needs tk module along with tcl. tk is not yet
@@ -11,26 +11,21 @@ Also simply disable the tk module since its not in DEPENDS.
 Signed-off-by: Andrei Gherzan <[email protected]>
 
 ---
- setup.py | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
+ setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index fbec00d..b7a36a6 100644
+index ab18ff0..7691258 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -1623,10 +1623,12 @@ class PyBuildExt(build_ext):
-         self.extensions.extend(exts)
+@@ -1706,8 +1706,8 @@ class PyBuildExt(build_ext):
+         self.detect_decimal()
+         self.detect_ctypes()
+         self.detect_multiprocessing()
+-        if not self.detect_tkinter():
+-            self.missing.append('_tkinter')
++#        if not self.detect_tkinter():
++#            self.missing.append('_tkinter')
+         self.detect_uuid()
  
-         # Call the method for detecting whether _tkinter can be compiled
--        self.detect_tkinter(inc_dirs, lib_dirs)
-+        # self.detect_tkinter(inc_dirs, lib_dirs)
- 
--        if '_tkinter' not in [e.name for e in self.extensions]:
--            missing.append('_tkinter')
-+        # tkinter module will not be avalaible as yocto
-+        # doesn't have tk integrated (yet)
-+        #if '_tkinter' not in [e.name for e in self.extensions]:
-+        #    missing.append('_tkinter')
- 
-         # Build the _uuid module if possible
-         uuid_incs = find_file("uuid.h", inc_dirs, ["/usr/include/uuid"])
+ ##         # Uncomment these lines if you want to play with xxmodule.c
meta/recipes-devtools/python/python3/python-config.patch +16 -8
index f23b8b7df06..c8a8f3d4aa3 100644
@@ -1,4 +1,7 @@
-python-config: Revert to using distutils.sysconfig
+From 07df0ae0d70cba6d1847fe1c24a71063930bec60 Mon Sep 17 00:00:00 2001
+From: Tyler Hall <[email protected]>
+Date: Sun, 4 May 2014 20:06:43 -0400
+Subject: [PATCH] python-config: Revert to using distutils.sysconfig
 
 The newer sysconfig module shares some code with distutils.sysconfig, but the same modifications as in
 
@@ -12,11 +15,16 @@ Upstream-Status: Inappropriate [Embedded Specific]
 
 Signed-off-by: Tyler Hall <[email protected]>
 :
-Index: Python-3.3.3/Misc/python-config.in
-===================================================================
---- Python-3.3.3.orig/Misc/python-config.in
-+++ Python-3.3.3/Misc/python-config.in
-@@ -4,7 +4,7 @@
+
+---
+ Misc/python-config.in | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Misc/python-config.in b/Misc/python-config.in
+index 727c4a8..c702829 100644
+--- a/Misc/python-config.in
++++ b/Misc/python-config.in
+@@ -6,7 +6,7 @@
  import getopt
  import os
  import sys
@@ -24,8 +32,8 @@ Index: Python-3.3.3/Misc/python-config.in
 +from distutils import sysconfig
  
  valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags',
-               'ldflags', 'extension-suffix', 'help', 'abiflags', 'configdir']
-@@ -32,14 +32,14 @@ if '--help' in opt_flags:
+               'ldflags', 'extension-suffix', 'help', 'abiflags', 'configdir',
+@@ -35,14 +35,14 @@ if '--help' in opt_flags:
  
  for opt in opt_flags:
      if opt == '--prefix':
meta/recipes-devtools/python/python3/python3-manifest.json +52 -54

319 lines not on this page · raw message

meta/recipes-devtools/python/python3_3.8.0.bb renamed from meta/recipes-devtools/python/python3_3.7.5.bb +13 -16
similarity index 91%
rename from meta/recipes-devtools/python/python3_3.7.5.bb
rename to meta/recipes-devtools/python/python3_3.8.0.bb
index 57eaaea5e7c..33103278164 100644
@@ -19,8 +19,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
            file://0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch \
            file://0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch \
            file://0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch \
-           file://0002-Don-t-do-runtime-test-to-get-float-byte-order.patch \
-           file://0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \
            file://0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch \
            file://0001-Makefile-fix-Issue36464-parallel-build-race-problem.patch \
            file://0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch \
@@ -35,20 +33,16 @@ SRC_URI_append_class-native = " \
            file://0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch \
            file://12-distutils-prefix-is-inside-staging-area.patch \
            "
-SRC_URI_append_class-nativesdk = " \
-           file://0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch \
-           "
 
-SRC_URI[md5sum] = "08ed8030b1183107c48f2092e79a87e2"
-SRC_URI[sha256sum] = "e85a76ea9f3d6c485ec1780fca4e500725a4a7bbc63c78ebc44170de9b619d94"
+SRC_URI[md5sum] = "dbac8df9d8b9edc678d0f4cacdb7dbb0"
+SRC_URI[sha256sum] = "b356244e13fb5491da890b35b13b2118c3122977c2cd825e3eb6e7d462030d84"
 
 # exclude pre-releases for both python 2.x and 3.x
 UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
 
 CVE_PRODUCT = "python"
 
-PYTHON_MAJMIN = "3.7"
-PYTHON_BINABI = "${PYTHON_MAJMIN}m"
+PYTHON_MAJMIN = "3.8"
 
 S = "${WORKDIR}/Python-${PV}"
 
@@ -59,8 +53,8 @@ inherit autotools pkgconfig qemu ptest multilib_header update-alternatives
 MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}"
 
 ALTERNATIVE_${PN}-dev = "python3-config"
-ALTERNATIVE_LINK_NAME[python3-config] = "${bindir}/python${PYTHON_BINABI}-config"
-ALTERNATIVE_TARGET[python3-config] = "${bindir}/python${PYTHON_BINABI}-config-${MULTILIB_SUFFIX}"
+ALTERNATIVE_LINK_NAME[python3-config] = "${bindir}/python${PYTHON_MAJMIN}-config"
+ALTERNATIVE_TARGET[python3-config] = "${bindir}/python${PYTHON_MAJMIN}-config-${MULTILIB_SUFFIX}"
 
 
 DEPENDS = "bzip2-replacement-native libffi bzip2 openssl sqlite3 zlib virtual/libintl xz virtual/crypt util-linux libtirpc libnsl2"
@@ -131,7 +125,7 @@ do_install_prepend() {
 }
 
 do_install_append_class-target() {
-        oe_multilib_header python${PYTHON_BINABI}/pyconfig.h
+        oe_multilib_header python${PYTHON_MAJMIN}/pyconfig.h
 }
 
 do_install_append_class-native() {
@@ -161,7 +155,7 @@ do_install_append() {
 }
 
 do_install_append_class-nativesdk () {
-    create_wrapper ${D}${bindir}/python${PYTHON_MAJMIN} OEPYTHON3HOME='${prefix}' TERMINFO_DIRS='${sysconfdir}/terminfo:/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo' PYTHONNOUSERSITE='1'
+    create_wrapper ${D}${bindir}/python${PYTHON_MAJMIN} TERMINFO_DIRS='${sysconfdir}/terminfo:/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo' PYTHONNOUSERSITE='1'
 }
 
 SSTATE_SCAN_FILES += "Makefile _sysconfigdata.py"
@@ -177,7 +171,7 @@ py_package_preprocess () {
                 -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \
                 ${PKGD}/${prefix}/lib/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}${PYTHON_ABI}*/Makefile \
                 ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py \
-                ${PKGD}/${bindir}/python${PYTHON_BINABI}-config
+                ${PKGD}/${bindir}/python${PYTHON_MAJMIN}-config
 
         # Reformat _sysconfigdata after modifying it so that it remains
         # reproducible
@@ -196,7 +190,7 @@ py_package_preprocess () {
              -c "from py_compile import compile; compile('$sysconfigfile', optimize=2)"
         cd -
 
-        mv ${PKGD}/${bindir}/python${PYTHON_BINABI}-config ${PKGD}/${bindir}/python${PYTHON_BINABI}-config-${MULTILIB_SUFFIX}
+        mv ${PKGD}/${bindir}/python${PYTHON_MAJMIN}-config ${PKGD}/${bindir}/python${PYTHON_MAJMIN}-config-${MULTILIB_SUFFIX}
         
         #Remove the unneeded copy of target sysconfig data
         rm -rf ${PKGD}/${libdir}/python-sysconfigdata
@@ -278,6 +272,7 @@ python(){
     packages = newpackages + packages
     d.setVar('PACKAGES', ' '.join(packages))
     d.setVar('ALLOW_EMPTY_${PN}-modules', '1')
+    d.setVar('ALLOW_EMPTY_${PN}-pkgutil', '1')
 }
 
 # Files needed to create a new manifest
@@ -322,7 +317,7 @@ RPROVIDES_${PN}-venv += "python3-pyvenv"
 # package libpython3
 PACKAGES =+ "libpython3 libpython3-staticdev"
 FILES_libpython3 = "${libdir}/libpython*.so.*"
-FILES_libpython3-staticdev += "${prefix}/lib/python${PYTHON_MAJMIN}/config-${PYTHON_BINABI}-*/libpython${PYTHON_BINABI}.a"
+FILES_libpython3-staticdev += "${prefix}/lib/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}-*/libpython${PYTHON_MAJMIN}.a"
 INSANE_SKIP_${PN}-dev += "dev-elf"
 
 # catch all the rest (unsorted)
@@ -341,3 +336,5 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = " locale-base-tr-tr.iso-8859-9"
 RDEPENDS_${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', 'tk tk-lib', '', d)}"
 RDEPENDS_${PN}-dev = ""
 
+RDEPENDS_${PN}-tests_append_class-target = " bash"
+RDEPENDS_${PN}-tests_append_class-nativesdk = " bash"
Signature · 1 line
2.17.1
#12 lore raw

PATCH 7/30 gstreamer1.0-python: add a patch to fix python 3.8 builds

In reply to Alexander Kanavin
---
 ...son.build-fix-builds-with-python-3.8.patch | 24 +++++++++++++++++++
 .../gstreamer/gstreamer1.0-python_1.16.1.bb   |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch
meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch new file +24 -0
new file mode 100644
index 00000000000..053108ad50b
@@ -0,0 +1,24 @@
+From 61cfd1b49dc82baf14bb36d88b6c5be7b8c3d23a Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Mon, 2 Dec 2019 18:16:41 +0100
+Subject: [PATCH] meson.build: fix builds with python 3.8
+
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gst-python/merge_requests/14]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 1da81d5..3e0db38 100644
+--- a/meson.build
++++ b/meson.build
+@@ -24,7 +24,7 @@ pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_d
+ 
+ pymod = import('python')
+ python = pymod.find_installation(get_option('python'))
+-python_dep = python.dependency(required : true)
++python_dep = dependency('python3-embed', required : true)
+ 
+ python_abi_flags = python.get_variable('ABIFLAGS', '')
+ pylib_loc = get_option('libpython-dir')
meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb +3 -1
index b770ec060e1..0382360ec26 100644
@@ -5,7 +5,9 @@ SECTION = "multimedia"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740"
 
-SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"
+SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz \
+           file://0001-meson.build-fix-builds-with-python-3.8.patch \
+           "
 SRC_URI[md5sum] = "499645fbd1790c5845c02a3998dccc1b"
 SRC_URI[sha256sum] = "b469c8955126f41b8ce0bf689b7029f182cd305f422b3a8df35b780bd8347489"
 
Signature · 1 line
2.17.1
#13 lore raw

Re: [PATCH 07/30] gstreamer1.0-python: add a patch to fix python 3.8 builds

this fails with python 3.7

https://errors.yoctoproject.org/Errors/Details/297314/

Quoted 61 lines · Alexander Kanavin
---
 ...son.build-fix-builds-with-python-3.8.patch | 24 +++++++++++++++++++
 .../gstreamer/gstreamer1.0-python_1.16.1.bb   |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch
meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch new file +24 -0
new file mode 100644
index 00000000000..053108ad50b
@@ -0,0 +1,24 @@
+From 61cfd1b49dc82baf14bb36d88b6c5be7b8c3d23a Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Mon, 2 Dec 2019 18:16:41 +0100
+Subject: [PATCH] meson.build: fix builds with python 3.8
+
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gst-python/merge_requests/14]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 1da81d5..3e0db38 100644
+--- a/meson.build
++++ b/meson.build
+@@ -24,7 +24,7 @@ pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_d
+
+ pymod = import('python')
+ python = pymod.find_installation(get_option('python'))
+-python_dep = python.dependency(required : true)
++python_dep = dependency('python3-embed', required : true)
+
+ python_abi_flags = python.get_variable('ABIFLAGS', '')
+ pylib_loc = get_option('libpython-dir')
meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb +3 -2
index b770ec060e1..0382360ec26 100644
@@ -5,7 +5,9 @@ SECTION = "multimedia"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740"
 
-SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"
+SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz \
+           file://0001-meson.build-fix-builds-with-python-3.8.patch \
+           "
 SRC_URI[md5sum] = "499645fbd1790c5845c02a3998dccc1b"
 SRC_URI[sha256sum] = "b469c8955126f41b8ce0bf689b7029f182cd305f422b3a8df35b780bd8347489"
 
--

2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#14 lore raw

Re: [PATCH 07/30] gstreamer1.0-python: add a patch to fix python 3.8 builds

This is expected; the patch should be merged together with 3.8 upgrade.

Alex

Quoted 79 lines · Khem Raj

this fails with python 3.7

https://errors.yoctoproject.org/Errors/Details/297314/

Quoted 7 lines · Alexander Kanavin
---
 ...son.build-fix-builds-with-python-3.8.patch | 24 +++++++++++++++++++
 .../gstreamer/gstreamer1.0-python_1.16.1.bb   |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch

Quoted 2 lines

diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch

Quoted 4 lines

new file mode 100644
index 00000000000..053108ad50b
--- /dev/null
+++

b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch

meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch line 6

Quoted 7 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch new file +6 -0
@@ -0,0 +1,24 @@
+From 61cfd1b49dc82baf14bb36d88b6c5be7b8c3d23a Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Mon, 2 Dec 2019 18:16:41 +0100
+Subject: [PATCH] meson.build: fix builds with python 3.8
+
+Upstream-Status: Submitted [

https://gitlab.freedesktop.org/gstreamer/gst-python/merge_requests/14]

meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch

Quoted 10 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch new file +10 -0
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 1da81d5..3e0db38 100644
+--- a/meson.build
++++ b/meson.build
+@@ -24,7 +24,7 @@ pygobject_dep = dependency('pygobject-3.0', fallback:

['pygobject', 'pygobject_d

Review

Quoted 9 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch new file +8 -0
+
+ pymod = import('python')
+ python = pymod.find_installation(get_option('python'))
+-python_dep = python.dependency(required : true)
++python_dep = dependency('python3-embed', required : true)
+
+ python_abi_flags = python.get_variable('ABIFLAGS', '')
+ pylib_loc = get_option('libpython-dir')
(quoted diff) +0 -0

gstreamer1.0-python_1.16.1.bb b/meta/recipes-multimedia/gstreamer/ gstreamer1.0-python_1.16.1.bb

meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb SECTION = "multimedia" · line 8

Quoted 8 lines

index b770ec060e1..0382360ec26 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb +0 -1
@@ -5,7 +5,9 @@ SECTION = "multimedia"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740"
 
-SRC_URI = "

https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"

meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb SECTION = "multimedia" · line 8

Quoted 1 line
meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb +1 -0
+SRC_URI = "

https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz \

meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb SECTION = "multimedia"

Quoted 4 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb +2 -0
+           file://0001-meson.build-fix-builds-with-python-3.8.patch \
+           "
 SRC_URI[md5sum] = "499645fbd1790c5845c02a3998dccc1b"
 SRC_URI[sha256sum] =

"b469c8955126f41b8ce0bf689b7029f182cd305f422b3a8df35b780bd8347489"

Quoted 9 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb +0 -1
--

2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#15 lore raw

Re: [PATCH 07/30] gstreamer1.0-python: add a patch to fix python 3.8 builds

Quoted 2 lines · Alexander Kanavin

This is expected; the patch should be merged together with 3.8 upgrade.

I don’t think this patch is right though since this patch is creating py3.8 dependency if you want to upstream something that should work with all py3 I think

Quoted 85 lines

Alex

Quoted 80 lines · Khem Raj

this fails with python 3.7

https://errors.yoctoproject.org/Errors/Details/297314/

Quoted 7 lines · Alexander Kanavin
---
 ...son.build-fix-builds-with-python-3.8.patch | 24 +++++++++++++++++++
 .../gstreamer/gstreamer1.0-python_1.16.1.bb   |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch

Quoted 2 lines

diff --git

a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch

Quoted 4 lines

new file mode 100644
index 00000000000..053108ad50b
--- /dev/null
+++

b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch

meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch line 6

Quoted 7 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch new file +6 -0
@@ -0,0 +1,24 @@
+From 61cfd1b49dc82baf14bb36d88b6c5be7b8c3d23a Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Mon, 2 Dec 2019 18:16:41 +0100
+Subject: [PATCH] meson.build: fix builds with python 3.8
+
+Upstream-Status: Submitted [

https://gitlab.freedesktop.org/gstreamer/gst-python/merge_requests/14]

meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch

Quoted 10 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch new file +10 -0
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 1da81d5..3e0db38 100644
+--- a/meson.build
++++ b/meson.build
+@@ -24,7 +24,7 @@ pygobject_dep = dependency('pygobject-3.0',

fallback: ['pygobject', 'pygobject_d

Review

Quoted 9 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-fix-builds-with-python-3.8.patch new file +8 -0
+
+ pymod = import('python')
+ python = pymod.find_installation(get_option('python'))
+-python_dep = python.dependency(required : true)
++python_dep = dependency('python3-embed', required : true)
+
+ python_abi_flags = python.get_variable('ABIFLAGS', '')
+ pylib_loc = get_option('libpython-dir')
(quoted diff) +0 -0

gstreamer1.0-python_1.16.1.bb b/meta/recipes-multimedia/gstreamer/ gstreamer1.0-python_1.16.1.bb

meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb SECTION = "multimedia" · line 6

Quoted 6 lines

index b770ec060e1..0382360ec26 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb +0 -0
@@ -5,7 +5,9 @@ SECTION = "multimedia"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM =

"file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740"

meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb SECTION = "multimedia" · line 7

Quoted 2 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb +0 -1
-SRC_URI = "

https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"

meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb SECTION = "multimedia" · line 7

Quoted 1 line
meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb +1 -0
+SRC_URI = "

https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz \

meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb SECTION = "multimedia"

Quoted 4 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb +2 -0
+           file://0001-meson.build-fix-builds-with-python-3.8.patch \
+           "
 SRC_URI[md5sum] = "499645fbd1790c5845c02a3998dccc1b"
 SRC_URI[sha256sum] =

"b469c8955126f41b8ce0bf689b7029f182cd305f422b3a8df35b780bd8347489"

Quoted 9 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.16.1.bb +0 -1
--

2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#16 lore raw

Re: [PATCH 07/30] gstreamer1.0-python: add a patch to fix python 3.8 builds

Quoted 6 lines · Khem Raj

This is expected; the patch should be merged together with 3.8 upgrade.

I don’t think this patch is right though since this patch is creating py3.8 dependency if you want to upstream something that should work with all py3 I think

It's being discussed in the upstream submission ticket, and will be resolved; we can take the 3.8-specific fix meanwhile.

Alex

#17 lore raw

Re: [PATCH 07/30] gstreamer1.0-python: add a patch to fix python 3.8 builds

Quoted 4 lines · Alexander Kanavin
Quoted 2 lines · Khem Raj

This is expected; the patch should be merged together with 3.8 upgrade.

Quoted 8 lines
Quoted 4 lines

I don’t think this patch is right though since this patch is creating py3.8 dependency if you want to upstream something that should work with all py3 I think

It's being discussed in the upstream submission ticket, and will be resolved; we can take the 3.8-specific fix meanwhile.

For better processing this series should be in three parts

1 Python 3.8 updates
2 gettext updates
3 rest of them

I have filtered it into roughly these and currently staged in yoe/mut just the third part which i think can be applied with out much problem

For 1 and 2 there are breakages for many packages
And it would be better to identify them and let community know of and seek help

Quoted 2 lines

Alex

#18 lore raw

Re: [PATCH 07/30] gstreamer1.0-python: add a patch to fix python 3.8 builds

Is this related to an issue I mentioned in my RFC?

Quoted 1 line

gstreamer1.0-python_1.16.1.bb currently has a problem in that the gst-python code tries to load /usr/lib/libpython3.7m.so. But, in a regular installation, only /usr/lib/libpython3.7m.so.1.0 would be availale. It is possible to adjust the libpython path & name during the build. But - what would it be adjusted to? How would the recipe know that "/usr/lib/libpython3.7m.so.1.0" is the correct choice? Or perhaps would it make sense to add the /usr/lib/libpython3.7m.so symlink to the regular (as in: non-dev) Python package?

Quoted 34 lines · Khem Raj

On Sun, Dec 15, 2019 at 9:12 AM Alexander Kanavin <[email protected] <mailto:[email protected]>> wrote:

On Sun, 15 Dec 2019 at 18:06, Khem Raj <[email protected] <mailto:[email protected]>> wrote:

This is expected; the patch should be merged together with 3.8 upgrade.

I don’t think this patch is right though since this patch is creating py3.8 dependency if you want to upstream something that should work with all py3 I think

It's being discussed in the upstream submission ticket, and will be resolved; we can take the 3.8-specific fix meanwhile.

For better processing this series should be in three parts

1 Python 3.8 updates
2 gettext updates
3 rest of them

I have filtered it into roughly these and currently staged in yoe/mut just the third part which i think can be applied with out much problem

For 1 and 2 there are breakages for many packages
And it would be better to identify them and let community know of and seek help

Alex

#19 lore raw

Re: [PATCH 07/30] gstreamer1.0-python: add a patch to fix python 3.8 builds

Quoted 11 lines · Carlos Rafael Giani

Is this related to an issue I mentioned in my RFC?

Quoted 1 line

gstreamer1.0-python_1.16.1.bb currently has a problem in that the

gst-python code tries to load /usr/lib/libpython3.7m.so. But, in a regular installation, only /usr/lib/libpython3.7m.so.1.0 would be availale. It is possible to adjust the libpython path & name during the build. But - what would it be adjusted to? How would the recipe know that "/usr/lib/libpython3.7m.so.1.0" is the correct choice? Or perhaps would it make sense to add the /usr/lib/libpython3.7m.so symlink to the regular (as in: non-dev) Python package?

The way I read the code [1], it only tries to do this if it's not explicitly linked with libpython, and at least on my host, it is:

ak@linux-f9zs:~/development/poky> ldd /usr/lib64/gstreamer-1.0/ libgstpython.cpython-37m-x86_64-linux-gnu.so

        linux-vdso.so.1 (0x00007fffe931a000)
        libpython3.7m.so.1.0 => /usr/lib64/libpython3.7m.so.1.0
(0x00007fbb718e7000)
        libgstreamer-1.0.so.0 => /usr/lib64/libgstreamer-1.0.so.0
(0x00007fbb717a3000)
        libgobject-2.0.so.0 => /usr/lib64/libgobject-2.0.so.0

(0x00007fbb71747000)
...

The use case is rather marginal I'd say: writing gstreamer plugins in python. The *other* thing gst-python does, accessing gstreamer API from python scripts, is not affected.

[1]
https://gitlab.freedesktop.org/gstreamer/gst-python/blob/1.16.2/plugin/gstpythonplugin.c#L227

Alex

Quoted 43 lines · Khem Raj
Quoted 4 lines · Alexander Kanavin
Quoted 2 lines · Khem Raj

This is expected; the patch should be merged together with 3.8 upgrade.

Quoted 8 lines
Quoted 4 lines

I don’t think this patch is right though since this patch is creating py3.8 dependency if you want to upstream something that should work with all py3 I think

It's being discussed in the upstream submission ticket, and will be resolved; we can take the 3.8-specific fix meanwhile.

For better processing this series should be in three parts

1 Python 3.8 updates
2 gettext updates
3 rest of them

I have filtered it into roughly these and currently staged in yoe/mut just the third part which i think can be applied with out much problem

For 1 and 2 there are breakages for many packages
And it would be better to identify them and let community know of and seek help

Quoted 2 lines

Alex

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#20 lore raw

PATCH 8/30 shadow: update 4.6 -> 4.8

In reply to Alexander Kanavin

Drop two backports.

Remove 0001-useradd.c-create-parent-directories-when-necessary.patch as upstream has addressed the issue:
https://github.com/shadow-maint/shadow/commit/b3b6d9d77c1d18b98670b97157777bb74092cd69

Rebase the rest of the paches.

Add a patch to remove the check for validity of login shells which does not work in our environment.

---
 ...01-Disable-use-of-syslog-for-sysroot.patch |  18 ++-
 ...eck-for-validity-of-shell-executable.patch |  29 +++++
 ...chg-shadow-field-reproducible-re.-71.patch |  89 --------------
 ...ure.ac-fix-configure-error-with-dash.patch |  36 ------
 ...te-parent-directories-when-necessary.patch | 116 ------------------
 ...-for-setting-password-in-clear-text.patch} | 101 +++++++--------
 ...nexpected-open-failure-in-chroot-env.patch |  15 ++-
 .../files/shadow-relaxed-usernames.patch      |  51 +++++---
 meta/recipes-extended/shadow/shadow.inc       |  10 +-
 .../shadow/{shadow_4.6.bb => shadow_4.8.bb}   |   0
 10 files changed, 132 insertions(+), 333 deletions(-)
 create mode 100644 meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch
 delete mode 100644 meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch
 delete mode 100644 meta/recipes-extended/shadow/files/0001-configure.ac-fix-configure-error-with-dash.patch
 delete mode 100644 meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch
 rename meta/recipes-extended/shadow/files/{allow-for-setting-password-in-clear-text.patch => 0002-Allow-for-setting-password-in-clear-text.patch} (81%)
 rename meta/recipes-extended/shadow/{shadow_4.6.bb => shadow_4.8.bb} (100%)
meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch +8 -10
index aac2d42b12a..ab317b9aa03 100644
@@ -1,4 +1,4 @@
-From 8cf3454d567f77233023be49a39a33e9f0836f89 Mon Sep 17 00:00:00 2001
+From fa2d9453656641002802d8165e80adb9e6a729d2 Mon Sep 17 00:00:00 2001
 From: Scott Garman <[email protected]>
 Date: Thu, 14 Apr 2016 12:28:57 +0200
 Subject: [PATCH] Disable use of syslog for sysroot
@@ -12,6 +12,7 @@ Upstream-Status: Inappropriate [disable feature]
 Signed-off-by: Scott Garman <[email protected]>
 Signed-off-by: Peter Kjellerstedt <[email protected]>
 Signed-off-by: Chen Qi <[email protected]>
+
 ---
  src/groupadd.c  | 3 +++
  src/groupdel.c  | 3 +++
@@ -23,7 +24,7 @@ Signed-off-by: Chen Qi <[email protected]>
  7 files changed, 21 insertions(+)
 
 diff --git a/src/groupadd.c b/src/groupadd.c
-index 63e1c48..a596c49 100644
+index 2dd8eec..e9c4bb7 100644
 --- a/src/groupadd.c
 +++ b/src/groupadd.c
 @@ -34,6 +34,9 @@
@@ -37,7 +38,7 @@ index 63e1c48..a596c49 100644
  #include <fcntl.h>
  #include <getopt.h>
 diff --git a/src/groupdel.c b/src/groupdel.c
-index 70bed01..ababd81 100644
+index f941a84..5a70056 100644
 --- a/src/groupdel.c
 +++ b/src/groupdel.c
 @@ -34,6 +34,9 @@
@@ -65,7 +66,7 @@ index fc91c8b..2842514 100644
  #include <getopt.h>
  #include <grp.h>
 diff --git a/src/groupmod.c b/src/groupmod.c
-index 72daf2c..8965f9d 100644
+index 1dca5fc..bc14438 100644
 --- a/src/groupmod.c
 +++ b/src/groupmod.c
 @@ -34,6 +34,9 @@
@@ -79,7 +80,7 @@ index 72daf2c..8965f9d 100644
  #include <fcntl.h>
  #include <getopt.h>
 diff --git a/src/useradd.c b/src/useradd.c
-index 3aaf45c..1ab9174 100644
+index 4af0f7c..1b7bf06 100644
 --- a/src/useradd.c
 +++ b/src/useradd.c
 @@ -34,6 +34,9 @@
@@ -93,7 +94,7 @@ index 3aaf45c..1ab9174 100644
  #include <ctype.h>
  #include <errno.h>
 diff --git a/src/userdel.c b/src/userdel.c
-index c8de1d3..24d3ea9 100644
+index cc951e5..153e0be 100644
 --- a/src/userdel.c
 +++ b/src/userdel.c
 @@ -34,6 +34,9 @@
@@ -107,7 +108,7 @@ index c8de1d3..24d3ea9 100644
  #include <errno.h>
  #include <fcntl.h>
 diff --git a/src/usermod.c b/src/usermod.c
-index ccfbb99..24fb60d 100644
+index 05b9871..21c6da9 100644
 --- a/src/usermod.c
 +++ b/src/usermod.c
 @@ -34,6 +34,9 @@
@@ -120,6 +121,3 @@ index ccfbb99..24fb60d 100644
  #include <assert.h>
  #include <ctype.h>
  #include <errno.h>
--- 
-2.11.0
-
meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch new file +29 -0
new file mode 100644
index 00000000000..2d15ff0673a
@@ -0,0 +1,29 @@
+From 0d0aded7307a9f4ee0d299951512acd18b3e029e Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Wed, 4 Dec 2019 19:28:48 +0100
+Subject: [PATCH] Do not check for validity of shell executable.
+
+This kind of check fails when building a rootfs.
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ src/useradd.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/useradd.c b/src/useradd.c
+index 4af0f7c..898fe02 100644
+--- a/src/useradd.c
++++ b/src/useradd.c
+@@ -1328,10 +1328,7 @@ static void process_flags (int argc, char **argv)
+ 				if (   ( !VALID (optarg) )
+ 				    || (   ('\0' != optarg[0])
+ 				        && ('/'  != optarg[0])
+-				        && ('*'  != optarg[0]) )
+-				    || (stat(optarg, &st) != 0)
+-				    || (S_ISDIR(st.st_mode))
+-				    || (access(optarg, X_OK) != 0)) {
++				        && ('*'  != optarg[0]) )) {
+ 					fprintf (stderr,
+ 					         _("%s: invalid shell '%s'\n"),
+ 					         Prog, optarg);
meta/recipes-extended/shadow/files/0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch deleted +0 -89

89 lines not on this page · raw message

meta/recipes-extended/shadow/files/0001-configure.ac-fix-configure-error-with-dash.patch deleted +0 -36
deleted file mode 100644
index a74cbb0c0e7..00000000000
@@ -1,36 +0,0 @@
-From 3c52a84ff8775590e7e9da9c0d4408c23494305e Mon Sep 17 00:00:00 2001
-From: Yi Zhao <[email protected]>
-Date: Mon, 17 Jun 2019 15:36:34 +0800
-Subject: [PATCH] configure.ac: fix configure error with dash
-
-A configure error occurs when /bin/sh -> dash:
-  checking for is_selinux_enabled in -lselinux... yes
-  checking for semanage_connect in -lsemanage... yes
-  configure: 16322: test: yesyes: unexpected operator
-
-Use "=" instead of "==" since dash doesn't support this operator.
-
-Upstream-Status: Backport
-[https://github.com/shadow-maint/shadow/commit/3c52a84ff8775590e7e9da9c0d4408c23494305e]
-
-Signed-off-by: Yi Zhao <[email protected]>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6762556..1907afb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -500,7 +500,7 @@ if test "$with_selinux" != "no"; then
- 			AC_MSG_ERROR([libsemanage not found])
- 		fi
- 
--		if test "$selinux_lib$semanage_lib" == "yesyes" ; then
-+		if test "$selinux_lib$semanage_lib" = "yesyes" ; then
- 			AC_DEFINE(WITH_SELINUX, 1,
- 			          [Build shadow with SELinux support])
- 			LIBSELINUX="-lselinux"
--- 
-2.7.4
-
meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch deleted +0 -116

116 lines not on this page · raw message

meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch renamed from meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch +51 -50

234 lines not on this page · raw message

meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch +9 -6
index 4fa3d184edf..98252163692 100644
@@ -1,3 +1,8 @@
+From 66533c7c6f347d257020675a1ed6e0c59cbbc3f0 Mon Sep 17 00:00:00 2001
+From: Chen Qi <[email protected]>
+Date: Thu, 17 Jul 2014 15:53:34 +0800
+Subject: [PATCH] commonio.c-fix-unexpected-open-failure-in-chroot-env
+
 Upstream-Status: Inappropriate [OE specific]
 
 commonio.c: fix unexpected open failure in chroot environment
@@ -10,15 +15,16 @@ Note that this patch doesn't change the logic in the code, it just expands
 the codes.
 
 Signed-off-by: Chen Qi <[email protected]>
+
 ---
- lib/commonio.c |   16 ++++++++++++----
+ lib/commonio.c | 16 ++++++++++++----
  1 file changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/lib/commonio.c b/lib/commonio.c
-index cc536bf..51cafd9 100644
+index 16fa7e7..d6bc297 100644
 --- a/lib/commonio.c
 +++ b/lib/commonio.c
-@@ -613,10 +613,18 @@ int commonio_open (struct commonio_db *db, int mode)
+@@ -632,10 +632,18 @@ int commonio_open (struct commonio_db *db, int mode)
  	db->cursor = NULL;
  	db->changed = false;
  
@@ -41,6 +47,3 @@ index cc536bf..51cafd9 100644
  	db->fp = NULL;
  	if (fd >= 0) {
  #ifdef WITH_TCB
--- 
-1.7.9.5
-
meta/recipes-extended/shadow/files/shadow-relaxed-usernames.patch +31 -20

101 lines not on this page · raw message

meta/recipes-extended/shadow/shadow.inc +4 -6
index 770c239e96d..670eee85a51 100644
@@ -11,8 +11,6 @@ DEPENDS = "virtual/crypt"
 UPSTREAM_CHECK_URI = "https://github.com/shadow-maint/shadow/releases"
 SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/${PV}/${BP}.tar.gz \
            file://shadow-4.1.3-dots-in-usernames.patch \
-           file://0001-Make-the-sp_lstchg-shadow-field-reproducible-re.-71.patch  \
-           file://0001-configure.ac-fix-configure-error-with-dash.patch \
            ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \
            file://shadow-relaxed-usernames.patch \
            "
@@ -24,16 +22,16 @@ SRC_URI_append_class-target = " \
 
 SRC_URI_append_class-native = " \
            file://0001-Disable-use-of-syslog-for-sysroot.patch \
-           file://allow-for-setting-password-in-clear-text.patch \
+           file://0002-Allow-for-setting-password-in-clear-text.patch \
            file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \
-           file://0001-useradd.c-create-parent-directories-when-necessary.patch \
+           file://0001-Do-not-check-for-validity-of-shell-executable.patch \
            "
 SRC_URI_append_class-nativesdk = " \
            file://0001-Disable-use-of-syslog-for-sysroot.patch \
            "
 
-SRC_URI[md5sum] = "36feb15665338ae3de414f2a88e434db"
-SRC_URI[sha256sum] = "4668f99bd087399c4a586084dc3b046b75f560720d83e92fd23bf7a89dda4d31"
+SRC_URI[md5sum] = "017ac773ba370bc28e157cee30dad71a"
+SRC_URI[sha256sum] = "82016d65317555fc8ce9e669eb187984d8d4b1f8ecda0769f4bc5412aed326e4"
 
 # Additional Policy files for PAM
 PAM_SRC_URI = "file://pam.d/chfn \
meta/recipes-extended/shadow/shadow_4.8.bb renamed from meta/recipes-extended/shadow/shadow_4.6.bb +0 -0
similarity index 100%
rename from meta/recipes-extended/shadow/shadow_4.6.bb
rename to meta/recipes-extended/shadow/shadow_4.8.bb
Signature · 1 line
2.17.1
#21 lore raw

Re: [PATCH 08/30] shadow: update 4.6 -> 4.8

Quoted 10 lines · Alexander Kanavin

Drop two backports.

Remove 0001-useradd.c-create-parent-directories-when-necessary.patch as upstream has addressed the issue:
https://github.com/shadow-maint/shadow/commit/b3b6d9d77c1d18b98670b97157777bb74092cd69

Rebase the rest of the paches.

Add a patch to remove the check for validity of login shells which does not work in our environment.

This upgrade causes this failure:

https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/1346

ERROR: core-image-sato-1.0-r0 do_rootfs: [log_check] core-image-sato:
found 16 error messages in the logfile:
[log_check] pwconv: Failed to flush the sssd cache. [log_check] pwconv: Failed to flush the sssd cache. [log_check] grpconv: Failed to flush the sssd cache. [log_check] grpconv: Failed to flush the sssd cache. [log_check] useradd: Failed to flush the sssd cache. [log_check] useradd: Failed to flush the sssd cache. [log_check] useradd: Failed to flush the sssd cache. [log_check] useradd: Failed to flush the sssd cache. [log_check] useradd: Failed to flush the sssd cache. [log_check] useradd: Failed to flush the sssd cache. [log_check] useradd: Failed to flush the sssd cache. [log_check] useradd: Failed to flush the sssd cache. [log_check] groupadd: Failed to flush the sssd cache. [log_check] groupadd: Failed to flush the sssd cache. [log_check] useradd: Failed to flush the sssd cache. [log_check] useradd: Failed to flush the sssd cache.

Cheers,

Richard

#22 lore raw

PATCH 9/30 sysklogd: update to 2.0.3

In reply to Alexander Kanavin

Drop all patches as they are no longer necessary with autotools,
fix problems that are addressed upstream, or (in case of no-vectorization.patch) don't apply to the old version either, which means no one is using that hw target anymore.

Remove custom systemd configs (provided by upstream), and custom syslog config (also provided by upstream but not installed by default).

Adjust parselogs to not error out on not being able to find System.map file during boot (that is packaged into kernel-dev and is not normally installed).

License-Update: various tweaks; the license terms are the same.

---
 meta/lib/oeqa/runtime/cases/parselogs.py      |   3 +-
 .../files/0001-Fix-build-with-musl.patch      | 132 ------------------
 ...t-causes-a-segmentation-fault-under-.patch |  28 ----
 ...or-respecting-flags-from-environment.patch |  35 -----
 .../sysklogd/files/klogd.service              |  13 --
 .../sysklogd/files/no-strip-install.patch     |  17 ---
 .../sysklogd/files/no-vectorization.patch     |  20 ---
 meta/recipes-extended/sysklogd/files/sysklogd |   4 +-
 .../sysklogd/files/syslog.conf                |  71 ----------
 .../sysklogd/files/syslogd.service            |  14 --
 .../sysklogd/files/tmpfiles.sysklogd.conf     |   1 -
 meta/recipes-extended/sysklogd/sysklogd.inc   |  46 ++----
 .../sysklogd/sysklogd_1.5.1.bb                |   3 -
 .../sysklogd/sysklogd_2.0.3.bb                |   3 +
 14 files changed, 19 insertions(+), 371 deletions(-)
 delete mode 100644 meta/recipes-extended/sysklogd/files/0001-Fix-build-with-musl.patch
 delete mode 100644 meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch
 delete mode 100644 meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch
 delete mode 100644 meta/recipes-extended/sysklogd/files/klogd.service
 delete mode 100644 meta/recipes-extended/sysklogd/files/no-strip-install.patch
 delete mode 100644 meta/recipes-extended/sysklogd/files/no-vectorization.patch
 delete mode 100644 meta/recipes-extended/sysklogd/files/syslog.conf
 delete mode 100644 meta/recipes-extended/sysklogd/files/syslogd.service
 delete mode 100644 meta/recipes-extended/sysklogd/files/tmpfiles.sysklogd.conf
 delete mode 100644 meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb
 create mode 100644 meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb
meta/lib/oeqa/runtime/cases/parselogs.py +2 -1
index 15343d7abbe..b7c7b30adf5 100644
@@ -55,7 +55,8 @@ common_errors = [
     "Failed to read /var/lib/nfs/statd/state: Success",
     "error retry time-out =",
     "logind: cannot setup systemd-logind helper (-61), using legacy fallback",
-    "Error changing net interface name 'eth0' to "
+    "Error changing net interface name 'eth0' to ",
+    "Cannot find a map file"
     ]
 
 video_related = [
meta/recipes-extended/sysklogd/files/0001-Fix-build-with-musl.patch deleted +0 -132

132 lines not on this page · raw message

meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch deleted +0 -28
deleted file mode 100644
index 56431af8456..00000000000
@@ -1,28 +0,0 @@
-From cb72b3e172c238b4b5ae5935dc6be54f5034fcf1 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Fri, 30 Jun 2017 18:20:06 -0700
-Subject: [PATCH 1/2] fix problems that causes a segmentation fault under some
- conditions
-
-Upstream-Status: Inappropriate [ no upstream ]
-
-Signed-off-by: Khem Raj <[email protected]>
----
- ksym_mod.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/ksym_mod.c b/ksym_mod.c
-index 6e26da1..a3daa7d 100644
---- a/ksym_mod.c
-+++ b/ksym_mod.c
-@@ -186,7 +186,6 @@ extern int InitMsyms()
- 		else
- 			Syslog(LOG_ERR, "Error loading kernel symbols " \
- 			       "- %s\n", strerror(errno));
--		fclose(ksyms);
- 		return(0);
- 	}
- 
--- 
-2.13.2
-
meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch deleted +0 -35
deleted file mode 100644
index ebbdef303bc..00000000000
@@ -1,35 +0,0 @@
-From b22f244732cd0f475af2f82fc7eecec49f90623b Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 1 Jul 2017 00:01:50 -0700
-Subject: [PATCH 2/2] Make way for respecting flags from environment
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
----
- Makefile | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 5af1689..af699d2 100644
---- a/Makefile
-+++ b/Makefile
-@@ -17,14 +17,12 @@
- #   along with this program; if not, write to the Free Software
- #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--CC= gcc
- #SKFLAGS= -g -DSYSV -Wall
- #LDFLAGS= -g
--SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
-+SKFLAGS = $(CFLAGS) $(CPPFLAGS) -DSYSV -Wall -fno-strength-reduce
- # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
- # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
- # $(shell getconf LFS_SKFLAGS)
--LDFLAGS= -s
- 
- # Look where your install program is.
- INSTALL = /usr/bin/install
--- 
-2.13.2
-
meta/recipes-extended/sysklogd/files/klogd.service deleted +0 -13
deleted file mode 100644
index 0c888c497dd..00000000000
@@ -1,13 +0,0 @@
-[Unit]
-Description=Kernel Logging Service
-After=syslogd.service
-
-[Service]
-Type=forking
-ExecStart=/sbin/klogd
-PIDFile=/var/run/klogd.pid
-StandardOutput=null
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
meta/recipes-extended/sysklogd/files/no-strip-install.patch deleted +0 -17
deleted file mode 100644
index d426c83bf25..00000000000
@@ -1,17 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: sysklogd-1.5.1/Makefile
-===================================================================
---- sysklogd-1.5.1.orig/Makefile
-+++ sysklogd-1.5.1/Makefile
-@@ -127,8 +127,8 @@ clobber: clean
- 	rm -f syslogd klogd ksym syslog_tst oops_test TAGS tsyslogd tklogd
- 
- install_exec: syslogd klogd
--	${INSTALL} -m 500 -s syslogd ${BINDIR}/syslogd
--	${INSTALL} -m 500 -s klogd ${BINDIR}/klogd
-+	${INSTALL} -m 500 syslogd ${BINDIR}/syslogd
-+	${INSTALL} -m 500 klogd ${BINDIR}/klogd
- 
- install_man:
- 	${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} sysklogd.8 ${MANDIR}/man8/sysklogd.8
meta/recipes-extended/sysklogd/files/no-vectorization.patch deleted +0 -20
deleted file mode 100644
index c1cc042c9cf..00000000000
@@ -1,20 +0,0 @@
-Upstream-Status: Inappropriate
-
-The compiler should not be generating vectorized instructions on this target.
-This is a work around until I can determine why this is occuring on this
-particular recipe
-
-Index: sysklogd-1.5/Makefile
-===================================================================
---- sysklogd-1.5.orig/Makefile
-+++ sysklogd-1.5/Makefile
-@@ -20,7 +20,8 @@
- CC= gcc
- #SKFLAGS= -g -DSYSV -Wall
- #LDFLAGS= -g
--SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
-+SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce \
-+	-fno-tree-vectorize
- # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
- # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
- # $(shell getconf LFS_SKFLAGS)
meta/recipes-extended/sysklogd/files/sysklogd +2 -2
index 73424840ba3..4a4ca8a78ed 100755
@@ -19,8 +19,8 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 
 pidfile_syslogd=/var/run/syslogd.pid
 pidfile_klogd=/var/run/klogd.pid
-binpath_syslogd=/sbin/syslogd
-binpath_klogd=/sbin/klogd
+binpath_syslogd=/usr/sbin/syslogd
+binpath_klogd=/usr/sbin/klogd
 
 test -x $binpath || exit 0
 
meta/recipes-extended/sysklogd/files/syslog.conf deleted +0 -71

71 lines not on this page · raw message

meta/recipes-extended/sysklogd/files/syslogd.service deleted +0 -14
deleted file mode 100644
index eeaff3d38d6..00000000000
@@ -1,14 +0,0 @@
-[Unit]
-Description=System Logging Service
-Requires=syslog.socket
-
-[Service]
-Type=forking
-ExecStart=/sbin/syslogd
-PIDFile=/var/run/syslogd.pid
-StandardOutput=null
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-Alias=syslog.service
meta/recipes-extended/sysklogd/files/tmpfiles.sysklogd.conf deleted +0 -1
deleted file mode 100644
index f4aecd385b6..00000000000
@@ -1 +0,0 @@
-p /dev/xconsole 0640 root adm
meta/recipes-extended/sysklogd/sysklogd.inc +12 -34

66 lines not on this page · raw message

meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb deleted +0 -3
deleted file mode 100644
index 88bcfd9e4a0..00000000000
@@ -1,3 +0,0 @@
-require sysklogd.inc
-
-SRCREV = "930a2b1c0d15b14309a49f14e3f30e905456af4d"
meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb new file +3 -0
new file mode 100644
index 00000000000..21f750fa60f
@@ -0,0 +1,3 @@
+require sysklogd.inc
+
+SRCREV = "ad686ca86d977f9eac4cd0a0d0e9a5964a4621d3"
Signature · 1 line
2.17.1
#23 lore raw

PATCH 10/30 libtasn1: update to 4.15.0

In reply to Alexander Kanavin

Drop backports.

---
 .../gnutls/libtasn1/fix-gtkdoc.patch          | 38 -------------------
 .../gnutls/libtasn1/fix-ldflags.patch         | 31 ---------------
 .../{libtasn1_4.14.bb => libtasn1_4.15.0.bb}  | 11 ++++--
 3 files changed, 7 insertions(+), 73 deletions(-)
 delete mode 100644 meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch
 delete mode 100644 meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch
 rename meta/recipes-support/gnutls/{libtasn1_4.14.bb => libtasn1_4.15.0.bb} (72%)
meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch deleted +0 -38
deleted file mode 100644
index bfc9b9fca7e..00000000000
@@ -1,38 +0,0 @@
-Upstream-Status: Backport [https://gitlab.com/gnutls/libtasn1/merge_requests/49]
-Signed-off-by: Ross Burton <[email protected]>
-
-From ebd4f871b5241809f6a5b461444a6d331e15c949 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Mon, 9 Sep 2019 13:11:39 +0100
-Subject: [PATCH] doc/reference: don't add empty object hierarchy chapter
-
-The object hierarchy section is empty because there are no GObjects in the
-libtasn1 API.  With gtk-doc 1.30 onwards if there are no objects then the object
-hierarchy file won't exist, resulting in a failure when building the
-documentation:
-
-| ../libtasn1-docs.xml:39: element include: XInclude error : could not load ../xml/tree_index.sgml, and no fallback was found
-
-Signed-off-by: Ross Burton <[email protected]>
----
- doc/reference/libtasn1-docs.xml | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/doc/reference/libtasn1-docs.xml b/doc/reference/libtasn1-docs.xml
-index accdb85..f88b888 100644
---- a/doc/reference/libtasn1-docs.xml
-+++ b/doc/reference/libtasn1-docs.xml
-@@ -34,10 +34,6 @@
-         <xi:include href="xml/libtasn1.xml"/>
- 
-   </chapter>
--  <chapter id="object-tree">
--    <title>Object Hierarchy</title>
--    <xi:include href="xml/tree_index.sgml"/>
--  </chapter>
-   <index id="api-index-full">
-     <title>API Index</title>
-     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
--- 
-2.20.1
-
meta/recipes-support/gnutls/libtasn1/fix-ldflags.patch deleted +0 -31
deleted file mode 100644
index f18f3c62679..00000000000
@@ -1,31 +0,0 @@
-From a6f93b7ace347bc4fe29eb4a8fe4383d786cc8d0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim=20R=C3=BChsen?= <[email protected]>
-Date: Tue, 23 Jul 2019 20:44:01 +0200
-Subject: [PATCH] Fix LDFLAGS to AM_LDFLAGS in src/Makefile.am
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Tim Rühsen <[email protected]>
-Upstream-Status: Backport
-Signed-off-by: Anuj Mittal <[email protected]>
----
- src/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 5bf3622..4459767 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -21,7 +21,7 @@ AM_CPPFLAGS = -I$(top_builddir)/lib/includes -I$(top_srcdir)/lib/includes \
-  -I$(top_builddir)/lib/gl -I$(top_srcdir)/lib/gl $(CODE_COVERAGE_CPPFLAGS)
- 
- LDADD = ../lib/libtasn1.la
--LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
-+AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
- 
- bin_PROGRAMS = asn1Parser asn1Coding asn1Decoding
- 
--- 
-2.21.0
-
meta/recipes-support/gnutls/libtasn1_4.15.0.bb renamed from meta/recipes-support/gnutls/libtasn1_4.14.bb +7 -4
similarity index 72%
rename from meta/recipes-support/gnutls/libtasn1_4.14.bb
rename to meta/recipes-support/gnutls/libtasn1_4.15.0.bb
index ef2c1956a24..398faa29a86 100644
@@ -10,15 +10,18 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 
 SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \
            file://dont-depend-on-help2man.patch \
-           file://fix-ldflags.patch \
-           file://fix-gtkdoc.patch \
            "
 
 DEPENDS = "bison-native"
 
-SRC_URI[md5sum] = "e9918200ed4a778e2b3cbe34c1be4205"
-SRC_URI[sha256sum] = "9e604ba5c5c8ea403487695c2e407405820d98540d9de884d6e844f9a9c5ba08"
+SRC_URI[md5sum] = "33e3fb5501bb2142184238c815b0beb8"
+SRC_URI[sha256sum] = "dd77509fe8f5304deafbca654dc7f0ea57f5841f41ba530cff9a5bf71382739e"
 
 inherit autotools texinfo lib_package gtk-doc
 
+do_install_append () {
+    # this utility has a bogus RPATH
+    chrpath -d ${D}/${bindir}/corpus2array
+}
+
 BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1
#24 lore raw

Re: [PATCH 10/30] libtasn1: update to 4.15.0

Quoted 14 lines · Alexander Kanavin

Drop backports.

---
 .../gnutls/libtasn1/fix-gtkdoc.patch          | 38 ---------------
----
 .../gnutls/libtasn1/fix-ldflags.patch         | 31 ---------------
 .../{libtasn1_4.14.bb => libtasn1_4.15.0.bb}  | 11 ++++--
 3 files changed, 7 insertions(+), 73 deletions(-)
 delete mode 100644 meta/recipes-support/gnutls/libtasn1/fix-
gtkdoc.patch
 delete mode 100644 meta/recipes-support/gnutls/libtasn1/fix-
ldflags.patch
 rename meta/recipes-support/gnutls/{libtasn1_4.14.bb =>
Quoted 1 line

libtasn1_4.15.0.bb} (72%)

libtasn1-native fails:

https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/153

(probably host specific, centos7)

Cheers,

Richard

#25 lore raw

PATCH 11/30 sysklogd: Fix 2.0.3 upgrade fallouts on musl

In reply to Alexander Kanavin

From: Khem Raj <[email protected]>

Cc Alexander Kanavin <[email protected]>
---
 ...001-Remove-__BEGIN_DECLS-__END_DECLS.patch | 44 +++++++++++++++++++
 .../0002-include-sys-types.h-for-off_t.patch  | 29 ++++++++++++
 meta/recipes-extended/sysklogd/sysklogd.inc   |  2 +
 3 files changed, 75 insertions(+)
 create mode 100644 meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch
 create mode 100644 meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch
meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch new file +44 -0
new file mode 100644
index 00000000000..b2d45c0a0a6
@@ -0,0 +1,44 @@
+From 8c7995ac8da99eed55bf5410c558b1f0a74998d0 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 7 Dec 2019 10:27:28 -0800
+Subject: [PATCH 1/2] Remove __BEGIN_DECLS/__END_DECLS
+
+The __BEGIN_DECLS and __END_DECLS are internal identifiers in glibc and
+are not defined in any standard. Using them fails build on musl
+libc, its better to avoid them
+
+Upstream-Status: Submitted [https://github.com/troglobit/sysklogd/pull/10]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ src/syslog.h | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/syslog.h b/src/syslog.h
+index 4fb7627..120a18f 100644
+--- a/src/syslog.h
++++ b/src/syslog.h
+@@ -221,7 +221,9 @@ struct syslog_data {
+     .log_mask = 0xff, \
+ }
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ void	openlog    (const char *, int, int);
+ void	closelog   (void);
+ 
+@@ -245,7 +247,9 @@ void	syslogp_r  (int, struct syslog_data *, const char *, const char *,
+ 		    const char *, ...);
+ void	vsyslogp_r (int, struct syslog_data *, const char *, const char *,
+ 		    const char *, va_list);
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+ 
+ #else /* !__KERNEL__ */
+ 
+-- 
+2.24.0
+
meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch new file +29 -0
new file mode 100644
index 00000000000..799a7a4c4cd
@@ -0,0 +1,29 @@
+From 10cff4ba2d09b30f8f1967f910e8ab08447a8add Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 7 Dec 2019 10:31:04 -0800
+Subject: [PATCH 2/2] include sys/types.h for off_t
+
+Fixes
+error: unknown type name 'off_t'
+
+Upstream-Status: Submitted [https://github.com/troglobit/sysklogd/pull/10]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ src/compat.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/compat.h b/src/compat.h
+index a867636..1ef1bf0 100644
+--- a/src/compat.h
++++ b/src/compat.h
+@@ -34,6 +34,7 @@
+ #include <pthread.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/types.h>
+ 
+ /*
+  * The following macro is used to remove const cast-away warnings
+-- 
+2.24.0
+
meta/recipes-extended/sysklogd/sysklogd.inc +2 -0
index b90911af2b7..07edf403266 100644
@@ -14,6 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 inherit update-rc.d update-alternatives systemd autotools
 
 SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \
+           file://0001-Remove-__BEGIN_DECLS-__END_DECLS.patch \
+           file://0002-include-sys-types.h-for-off_t.patch \
            file://sysklogd \
            "
 S = "${WORKDIR}/git"
Signature · 1 line
2.17.1
#26 lore raw

PATCH 12/30 dos2unix: update to 7.4.1

In reply to Alexander Kanavin

License-Update: copyright years

---
 .../dos2unix/{dos2unix_7.4.0.bb => dos2unix_7.4.1.bb}        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-support/dos2unix/{dos2unix_7.4.0.bb => dos2unix_7.4.1.bb} (87%)
meta/recipes-support/dos2unix/dos2unix_7.4.1.bb renamed from meta/recipes-support/dos2unix/dos2unix_7.4.0.bb +2 -3
similarity index 87%
rename from meta/recipes-support/dos2unix/dos2unix_7.4.0.bb
rename to meta/recipes-support/dos2unix/dos2unix_7.4.1.bb
index 9a712706839..1623285fd0d 100644
@@ -6,13 +6,12 @@ HOMEPAGE = "http://waterlan.home.xs4all.nl/dos2unix.html"
 SECTION = "support"
 
 LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=1b78fca784db24f4a40e30b300787f3f"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=0c977b18f0a384d03597a517d7d03e32"
 
 SRC_URI = "git://git.code.sf.net/p/dos2unix/dos2unix"
 UPSTREAM_CHECK_GITTAGREGEX = "dos2unix-(?P<pver>(\d+(\.\d+)+))"
 
-# Release 7.4.0
-SRCREV = "1182533bde3c1fe65be2ead465e87671faa2c027"
+SRCREV = "0490f0723b1a0851b17343f6164915f3474b5197"
 
 S = "${WORKDIR}/git/dos2unix"
 
Signature · 1 line
2.17.1
#27 lore raw

PATCH 13/30 puzzles: update to latest revision

In reply to Alexander Kanavin

Remove 0001-Use-labs-instead-of-abs.patch as problem is fixed upstream.

---
 .../files/0001-Use-labs-instead-of-abs.patch  | 46 -------------------
 ...isade-Fix-warnings-with-clang-on-arm.patch | 24 ++++------
 ...-string-lenght-parameter-to-be-size_.patch | 23 +++++-----
 ...ix-compiling-failure-with-option-g-O.patch | 23 +++++-----
 meta/recipes-sato/puzzles/puzzles_git.bb      |  3 +-
 5 files changed, 35 insertions(+), 84 deletions(-)
 delete mode 100644 meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch
meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch deleted +0 -46
deleted file mode 100644
index f43d1df6cc8..00000000000
@@ -1,46 +0,0 @@
-From 9808dc09e08937c9bffd858d3ded428225a4312a Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Mon, 7 Sep 2015 09:02:38 +0000
-Subject: [PATCH] Use labs instead of abs
-
-cluevals is array of longs so we have to use labs() instead of abs()
-since abs() returns int
-
-Fixes
-
-keen.c:1458:17: error: absolute value function 'abs' given an argument
-of type 'long' but has parameter of type 'int' which may cause
-truncation of value
-
-Signed-off-by: Khem Raj <[email protected]>
----
-Upstream-Status: Pending
-
- keen.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/keen.c b/keen.c
-index a6a7238..1631992 100644
---- a/keen.c
-+++ b/keen.c
-@@ -1043,7 +1043,7 @@ done
- 		    cluevals[j] *= grid[i];
- 		    break;
- 		  case C_SUB:
--		    cluevals[j] = abs(cluevals[j] - grid[i]);
-+		    cluevals[j] = labs(cluevals[j] - grid[i]);
- 		    break;
- 		  case C_DIV:
- 		    {
-@@ -1455,7 +1455,7 @@ static int check_errors(const game_state *state, long *errors)
- 		cluevals[j] *= state->grid[i];
- 		break;
- 	      case C_SUB:
--		cluevals[j] = abs(cluevals[j] - state->grid[i]);
-+		cluevals[j] = labs(cluevals[j] - state->grid[i]);
- 		break;
- 	      case C_DIV:
- 		{
--- 
-2.5.1
-
meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch +10 -14
index 5351f8eb4e0..143e898a513 100644
@@ -1,7 +1,7 @@
-From 6d8326275802a2e6e61d3e99460af6891ae8362f Mon Sep 17 00:00:00 2001
+From 453587d714473b806473b309727f865b673cbc06 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 13 Jan 2016 23:10:19 -0800
-Subject: [puzzles][PATCH] palisade: Fix warnings with clang on arm
+Subject: [PATCH] palisade: Fix warnings with clang on arm
 
 ARM treats 'char' as unsigned char when 'char' is not qualified with
 'signed' or 'unsigned' explicitly.
@@ -16,17 +16,16 @@ type 'clue' (aka 'char') is always false
 Therefore, typcast the contant to char in such places to be explicit
 
 Signed-off-by: Khem Raj <[email protected]>
----
 Upstream-Status: Submitted
-
+---
  palisade.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/palisade.c b/palisade.c
-index 984e616..2b9c25c 100644
+index 6ffbf2d..8b54d42 100644
 --- a/palisade.c
 +++ b/palisade.c
-@@ -295,11 +295,11 @@ static void solver_connected_clues_versus_region_size(solver_ctx *ctx)
+@@ -304,11 +304,11 @@ static void solver_connected_clues_versus_region_size(solver_ctx *ctx)
       * If p = q = 3 then the region has size exactly 2. */
  
      for (i = 0; i < wh; ++i) {
@@ -40,8 +39,8 @@ index 984e616..2b9c25c 100644
              if ((8 - ctx->clues[i] - ctx->clues[j] > ctx->params->k) ||
                  (ctx->clues[i] == 3 && ctx->clues[j] == 3 &&
                   ctx->params->k != 2))
-@@ -317,7 +317,7 @@ static int solver_number_exhausted(solver_ctx *ctx)
-     int changed = FALSE;
+@@ -326,7 +326,7 @@ static bool solver_number_exhausted(solver_ctx *ctx)
+     bool changed = false;
  
      for (i = 0; i < wh; ++i) {
 -        if (ctx->clues[i] == EMPTY) continue;
@@ -49,16 +48,16 @@ index 984e616..2b9c25c 100644
  
          if (bitcount[(ctx->borders[i] & BORDER_MASK)] == ctx->clues[i]) {
              for (dir = 0; dir < 4; ++dir) {
-@@ -528,7 +528,7 @@ static int is_solved(const game_params *params, clue *clues,
+@@ -538,7 +538,7 @@ static bool is_solved(const game_params *params, clue *clues,
      for (i = 0; i < wh; ++i) {
-         if (dsf[i] == UNVISITED) dfs_dsf(i, params->w, border, dsf, TRUE);
+         if (dsf[i] == UNVISITED) dfs_dsf(i, params->w, border, dsf, true);
          if (dsf_size(dsf, i) != k) goto error;
 -        if (clues[i] == EMPTY) continue;
 +        if (clues[i] == (char)EMPTY) continue;
          if (clues[i] != bitcount[border[i] & BORDER_MASK]) goto error;
      }
  
-@@ -674,7 +674,7 @@ static char *new_game_desc(const game_params *params, random_state *rs,
+@@ -685,7 +685,7 @@ static char *new_game_desc(const game_params *params, random_state *rs,
      p = numbers;
      r = 0;
      for (i = 0; i < wh; ++i) {
@@ -67,6 +66,3 @@ index 984e616..2b9c25c 100644
              while (r) {
                  while (r > 26) {
                      *p++ = 'z';
--- 
-2.7.0
-
meta/recipes-sato/puzzles/files/0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch +12 -11
index 9ac62015d8c..7ca582fe5d6 100644
@@ -1,4 +1,4 @@
-From 035467aa0abfbc0de7e5d24543d4aab37301593c Mon Sep 17 00:00:00 2001
+From 3af5a1e579e3324a13ba1f892c7befb3ab32d899 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Thu, 7 Mar 2019 21:56:57 -0800
 Subject: [PATCH] pattern.c: Change string lenght parameter to be size_t in
@@ -11,23 +11,24 @@ pattern.c:455:9: error: 'memset' specified size between 18446744071562067968 and
 Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <[email protected]>
+
 ---
  pattern.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/pattern.c b/pattern.c
-index 45b1b0c..f73a4c2 100644
+index ffadd3f..4e5f187 100644
 --- a/pattern.c
 +++ b/pattern.c
-@@ -428,7 +428,7 @@ static int do_row(unsigned char *known, unsigned char *deduced,
-                   unsigned char *row,
-                   unsigned char *minpos_done, unsigned char *maxpos_done,
- 		  unsigned char *minpos_ok, unsigned char *maxpos_ok,
--                  unsigned char *start, int len, int step, int *data,
-+                  unsigned char *start, size_t len, int step, int *data,
- 		  unsigned int *changed
+@@ -428,7 +428,7 @@ static bool do_row(unsigned char *known, unsigned char *deduced,
+                    unsigned char *row,
+                    unsigned char *minpos_done, unsigned char *maxpos_done,
+                    unsigned char *minpos_ok, unsigned char *maxpos_ok,
+-                   unsigned char *start, int len, int step, int *data,
++                   unsigned char *start, size_t len, int step, int *data,
+                    unsigned int *changed
  #ifdef STANDALONE_SOLVER
- 		  , const char *rowcol, int index, int cluewid
+                    , const char *rowcol, int index, int cluewid
 -- 
-2.21.0
+2.17.1
 
meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch +12 -11
index c134acde2f2..28040523d4f 100644
@@ -1,4 +1,7 @@
-gtk.c: fix compiling failure with option -g -O
+From 876c6ff1e20f51b0921acda99861f476b6423f26 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <[email protected]>
+Date: Mon, 11 Aug 2014 12:39:53 +0800
+Subject: [PATCH] gtk.c: fix compiling failure with option -g -O
 
 There were compiling failure with option -g -O
 ...
@@ -21,23 +24,21 @@ Initialized pointer 'cr' and 'error' with NULL
 Upstream-Status: Pending
 
 Signed-off-by: Hongxu Jia <[email protected]>
+
 ---
- gtk.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ gtk.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gtk.c b/gtk.c
-index a2eba2c..c54bf63 100644
+index 4565836..5e83b48 100644
 --- a/gtk.c
 +++ b/gtk.c
-@@ -2481,7 +2481,7 @@ char *fgetline(FILE *fp)
+@@ -2944,7 +2944,7 @@ static void list_presets_from_menu(struct preset_menu *menu)
  int main(int argc, char **argv)
  {
      char *pname = argv[0];
 -    char *error;
 +    char *error = NULL;
-     int ngenerate = 0, print = FALSE, px = 1, py = 1;
-     int time_generation = FALSE, test_solve = FALSE, list_presets = FALSE;
-     int soln = FALSE, colour = FALSE;
--- 
-1.9.1
-
+     int ngenerate = 0, px = 1, py = 1;
+     bool print = false;
+     bool time_generation = false, test_solve = false, list_presets = false;
meta/recipes-sato/puzzles/puzzles_git.bb +1 -2
index 5ee9164b85f..57f2af48eb8 100644
@@ -10,7 +10,6 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
            file://fix-compiling-failure-with-option-g-O.patch \
-           file://0001-Use-labs-instead-of-abs.patch \
            file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \
            file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \
            file://0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch \
@@ -18,7 +17,7 @@ SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
            "
 
 UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "c6e0161dd475415316ed66dc82794d68e52f0025"
+SRCREV = "1c0c49dd5cd8df6ae87f7be5371be84589fa2662"
 PE = "2"
 PV = "0.0+git${SRCPV}"
 
Signature · 1 line
2.17.1
#28 lore raw

PATCH 14/30 glide: update to 0.13.3

In reply to Alexander Kanavin
---
 .../recipes-devtools/glide/{glide_0.13.2.bb => glide_0.13.3.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/glide/{glide_0.13.2.bb => glide_0.13.3.bb} (98%)
meta/recipes-devtools/glide/glide_0.13.3.bb renamed from meta/recipes-devtools/glide/glide_0.13.2.bb +1 -1
similarity index 98%
rename from meta/recipes-devtools/glide/glide_0.13.2.bb
rename to meta/recipes-devtools/glide/glide_0.13.3.bb
index 7faaf4a3888..ebad0ec60a0 100644
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=54905cf894f8cc416a92f4fc
 
 GO_IMPORT = "github.com/Masterminds/glide"
 SRC_URI = "git://${GO_IMPORT}"
-SRCREV = "9ef6ca313b3200079861f2de4e567b1d22081d19"
+SRCREV = "8ed5b9292379d86c39592a7e6a58eb9c903877cf"
 
 inherit go
 
Signature · 1 line
2.17.1
#29 lore raw

PATCH 15/30 bluez: update 5.50 -> 5.52

In reply to Alexander Kanavin

Drop a big pile of backports.

Disable zsh completions, as they're unlikely to be useful.

(From OE-Core rev: dad8cd50bcc4203a65d153dc2445502c1e728975)

---
 meta/recipes-connectivity/bluez5/bluez5.inc   |  22 +-
 ...d-without-systemd-in-the-user-sessio.patch |  12 +-
 ...kefile.am-Fix-a-race-issue-for-tools.patch |  30 --
 ...x-build-after-y2038-changes-in-glibc.patch |  68 ---
 ...1-tools-btpclient.c-include-signal.h.patch |  30 --
 .../bluez5/bluez5/CVE-2018-10910.patch        | 505 ------------------
 .../bluez5/bluez5/gcc9-fixes.patch            | 301 -----------
 .../bluez5/bluez5/out-of-tree.patch           |  26 -
 .../bluez5/{bluez5_5.50.bb => bluez5_5.52.bb} |   4 +-
 9 files changed, 16 insertions(+), 982 deletions(-)
 delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-Makefile.am-Fix-a-race-issue-for-tools.patch
 delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch
 delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-tools-btpclient.c-include-signal.h.patch
 delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/CVE-2018-10910.patch
 delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/gcc9-fixes.patch
 delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch
 rename meta/recipes-connectivity/bluez5/{bluez5_5.50.bb => bluez5_5.52.bb} (91%)
meta/recipes-connectivity/bluez5/bluez5.inc +8 -14
index 484509350b0..150d909d735 100644
@@ -46,20 +46,13 @@ PACKAGECONFIG[mesh] = "--enable-mesh,--disable-mesh, json-c ell"
 PACKAGECONFIG[btpclient] = "--enable-btpclient,--disable-btpclient, ell"
 PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev"
 
-SRC_URI = "\
-    ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
-    file://out-of-tree.patch \
-    file://init \
-    file://run-ptest \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \
-    file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \
-    file://0001-test-gatt-Fix-hung-issue.patch \
-    file://0001-Makefile.am-Fix-a-race-issue-for-tools.patch \
-    file://CVE-2018-10910.patch \
-    file://gcc9-fixes.patch \
-    file://0001-tools-Fix-build-after-y2038-changes-in-glibc.patch \
-    file://0001-tools-btpclient.c-include-signal.h.patch \
-"
+SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
+           file://init \
+           file://run-ptest \
+           ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \
+           file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \
+           file://0001-test-gatt-Fix-hung-issue.patch \
+           "
 S = "${WORKDIR}/bluez-${PV}"
 
 CVE_PRODUCT = "bluez"
@@ -70,6 +63,7 @@ EXTRA_OECONF = "\
   --enable-test \
   --enable-datafiles \
   --enable-library \
+  --without-zsh-completion-dir \
 "
 
 # bluez5 builds a large number of useful utilities but does not
meta/recipes-connectivity/bluez5/bluez5/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch +6 -6
index da7140922d9..618ed734a96 100644
@@ -1,4 +1,4 @@
-From 99ccdbe155028c4c789803a429072675b87d0c3a Mon Sep 17 00:00:00 2001
+From f74eb97c9fb3c0ee2895742e773ac6a3c41c999c Mon Sep 17 00:00:00 2001
 From: Giovanni Campagna <[email protected]>
 Date: Sat, 12 Oct 2013 17:45:25 +0200
 Subject: [PATCH] Allow using obexd without systemd in the user session
@@ -17,22 +17,22 @@ http://thread.gmane.org/gmane.linux.bluez.kernel/38725/focus=38843
 Signed-off-by: Javier Viguera <[email protected]>
 
 ---
- Makefile.obexd                                                  | 4 ++--
- obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} | 2 +-
+ Makefile.obexd                                                | 4 ++--
+ .../src/{org.bluez.obex.service => org.bluez.obex.service.in} | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)
  rename obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} (76%)
 
 diff --git a/Makefile.obexd b/Makefile.obexd
-index c462692..0325f66 100644
+index de59d29..73004a3 100644
 --- a/Makefile.obexd
 +++ b/Makefile.obexd
 @@ -1,12 +1,12 @@
  if SYSTEMD
- systemduserunitdir = @SYSTEMD_USERUNITDIR@
+ systemduserunitdir = $(SYSTEMD_USERUNITDIR)
  systemduserunit_DATA = obexd/src/obex.service
 +endif
  
- dbussessionbusdir = @DBUS_SESSIONBUSDIR@
+ dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
  dbussessionbus_DATA = obexd/src/org.bluez.obex.service
 -endif
  
meta/recipes-connectivity/bluez5/bluez5/0001-Makefile.am-Fix-a-race-issue-for-tools.patch deleted +0 -30
deleted file mode 100644
index b6cb978393e..00000000000
@@ -1,30 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-From 117c41242c01e057295aed80ed973c6dc7e35fe2 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Tue, 8 Oct 2019 11:01:56 +0100
-Subject: [PATCH BlueZ] Makefile.am: add missing mkdir in rules generation
-
-In parallel out-of-tree builds it's possible that tools/*.rules are
-generated before the target directory has been implicitly created. Solve this by
-creating the directory before writing into it.
----
- Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 2ac28b23d..e7bcd2366 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -589,6 +589,7 @@ src/builtin.h: src/genbuiltin $(builtin_sources)
- 	$(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
- 
- tools/%.rules:
-+	$(AM_V_at)$(MKDIR_P) tools
- 	$(AM_V_GEN)cp $(srcdir)/$(subst 97-,,$@) $@
- 
- $(lib_libbluetooth_la_OBJECTS): $(local_headers)
--- 
-2.20.1
-
meta/recipes-connectivity/bluez5/bluez5/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch deleted +0 -68

68 lines not on this page · raw message

meta/recipes-connectivity/bluez5/bluez5/0001-tools-btpclient.c-include-signal.h.patch deleted +0 -30
deleted file mode 100644
index 620aaabc687..00000000000
@@ -1,30 +0,0 @@
-From 0b1766514f6847c7367fce07f19a750ec74c11a6 Mon Sep 17 00:00:00 2001
-From: Robert Yang <[email protected]>
-Date: Thu, 26 Sep 2019 16:19:34 +0800
-Subject: [PATCH] tools/btpclient.c: include signal.h
-
-Fix compile failure when configure --enable-btpclient:
-btpclient.c:2834:7: error: 'SIGINT' undeclared (first use in this function)
-
-Upstream-Status: Backport [A subset of the full fix that went upstream]
-
-Signed-off-by: Robert Yang <[email protected]>
----
- tools/btpclient.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/btpclient.c b/tools/btpclient.c
-index b217df5..aece7fe 100644
---- a/tools/btpclient.c
-+++ b/tools/btpclient.c
-@@ -29,6 +29,7 @@
- #include <stdlib.h>
- #include <assert.h>
- #include <getopt.h>
-+#include <signal.h>
- 
- #include <ell/ell.h>
- 
--- 
-2.7.4
-
meta/recipes-connectivity/bluez5/bluez5/CVE-2018-10910.patch deleted +0 -505

505 lines not on this page · raw message

meta/recipes-connectivity/bluez5/bluez5/gcc9-fixes.patch deleted +0 -301

301 lines not on this page · raw message

meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch deleted +0 -26
deleted file mode 100644
index 76ed7792589..00000000000
@@ -1,26 +0,0 @@
-From ed55b49a226ca3909f52416be2ae5ce1c5ca2cb2 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Fri, 22 Apr 2016 15:40:37 +0100
-Subject: [PATCH] Makefile.obexd: add missing mkdir in builtin.h generation
-
-In parallel out-of-tree builds it's possible that obexd/src/builtin.h is
-generated before the target directory has been implicitly created. Solve this by
-creating the directory before writing into it.
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
----
- Makefile.obexd | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile.obexd b/Makefile.obexd
-index 2e33cbc..c8286f0 100644
---- a/Makefile.obexd
-+++ b/Makefile.obexd
-@@ -105,2 +105,3 @@ obexd/src/plugin.$(OBJEXT): obexd/src/builtin.h
- obexd/src/builtin.h: obexd/src/genbuiltin $(obexd_builtin_sources)
-+	$(AM_V_at)$(MKDIR_P) $(dir $@)
- 	$(AM_V_GEN)$(srcdir)/obexd/src/genbuiltin $(obexd_builtin_modules) > $@
--- 
-2.8.0.rc3
-
meta/recipes-connectivity/bluez5/bluez5_5.52.bb renamed from meta/recipes-connectivity/bluez5/bluez5_5.50.bb +2 -2
similarity index 91%
rename from meta/recipes-connectivity/bluez5/bluez5_5.50.bb
rename to meta/recipes-connectivity/bluez5/bluez5_5.52.bb
index 4e443e5fb08..b86103014b8 100644
@@ -1,7 +1,7 @@
 require bluez5.inc
 
-SRC_URI[md5sum] = "8e35c67c81a55d3ad4c9f22280dae178"
-SRC_URI[sha256sum] = "5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911"
+SRC_URI[md5sum] = "a33eb9aadf1dd4153420958709d3ce60"
+SRC_URI[sha256sum] = "f7144ce2039202cfac18ccb52426efea11c98e4f6e1bb8041bcb994b8378560a"
 
 # noinst programs in Makefile.tools that are conditional on READLINE
 # support
Signature · 1 line
2.17.1
#30 lore raw

PATCH 16/30 bluez5: disable debug output in ptests

In reply to Alexander Kanavin

This makes the log very large and breaks the ptest result parser.

---
 meta/recipes-connectivity/bluez5/bluez5/run-ptest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/bluez5/bluez5/run-ptest +1 -1
index 21df00c3277..0335e68e489 100644
@@ -6,7 +6,7 @@ failed=0
 all=0
 
 for f in test-*; do
-    "./$f"
+    "./$f" -q
     case "$?" in
         0)
             echo "PASS: $f"
Signature · 1 line
2.17.1
#31 lore raw

PATCH 17/30 libxml2: update to 2.9.10

In reply to Alexander Kanavin
---
 ...he-python-tests-if-python-is-enabled.patch | 62 ++++++++++---------
 .../{libxml2_2.9.9.bb => libxml2_2.9.10.bb}   |  4 +-
 2 files changed, 34 insertions(+), 32 deletions(-)
 rename meta/recipes-core/libxml/{libxml2_2.9.9.bb => libxml2_2.9.10.bb} (96%)
meta/recipes-core/libxml/libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch +32 -30
index 2b92dbc8dcb..5e9a0a506bd 100644
@@ -1,4 +1,4 @@
-From 78dbd4c09d617a9cb730d796f94ee4d93840d3cc Mon Sep 17 00:00:00 2001
+From 2b5fb416aa275fd2a17a0139a2f783998bcb42cc Mon Sep 17 00:00:00 2001
 From: Peter Kjellerstedt <[email protected]>
 Date: Fri, 9 Jun 2017 17:50:46 +0200
 Subject: [PATCH] Make ptest run the python tests if python is enabled
@@ -8,18 +8,19 @@ be due to the fact that the tests are forced to run with Python 3.
 
 Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Peter Kjellerstedt <[email protected]>
+
 ---
  Makefile.am                  |  2 +-
  python/Makefile.am           |  9 +++++++++
- python/tests/Makefile.am     | 12 ++++++++++--
+ python/tests/Makefile.am     | 10 ++++++++++
  python/tests/tstLastError.py |  2 +-
- 4 files changed, 21 insertions(+), 4 deletions(-)
+ 4 files changed, 21 insertions(+), 2 deletions(-)
 
-Index: libxml2-2.9.7/Makefile.am
-===================================================================
---- libxml2-2.9.7.orig/Makefile.am
-+++ libxml2-2.9.7/Makefile.am
-@@ -207,9 +207,9 @@ install-ptest:
+diff --git a/Makefile.am b/Makefile.am
+index ae62274..bd1e425 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -203,9 +203,9 @@ install-ptest:
  	install $(check_PROGRAMS) $(DESTDIR))
  	cp -r $(srcdir)/test $(DESTDIR)
  	cp -r $(srcdir)/result $(DESTDIR)
@@ -30,11 +31,11 @@ Index: libxml2-2.9.7/Makefile.am
  
  runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \
            testchar$(EXEEXT) testdict$(EXEEXT) runxmlconf$(EXEEXT)
-Index: libxml2-2.9.7/python/Makefile.am
-===================================================================
---- libxml2-2.9.7.orig/python/Makefile.am
-+++ libxml2-2.9.7/python/Makefile.am
-@@ -48,7 +48,16 @@ GENERATED = libxml2class.py libxml2class
+diff --git a/python/Makefile.am b/python/Makefile.am
+index 34aed96..ba3ec6a 100644
+--- a/python/Makefile.am
++++ b/python/Makefile.am
+@@ -48,7 +48,16 @@ GENERATED = libxml2class.py libxml2class.txt $(BUILT_SOURCES)
  
  $(GENERATED): $(srcdir)/generator.py $(API_DESC)
  	$(PYTHON) $(srcdir)/generator.py $(srcdir)
@@ -51,10 +52,10 @@ Index: libxml2-2.9.7/python/Makefile.am
 +.PHONY: tests test
  tests test: all
  	cd tests && $(MAKE) tests
-Index: libxml2-2.9.7/python/tests/Makefile.am
-===================================================================
---- libxml2-2.9.7.orig/python/tests/Makefile.am
-+++ libxml2-2.9.7/python/tests/Makefile.am
+diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am
+index 227e24d..021bb29 100644
+--- a/python/tests/Makefile.am
++++ b/python/tests/Makefile.am
 @@ -59,6 +59,11 @@ XMLS=		\
  CLEANFILES = core tmp.xml *.pyc
  
@@ -67,24 +68,25 @@ Index: libxml2-2.9.7/python/tests/Makefile.am
  tests: $(PYTESTS)
  	@for f in $(XMLS) ; do test -f $$f || $(LN_S) $(srcdir)/$$f . ; done
  	@echo "## running Python regression tests"
-@@ -68,8 +73,11 @@ tests: $(PYTESTS)
- 	   export LD_LIBRARY_PATH; \
- 	   for test in $(PYTESTS) ; \
- 	   do log=`$(PYTHON) $(srcdir)/$$test` ; \
--	   if [ "`echo $$log | grep OK`" = "" ] ; then \
--	   echo "-- $$test" ; echo "$$log" ; fi ; done)
-+	   if [ "`echo $$log | grep OK`" ]; then \
-+	   echo "PASS: $$test"; else \
-+	   echo "$$log"; echo "FAIL: $$test"; fi; done)
+@@ -70,9 +75,14 @@ tests: $(PYTESTS)
+ 	    if [ "$$?" -ne 0 ] ; then \
+ 	      echo "-- $$test" ; \
+ 	      echo "$$log" ; \
++              echo "FAIL: $$test"; \
+ 	      exit 1 ; \
++            else \
++              echo "PASS: $$test"; \
+ 	    fi ; \
+ 	  done)
  else
 +install-ptest:
 +
  tests:
  endif
-Index: libxml2-2.9.7/python/tests/tstLastError.py
-===================================================================
---- libxml2-2.9.7.orig/python/tests/tstLastError.py
-+++ libxml2-2.9.7/python/tests/tstLastError.py
+diff --git a/python/tests/tstLastError.py b/python/tests/tstLastError.py
+index 81d0acc..162c8db 100755
+--- a/python/tests/tstLastError.py
++++ b/python/tests/tstLastError.py
 @@ -25,7 +25,7 @@ class TestCase(unittest.TestCase):
          when the exception is raised, check the libxml2.lastError for
          expected values."""
meta/recipes-core/libxml/libxml2_2.9.10.bb renamed from meta/recipes-core/libxml/libxml2_2.9.9.bb +2 -2
similarity index 96%
rename from meta/recipes-core/libxml/libxml2_2.9.9.bb
rename to meta/recipes-core/libxml/libxml2_2.9.10.bb
index 5a7e098f382..2c833fa7a2c 100644
@@ -22,8 +22,8 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \
            file://fix-execution-of-ptests.patch \
            "
 
-SRC_URI[libtar.md5sum] = "c04a5a0a042eaa157e8e8c9eabe76bd6"
-SRC_URI[libtar.sha256sum] = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"
+SRC_URI[libtar.md5sum] = "10942a1dc23137a8aa07f0639cbfece5"
+SRC_URI[libtar.sha256sum] = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"
 SRC_URI[testtar.md5sum] = "ae3d1ebe000a3972afa104ca7f0e1b4a"
 SRC_URI[testtar.sha256sum] = "96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7"
 
Signature · 1 line
2.17.1
#32 lore raw

PATCH 18/30 parted: update 3.2->3.3

In reply to Alexander Kanavin

0001-Unset-need_charset_alias-when-building-for-musl.patch is no longer necessary as upstream has removed the code.

dm_check.patch is replaced with 0002-tests-use-skip_-rather-than-skip_test_-which-is-unde.patch

Rework ptests, in particular remove the generated Makefile from the layer, and use the upstream Makefile.

Ptest pass rate is 100%.

---
 ...1-Include-fcntl.h-in-platform_defs.h.patch |  33 --
 ...er-scripts-used-only-in-tests-to-Pyt.patch |  23 +-
 ...charset_alias-when-building-for-musl.patch |  33 --
 ...ad-only-when-probing-devices-on-linu.patch | 222 --------------
 ...s-add-sourcedir-lib-to-include-paths.patch |  26 ++
 ...lude-sys-sysmacros.h-for-major-macro.patch |  28 --
 ...rather-than-skip_test_-which-is-unde.patch |  66 ++++
 meta/recipes-extended/parted/files/Makefile   | 285 ------------------
 .../parted/files/dm_check.patch               |  22 --
 .../files/fix-compile-failure-while-dis.patch |  81 -----
 meta/recipes-extended/parted/files/run-ptest  |   2 +-
 .../parted/{parted_3.2.bb => parted_3.3.bb}   |  33 +-
 12 files changed, 117 insertions(+), 737 deletions(-)
 delete mode 100644 meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch
 delete mode 100644 meta/recipes-extended/parted/files/0001-Unset-need_charset_alias-when-building-for-musl.patch
 delete mode 100644 meta/recipes-extended/parted/files/0001-libparted-Use-read-only-when-probing-devices-on-linu.patch
 create mode 100644 meta/recipes-extended/parted/files/0001-libparted-fs-add-sourcedir-lib-to-include-paths.patch
 delete mode 100644 meta/recipes-extended/parted/files/0001-linux-Include-sys-sysmacros.h-for-major-macro.patch
 create mode 100644 meta/recipes-extended/parted/files/0002-tests-use-skip_-rather-than-skip_test_-which-is-unde.patch
 delete mode 100644 meta/recipes-extended/parted/files/Makefile
 delete mode 100644 meta/recipes-extended/parted/files/dm_check.patch
 delete mode 100644 meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch
 rename meta/recipes-extended/parted/{parted_3.2.bb => parted_3.3.bb} (61%)
meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch deleted +0 -33
deleted file mode 100644
index 4070127d343..00000000000
@@ -1,33 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-From a3877115f1956949096d77aca5a703a47ed68397 Mon Sep 17 00:00:00 2001
-From: Felix Janda <[email protected]>
-Date: Sun, 3 May 2015 10:33:31 +0200
-Subject: [PATCH] libparted/fs/xfs/platform_defs.h: Include <fcntl.h> for
- loff_t
-
-This is needed for compilation with musl libc
-
-Suggested-by: Travis Tilley <[email protected]>
-
-Signed-off-by: Brian C. Lane <[email protected]>
----
- libparted/fs/xfs/platform_defs.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libparted/fs/xfs/platform_defs.h b/libparted/fs/xfs/platform_defs.h
-index 2b55752..a6ec8fb 100644
---- a/libparted/fs/xfs/platform_defs.h
-+++ b/libparted/fs/xfs/platform_defs.h
-@@ -38,6 +38,7 @@
- #include <stdarg.h>
- #include <assert.h>
- #include <endian.h>
-+#include <fcntl.h>
- #include <stddef.h>
- #include <stdlib.h>
- #include <string.h>
--- 
-2.11.0
-
meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch +6 -17
index 428b14ed5e0..829c0c8b78d 100644
@@ -1,17 +1,18 @@
-From 6e82af54714392dcdf74a8aedaae7de7d0af1080 Mon Sep 17 00:00:00 2001
+From ddbefd80d74c3baaae328332458db447e1666240 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Thu, 27 Apr 2017 16:37:24 +0300
 Subject: [PATCH] Move python helper scripts (used only in tests) to Python 3
 
 Upstream-Status: Pending
 Signed-off-by: Alexander Kanavin <[email protected]>
+
 ---
  tests/gpt-header-move | 2 +-
- tests/msdos-overlap   | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ tests/msdos-overlap   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/tests/gpt-header-move b/tests/gpt-header-move
-index 05cdc65..3cbcb7e 100755
+index 3dda5cb..a2b9508 100755
 --- a/tests/gpt-header-move
 +++ b/tests/gpt-header-move
 @@ -1,4 +1,4 @@
@@ -21,7 +22,7 @@ index 05cdc65..3cbcb7e 100755
  # open img file, subtract 33 from altlba address, and move the last 33 sectors
  # back by 33 sectors
 diff --git a/tests/msdos-overlap b/tests/msdos-overlap
-index 5bddfb0..3de7d2e 100755
+index d6ae8d6..2c6747b 100755
 --- a/tests/msdos-overlap
 +++ b/tests/msdos-overlap
 @@ -1,4 +1,4 @@
@@ -30,15 +31,3 @@ index 5bddfb0..3de7d2e 100755
  """
      Write an overlapping partition to a msdos disk
  
-@@ -14,7 +14,7 @@ BAD_ENTRY = (0x72, 0xf5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- OFFSET = 0x1b8
- 
- if len(sys.argv) < 2:
--    print "%s: <image or device>"
-+    print("%s: <image or device>")
-     sys.exit(1)
- 
- data = "".join(chr(c) for c in BAD_ENTRY)
--- 
-2.11.0
-
meta/recipes-extended/parted/files/0001-Unset-need_charset_alias-when-building-for-musl.patch deleted +0 -33
deleted file mode 100644
index ba1a4bab4c1..00000000000
@@ -1,33 +0,0 @@
-From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Mon, 13 Apr 2015 17:02:13 -0700
-Subject: [PATCH] Unset need_charset_alias when building for musl
-
-localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
-which actually shoudl be fixed in gnulib and then all downstream
-projects will get it eventually. For now we apply the fix to
-coreutils
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
----
- lib/gnulib.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/gnulib.mk b/lib/gnulib.mk
-index e1d74db..c0e92dd 100644
---- a/lib/gnulib.mk
-+++ b/lib/gnulib.mk
-@@ -1882,7 +1882,7 @@ install-exec-localcharset: all-local
- 	  case '$(host_os)' in \
- 	    darwin[56]*) \
- 	      need_charset_alias=true ;; \
--	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-+	    darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
- 	      need_charset_alias=false ;; \
- 	    *) \
- 	      need_charset_alias=true ;; \
--- 
-2.1.4
-
meta/recipes-extended/parted/files/0001-libparted-Use-read-only-when-probing-devices-on-linu.patch deleted +0 -222

222 lines not on this page · raw message

meta/recipes-extended/parted/files/0001-libparted-fs-add-sourcedir-lib-to-include-paths.patch new file +26 -0
new file mode 100644
index 00000000000..4dc2ab259d4
@@ -0,0 +1,26 @@
+From d60a8a86f6593738b5324ccd8fe3e6d84a1fe7bc Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Wed, 11 Dec 2019 14:18:36 +0100
+Subject: [PATCH] libparted/fs: add $sourcedir/lib to include paths
+
+Otherwise, getopt-pfx-core.h won't be found.
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ libparted/fs/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
+index 286bff6..65f45d3 100644
+--- a/libparted/fs/Makefile.am
++++ b/libparted/fs/Makefile.am
+@@ -3,7 +3,7 @@
+ #
+ # This file may be modified and/or distributed without restriction.
+ 
+-partedincludedir = -I$(top_builddir)/include -I$(top_srcdir)/include
++partedincludedir = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/lib
+ 
+ AM_CFLAGS = $(WARN_CFLAGS)
+ 
meta/recipes-extended/parted/files/0001-linux-Include-sys-sysmacros.h-for-major-macro.patch deleted +0 -28
deleted file mode 100644
index 01262e5452a..00000000000
@@ -1,28 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-From 0b72b8eb41438b62eeb9e3548b0b8f3094a78681 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <[email protected]>
-Date: Sat, 24 Mar 2018 17:37:02 +0000
-Subject: [PATCH] linux: Include <sys/sysmacros.h> for major() macro.
-
-Since glibc 2.27 this header is required.
----
- libparted/arch/linux.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
-index 0f18904..a15854f 100644
---- a/libparted/arch/linux.c
-+++ b/libparted/arch/linux.c
-@@ -41,6 +41,7 @@
- #include <sys/utsname.h>        /* for uname() */
- #include <scsi/scsi.h>
- #include <assert.h>
-+#include <sys/sysmacros.h>
- #ifdef ENABLE_DEVICE_MAPPER
- #include <libdevmapper.h>
- #endif
--- 
-2.11.0
-
meta/recipes-extended/parted/files/0002-tests-use-skip_-rather-than-skip_test_-which-is-unde.patch new file +66 -0

66 lines not on this page · raw message

meta/recipes-extended/parted/files/Makefile deleted +0 -285

285 lines not on this page · raw message

meta/recipes-extended/parted/files/dm_check.patch deleted +0 -22
deleted file mode 100644
index 5f3c4ddae8b..00000000000
@@ -1,22 +0,0 @@
-parted: change check for device-manager
-
-Other ptests use this method.
-
-Upstream-Status: Submitted [[email protected]]
-
-Signed-off-by: Joe Slater <[email protected]>
-
-
---- a/tests/t6001-psep.sh
-+++ b/tests/t6001-psep.sh
-@@ -19,7 +19,9 @@
- . "${srcdir=.}/init.sh"; path_prepend_ ../parted
- 
- require_root_
--(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed"
-+
-+test "x$ENABLE_DEVICE_MAPPER" = xyes \
-+  || skip_ "no device-mapper support"
- 
- # Device maps names - should be random to not conflict with existing ones on
- # the system
meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch deleted +0 -81

81 lines not on this page · raw message

meta/recipes-extended/parted/files/run-ptest +1 -1
index 695c5e8a7bb..b57c29400ab 100644
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-make -C tests check-TESTS
+make -C tests test-suite.log
meta/recipes-extended/parted/parted_3.3.bb renamed from meta/recipes-extended/parted/parted_3.2.bb +18 -15
similarity index 61%
rename from meta/recipes-extended/parted/parted_3.2.bb
rename to meta/recipes-extended/parted/parted_3.3.bb
index 21a815345a9..1cfd9ec2648 100644
@@ -4,25 +4,19 @@ LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c"
 SECTION = "console/tools"
 DEPENDS = "ncurses readline util-linux virtual/libiconv"
-PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \
            file://no_check.patch \
            file://fix-doc-mandir.patch \
-           file://fix-compile-failure-while-dis.patch \
-           file://0001-Include-fcntl.h-in-platform_defs.h.patch \
-           file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
            file://0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch \
            file://0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch \
-	   file://0001-linux-Include-sys-sysmacros.h-for-major-macro.patch \
            file://run-ptest \
-           file://Makefile \
-           file://0001-libparted-Use-read-only-when-probing-devices-on-linu.patch \
-           file://dm_check.patch \
-"
+           file://0001-libparted-fs-add-sourcedir-lib-to-include-paths.patch \
+           file://0002-tests-use-skip_-rather-than-skip_test_-which-is-unde.patch \
+           "
 
-SRC_URI[md5sum] = "0247b6a7b314f8edeb618159fa95f9cb"
-SRC_URI[sha256sum] = "858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4"
+SRC_URI[md5sum] = "090655d05f3c471aa8e15a27536889ec"
+SRC_URI[sha256sum] = "57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44"
 
 EXTRA_OECONF = "--disable-device-mapper"
 
@@ -31,7 +25,7 @@ inherit autotools pkgconfig gettext texinfo ptest
 BBCLASSEXTEND = "native"
 
 do_compile_ptest() {
-	oe_runmake -C tests print-align print-max dup-clobber duplicate fs-resize
+	oe_runmake -C tests print-align print-max dup-clobber duplicate fs-resize print-flags
 }
 
 do_install_ptest() {
@@ -39,15 +33,24 @@ do_install_ptest() {
 	mkdir $t/build-aux
 	cp ${S}/build-aux/test-driver $t/build-aux/
 	cp -r ${S}/tests $t
-	cp ${WORKDIR}/Makefile $t/tests/
+	cp ${B}/tests/Makefile $t/tests/
 	sed -i "s|^VERSION.*|VERSION = ${PV}|g" $t/tests/Makefile
-	for i in print-align print-max dup-clobber duplicate fs-resize; \
+	sed -i "s|^srcdir =.*|srcdir = \.|g" $t/tests/Makefile
+	sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" $t/tests/Makefile
+	sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g" $t/tests/Makefile
+	sed -i "s|^Makefile:.*|Makefile:|g" $t/tests/Makefile
+	for i in print-align print-max print-flags dup-clobber duplicate fs-resize; \
 	  do cp ${B}/tests/.libs/$i $t/tests/; \
 	done
 	sed -e 's| ../parted||' -i $t/tests/*.sh
 }
 
-RDEPENDS_${PN}-ptest = "bash coreutils perl util-linux-losetup python3 make"
+RDEPENDS_${PN}-ptest = "bash coreutils perl util-linux-losetup python3 make gawk e2fsprogs-mke2fs"
+
+RDEPENDS_${PN}-ptest_append_libc-glibc = "\
+        glibc-utils \
+        locale-base-en-us \
+        "
 
 inherit update-alternatives
 
Signature · 1 line
2.17.1
#33 lore raw

PATCH 19/30 acl/attr: update to latest upstream releases

In reply to Alexander Kanavin

The latest release use standard autotools, so drop all the build system related hacks and patches.

Ptests have been rewritten, with 100% pass rate for both.

---
 .../0001-test-patch-out-failing-bits.patch    |  63 ++
 ...dcode-the-build-path-into-a-helper-l.patch |  24 +
 ...file-libacl-should-depend-on-include.patch |  51 --
 ...-order-of-expected-output-of-getfacl.patch | 198 ------
 meta/recipes-support/attr/acl/configure.ac    |  49 --
 meta/recipes-support/attr/acl/run-ptest       |  60 +-
 .../acl/test-fix-directory-permissions.patch  |  37 -
 .../test-fix-insufficient-quoting-of.patch    | 100 ---
 ...-SELinux-machines-for-root-testcases.patch |  84 ---
 meta/recipes-support/attr/acl_2.2.52.bb       |  52 --
 meta/recipes-support/attr/acl_2.2.53.bb       |  60 ++
 meta/recipes-support/attr/attr.inc            |  41 +-
 .../0001-Use-stdint-types-consistently.patch  |  69 --
 .../attr/attr/attr-Missing-configure.ac.patch |  63 --
 .../attr/attr/dont-use-decl-macros.patch      |  56 --
 meta/recipes-support/attr/attr/run-ptest      |   3 +
 meta/recipes-support/attr/attr_2.4.47.bb      |  15 -
 meta/recipes-support/attr/attr_2.4.48.bb      |   6 +
 meta/recipes-support/attr/ea-acl.inc          |  52 --
 ...option-to-enable-disable-static-libr.patch |  70 --
 ...e-attr.5-man-page-moved-to-man-pages.patch | 240 -------
 .../Remove-the-section-2-man-pages.patch      | 666 ------------------
 .../attr/files/relative-libdir.patch          |  25 -
 meta/recipes-support/attr/files/run-ptest     |   5 -
 24 files changed, 182 insertions(+), 1907 deletions(-)
 create mode 100644 meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch
 create mode 100644 meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch
 delete mode 100644 meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch
 delete mode 100644 meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch
 delete mode 100644 meta/recipes-support/attr/acl/configure.ac
 delete mode 100644 meta/recipes-support/attr/acl/test-fix-directory-permissions.patch
 delete mode 100644 meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch
 delete mode 100644 meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch
 delete mode 100644 meta/recipes-support/attr/acl_2.2.52.bb
 create mode 100644 meta/recipes-support/attr/acl_2.2.53.bb
 delete mode 100644 meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch
 delete mode 100644 meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch
 delete mode 100644 meta/recipes-support/attr/attr/dont-use-decl-macros.patch
 create mode 100644 meta/recipes-support/attr/attr/run-ptest
 delete mode 100644 meta/recipes-support/attr/attr_2.4.47.bb
 create mode 100644 meta/recipes-support/attr/attr_2.4.48.bb
 delete mode 100644 meta/recipes-support/attr/ea-acl.inc
 delete mode 100644 meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch
 delete mode 100644 meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch
 delete mode 100644 meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch
 delete mode 100644 meta/recipes-support/attr/files/relative-libdir.patch
 delete mode 100644 meta/recipes-support/attr/files/run-ptest
meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch new file +63 -0
new file mode 100644
index 00000000000..ba2ffee5d27
@@ -0,0 +1,63 @@
+From 9e08219e0e99ee2589cf35fa8d52cef3515accce Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Thu, 12 Dec 2019 15:47:49 +0100
+Subject: [PATCH] test: patch out failing bits
+
+I have confirmed on the host distro (Ubuntu 18.04) that they
+fail as well; upstream probably haven't noticed because the
+test is only executed under sudo.
+
+Upstream-Status: Inappropriate [disabling tests instead of fixing them properly]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ test/root/permissions.test | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+diff --git a/test/root/permissions.test b/test/root/permissions.test
+index 8f8f825..21e8a95 100644
+--- a/test/root/permissions.test
++++ b/test/root/permissions.test
+@@ -50,10 +50,6 @@ User daemon is a member in the owning group, which has only read access.
+ Verify this.
+ 
+ 	$ su daemon
+-	$ cat f
+-	> root
+-	> bin
+-
+ 	$ echo daemon >> f
+ 	>~ .*f: Permission denied$
+ 
+@@ -146,8 +142,6 @@ the owning group, he should still have no write access.
+ 	$ setfacl -x g:daemon f
+ 
+ 	$ su daemon
+-	$ echo daemon4 >> f
+-	>~ .*f: Permission denied$
+ 
+ 
+ Change the owning group. The other permissions should now grant user
+@@ -158,12 +152,6 @@ daemon write access.
+ 
+ 	$ su daemon
+ 	$ echo daemon5 >> f
+-	$ cat f
+-	> root
+-	> bin
+-	> daemon
+-	> daemon2
+-	> daemon5
+ 
+ 
+ Verify that permissions in separate matching ACL entries do not
+@@ -173,7 +161,6 @@ accumulate.
+ 	$ setfacl -m g:bin:r,g:daemon:w f
+ 
+ 	$ su daemon
+-	$ : < f
+ 	$ : > f
+ 	$ : <> f
+ 	>~ .*f: Permission denied$
+-- 
+2.17.1
+
meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch new file +24 -0
new file mode 100644
index 00000000000..57ef0bb728c
@@ -0,0 +1,24 @@
+From 39d332a8801de5d9ef09dacb3dba85c208b7b2ad Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Thu, 12 Dec 2019 13:45:52 +0100
+Subject: [PATCH] tests: do not hardcode the build path into a helper library
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ test/Makemodule.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/Makemodule.am b/test/Makemodule.am
+index 17d4927..015de7f 100644
+--- a/test/Makemodule.am
++++ b/test/Makemodule.am
+@@ -30,7 +30,7 @@ EXTRA_DIST += \
+ check_LTLIBRARIES = libtestlookup.la
+ 
+ libtestlookup_la_SOURCES = test/test_passwd.c test/test_group.c
+-libtestlookup_la_CFLAGS = -DBASEDIR=\"$(abs_srcdir)\"
++libtestlookup_la_CFLAGS = -DBASEDIR=\"/tmp/acl-ptest\"
+ libtestlookup_la_LDFLAGS = -rpath $(abs_builddir)
+ 
+ AM_TESTS_ENVIRONMENT = PATH="$(abs_top_builddir):$$PATH";
meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch deleted +0 -51

51 lines not on this page · raw message

meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch deleted +0 -198

198 lines not on this page · raw message

meta/recipes-support/attr/acl/configure.ac deleted +0 -49

49 lines not on this page · raw message

meta/recipes-support/attr/acl/run-ptest +3 -57

64 lines not on this page · raw message

meta/recipes-support/attr/acl/test-fix-directory-permissions.patch deleted +0 -37
deleted file mode 100644
index e64990ad5b9..00000000000
@@ -1,37 +0,0 @@
-From 311589fedf196168382d8f0db303ab328bcf9d83 Mon Sep 17 00:00:00 2001
-From: Peter Seebach <[email protected]>
-Date: Wed, 11 May 2016 15:16:06 -0500
-Subject: [PATCH] acl.inc, run-ptest: improve ptest functionality on limited
-
-commit c45bae84817a70fef6c2b661a07a492a0d23ae85
-
-    Fix permissions on temporary directory
-
-    The temporary directory's permissions have to allow other users to
-    view the directory. A default umask of 022 is common, but not mandatory,
-    and secure systems may have more restrictive defaults.
-
-    Signed-off-by: Peter Seebach <[email protected]>
-
-Upstream-Status: Backport [ http://git.savannah.gnu.org/cgit/acl.git/commit/?id=c6772a958800de064482634f77c20a0faafc5af6 ]
-
-Signed-off-by: Dengke Du <[email protected]>
----
- test/root/permissions.test | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/root/permissions.test b/test/root/permissions.test
-index 42615f5..098b52a 100644
---- a/test/root/permissions.test
-+++ b/test/root/permissions.test
-@@ -16,6 +16,7 @@ Cry immediately if we are not running as root.
- First, set up a temporary directory and create a regular file with
- defined permissions.
- 
-+	$ umask 022
- 	$ mkdir d
- 	$ cd d
- 	$ umask 027
--- 
-2.8.1
-
meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch deleted +0 -100

100 lines not on this page · raw message

meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch deleted +0 -84

84 lines not on this page · raw message

meta/recipes-support/attr/acl_2.2.52.bb deleted +0 -52

52 lines not on this page · raw message

meta/recipes-support/attr/acl_2.2.53.bb new file +60 -0

60 lines not on this page · raw message

meta/recipes-support/attr/attr.inc +23 -18

59 lines not on this page · raw message

meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch deleted +0 -69

69 lines not on this page · raw message

meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch deleted +0 -63

63 lines not on this page · raw message

meta/recipes-support/attr/attr/dont-use-decl-macros.patch deleted +0 -56

56 lines not on this page · raw message

meta/recipes-support/attr/attr/run-ptest new file +3 -0
new file mode 100644
index 00000000000..f64244f2393
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+make test-suite.log
meta/recipes-support/attr/attr_2.4.47.bb deleted +0 -15
deleted file mode 100644
index fc88bef830b..00000000000
@@ -1,15 +0,0 @@
-require attr.inc
-
-# configure.ac was missing from the release tarball. This should be fixed in
-# future releases of attr, remove this when updating the recipe.
-SRC_URI += "file://attr-Missing-configure.ac.patch \
-            file://dont-use-decl-macros.patch \
-            file://Remove-the-section-2-man-pages.patch \
-            file://Remove-the-attr.5-man-page-moved-to-man-pages.patch \
-            file://0001-Use-stdint-types-consistently.patch \
-           "
-
-SRC_URI[md5sum] = "84f58dec00b60f2dc8fd1c9709291cc7"
-SRC_URI[sha256sum] = "25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859"
-
-BBCLASSEXTEND = "native nativesdk"
meta/recipes-support/attr/attr_2.4.48.bb new file +6 -0
new file mode 100644
index 00000000000..530d4e48833
@@ -0,0 +1,6 @@
+require attr.inc
+
+SRC_URI[md5sum] = "bc1e5cb5c96d99b24886f1f527d3bb3d"
+SRC_URI[sha256sum] = "5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7"
+
+BBCLASSEXTEND = "native nativesdk"
meta/recipes-support/attr/ea-acl.inc deleted +0 -52

52 lines not on this page · raw message

meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch deleted +0 -70

70 lines not on this page · raw message

meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch deleted +0 -240

240 lines not on this page · raw message

meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch deleted +0 -666

666 lines not on this page · raw message

meta/recipes-support/attr/files/relative-libdir.patch deleted +0 -25
deleted file mode 100644
index b72bf184d6f..00000000000
@@ -1,25 +0,0 @@
-Upstream-Status: Pending
-
-use relative path in symbolic links, or it fails in staging
-sed expression from udev
-
-7/29/2010 - created by Qing He <[email protected]>
-
-diff -u include.orig/buildmacros include/buildmacros
---- include.orig/buildmacros	2010-07-29 17:39:48.000000000 +0800
-+++ include/buildmacros	2010-07-29 18:20:34.000000000 +0800
-@@ -88,9 +88,11 @@
- 	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
- 	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
- 	if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
--	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
--	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
--	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
-+	rel_lib_prefix=$$(echo $(PKG_LIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
-+	../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
-+	../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
-+	rel_devlib_prefix=$$(echo $(PKG_DEVLIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
-+	../$(INSTALL) -S $$rel_devlib_prefix$(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
- 	fi
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
meta/recipes-support/attr/files/run-ptest deleted +0 -5
deleted file mode 100644
index a6c6867f2d9..00000000000
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-make -C test -k tests root-tests |sed \
- -e 's|^\[.*\] \(.*\) -- ok$|PASS: \1|' \
- -e 's|^\[.*\] \(.*\) -- failed|FAIL: \1|'
Signature · 1 line
2.17.1
#34 lore raw

Re: [PATCH 19/30] acl/attr: update to latest upstream releases

breaks pseudo-native

http://errors.yoctoproject.org/Errors/Details/297280/

Quoted 2,318 lines · Alexander Kanavin

The latest release use standard autotools, so drop all the build system related hacks and patches.

Ptests have been rewritten, with 100% pass rate for both.

---
 .../0001-test-patch-out-failing-bits.patch    |  63 ++
 ...dcode-the-build-path-into-a-helper-l.patch |  24 +
 ...file-libacl-should-depend-on-include.patch |  51 --
 ...-order-of-expected-output-of-getfacl.patch | 198 ------
 meta/recipes-support/attr/acl/configure.ac    |  49 --
 meta/recipes-support/attr/acl/run-ptest       |  60 +-
 .../acl/test-fix-directory-permissions.patch  |  37 -
 .../test-fix-insufficient-quoting-of.patch    | 100 ---
 ...-SELinux-machines-for-root-testcases.patch |  84 ---
 meta/recipes-support/attr/acl_2.2.52.bb       |  52 --
 meta/recipes-support/attr/acl_2.2.53.bb       |  60 ++
 meta/recipes-support/attr/attr.inc            |  41 +-
 .../0001-Use-stdint-types-consistently.patch  |  69 --
 .../attr/attr/attr-Missing-configure.ac.patch |  63 --
 .../attr/attr/dont-use-decl-macros.patch      |  56 --
 meta/recipes-support/attr/attr/run-ptest      |   3 +
 meta/recipes-support/attr/attr_2.4.47.bb      |  15 -
 meta/recipes-support/attr/attr_2.4.48.bb      |   6 +
 meta/recipes-support/attr/ea-acl.inc          |  52 --
 ...option-to-enable-disable-static-libr.patch |  70 --
 ...e-attr.5-man-page-moved-to-man-pages.patch | 240 -------
 .../Remove-the-section-2-man-pages.patch      | 666 ------------------
 .../attr/files/relative-libdir.patch          |  25 -
 meta/recipes-support/attr/files/run-ptest     |   5 -
 24 files changed, 182 insertions(+), 1907 deletions(-)
 create mode 100644 meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch
 create mode 100644 meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch
 delete mode 100644 meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch
 delete mode 100644 meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch
 delete mode 100644 meta/recipes-support/attr/acl/configure.ac
 delete mode 100644 meta/recipes-support/attr/acl/test-fix-directory-permissions.patch
 delete mode 100644 meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch
 delete mode 100644 meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch
 delete mode 100644 meta/recipes-support/attr/acl_2.2.52.bb
 create mode 100644 meta/recipes-support/attr/acl_2.2.53.bb
 delete mode 100644 meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch
 delete mode 100644 meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch
 delete mode 100644 meta/recipes-support/attr/attr/dont-use-decl-macros.patch
 create mode 100644 meta/recipes-support/attr/attr/run-ptest
 delete mode 100644 meta/recipes-support/attr/attr_2.4.47.bb
 create mode 100644 meta/recipes-support/attr/attr_2.4.48.bb
 delete mode 100644 meta/recipes-support/attr/ea-acl.inc
 delete mode 100644 meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch
 delete mode 100644 meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch
 delete mode 100644 meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch
 delete mode 100644 meta/recipes-support/attr/files/relative-libdir.patch
 delete mode 100644 meta/recipes-support/attr/files/run-ptest
meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch new file +63 -0
new file mode 100644
index 00000000000..ba2ffee5d27
@@ -0,0 +1,63 @@
+From 9e08219e0e99ee2589cf35fa8d52cef3515accce Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Thu, 12 Dec 2019 15:47:49 +0100
+Subject: [PATCH] test: patch out failing bits
+
+I have confirmed on the host distro (Ubuntu 18.04) that they
+fail as well; upstream probably haven't noticed because the
+test is only executed under sudo.
+
+Upstream-Status: Inappropriate [disabling tests instead of fixing them properly]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ test/root/permissions.test | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+diff --git a/test/root/permissions.test b/test/root/permissions.test
+index 8f8f825..21e8a95 100644
+--- a/test/root/permissions.test
++++ b/test/root/permissions.test
+@@ -50,10 +50,6 @@ User daemon is a member in the owning group, which has only read access.
+ Verify this.
+
+       $ su daemon
+-      $ cat f
+-      > root
+-      > bin
+-
+       $ echo daemon >> f
+       >~ .*f: Permission denied$
+
+@@ -146,8 +142,6 @@ the owning group, he should still have no write access.
+       $ setfacl -x g:daemon f
+
+       $ su daemon
+-      $ echo daemon4 >> f
+-      >~ .*f: Permission denied$
+
+
+ Change the owning group. The other permissions should now grant user
+@@ -158,12 +152,6 @@ daemon write access.
+
+       $ su daemon
+       $ echo daemon5 >> f
+-      $ cat f
+-      > root
+-      > bin
+-      > daemon
+-      > daemon2
+-      > daemon5
+
+
+ Verify that permissions in separate matching ACL entries do not
+@@ -173,7 +161,6 @@ accumulate.
+       $ setfacl -m g:bin:r,g:daemon:w f
+
+       $ su daemon
+-      $ : < f
+       $ : > f
+       $ : <> f
+       >~ .*f: Permission denied$
+--
+2.17.1
+
meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch new file +24 -0
new file mode 100644
index 00000000000..57ef0bb728c
@@ -0,0 +1,24 @@
+From 39d332a8801de5d9ef09dacb3dba85c208b7b2ad Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Thu, 12 Dec 2019 13:45:52 +0100
+Subject: [PATCH] tests: do not hardcode the build path into a helper library
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ test/Makemodule.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/Makemodule.am b/test/Makemodule.am
+index 17d4927..015de7f 100644
+--- a/test/Makemodule.am
++++ b/test/Makemodule.am
+@@ -30,7 +30,7 @@ EXTRA_DIST += \
+ check_LTLIBRARIES = libtestlookup.la
+
+ libtestlookup_la_SOURCES = test/test_passwd.c test/test_group.c
+-libtestlookup_la_CFLAGS = -DBASEDIR=\"$(abs_srcdir)\"
++libtestlookup_la_CFLAGS = -DBASEDIR=\"/tmp/acl-ptest\"
+ libtestlookup_la_LDFLAGS = -rpath $(abs_builddir)
+
+ AM_TESTS_ENVIRONMENT = PATH="$(abs_top_builddir):$$PATH";
meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch deleted +0 -51
deleted file mode 100644
index 4c7cba3b88d..00000000000
@@ -1,51 +0,0 @@
-From d82457ce5ca7455e336da5e244d95f90e52aaef8 Mon Sep 17 00:00:00 2001
-From: Robert Yang <[email protected]>
-Date: Tue, 18 Apr 2017 01:17:26 -0700
-Subject: [PATCH] Makefile: libacl should depend on include
-
-Fixed race issue:
- In file included from acl_copy_entry.c:22:0:
- libacl.h:19:21: fatal error: sys/acl.h: No such file or directory
-  #include <sys/acl.h>
-
-[snip]
-
- compilation terminated.
- acl_get_file.c:27:24: fatal error: acl/libacl.h: No such file or directory
-  #include <acl/libacl.h>
-                         ^
-
-The acl.h is in "include" directory, and include/Makefile creates
-symlink "sys" and "acl" poinst to current dirctory:
-$ ls include/ -l
-acl -> .
-sys -> .
-
-So if "libacl" target runs before "include", the error would happen
-since no "acl" or "sys" directory.
-
-Let libacl depend on include can fix the problem.
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <[email protected]>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index dce32d3..8a79379 100644
---- a/Makefile
-+++ b/Makefile
-@@ -48,7 +48,7 @@ else
- endif
-
- # tool/lib dependencies
--libacl: libmisc
-+libacl: include libmisc
- getfacl setfacl chacl: libacl
-
- ifeq ($(HAVE_BUILDDEFS), yes)
---
-2.10.2
-
meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch deleted +0 -198
deleted file mode 100644
index cf765fdbb89..00000000000
@@ -1,198 +0,0 @@
-acl: fix the order of expected output of getfacl
-
-The result of getfacl is sorted by user id.
-In Centos or RHEL, bin user id is 1 and daemon user id is 2.
-But in our image, bin user id is 2 and daemon user id is 1.
-The patch fixes this issue to make ptest pass.
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Chong Lu <[email protected]>
----
- test/misc.test |   38 +++++++++++++++++++-------------------
- 1 file changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/test/misc.test b/test/misc.test
-index 6e98053..53ae5b0 100644
---- a/test/misc.test
-+++ b/test/misc.test
-@@ -79,8 +79,8 @@ Multiple users
-
-       $ getfacl --omit-header f
-       > user::rw-
--      > user:bin:rw-
-       > user:daemon:r--
-+      > user:bin:rw-
-       > group::r--
-       > mask::rw-
-       > other::r--
-@@ -94,8 +94,8 @@ Multiple groups
-
-       $ getfacl --omit-header f
-       > user::rw-
--      > user:bin:rw-
-       > user:daemon:r--
-+      > user:bin:rw-
-       > group::r--
-       > group:daemon:r--
-       > group:users:rw-
-@@ -111,8 +111,8 @@ Remove one group
-
-       $ getfacl --omit-header f
-       > user::rw-
--      > user:bin:rw-
-       > user:daemon:r--
-+      > user:bin:rw-
-       > group::r--
-       > group:daemon:r--
-       > mask::rw-
-@@ -146,8 +146,8 @@ Default ACL
-
-       $ getfacl --omit-header d
-       > user::rwx
--      > user:bin:rwx
-       > user:daemon:rw-
-+      > user:bin:rwx
-       > group::r-x
-       > mask::rwx
-       > other::---
-@@ -236,16 +236,16 @@ Add some users and groups
-
-       $ getfacl --omit-header d/d
-       > user::rwx
--      > user:bin:rwx  #effective:r-x
-       > user:daemon:r-x
-+      > user:bin:rwx  #effective:r-x
-       > group::r-x
-       > group:daemon:rwx      #effective:r-x
-       > group:users:r-x
-       > mask::r-x
-       > other::---
-       > default:user::rwx
--      > default:user:bin:rwx  #effective:r-x
-       > default:user:daemon:r-x
-+      > default:user:bin:rwx  #effective:r-x
-       > default:group::r-x
-       > default:mask::r-x
-       > default:other::---
-@@ -262,16 +262,16 @@ Symlink in directory with default ACL?
-
-       $ getfacl --omit-header d/l
-       > user::rwx
--      > user:bin:rwx  #effective:r-x
-       > user:daemon:r-x
-+      > user:bin:rwx  #effective:r-x
-       > group::r-x
-       > group:daemon:rwx      #effective:r-x
-       > group:users:r-x
-       > mask::r-x
-       > other::---
-       > default:user::rwx
--      > default:user:bin:rwx  #effective:r-x
-       > default:user:daemon:r-x
-+      > default:user:bin:rwx  #effective:r-x
-       > default:group::r-x
-       > default:mask::r-x
-       > default:other::---
-@@ -287,16 +287,16 @@ Does mask manipulation work?
-
-       $ getfacl --omit-header d/d
-       > user::rwx
--      > user:bin:r-x
-       > user:daemon:r-x
-+      > user:bin:r-x
-       > group::r-x
-       > group:daemon:r-x
-       > group:users:r-x
-       > mask::r-x
-       > other::---
-       > default:user::rwx
--      > default:user:bin:rwx  #effective:r-x
-       > default:user:daemon:r-x
-+      > default:user:bin:rwx  #effective:r-x
-       > default:group::r-x
-       > default:mask::r-x
-       > default:other::---
-@@ -308,16 +308,16 @@ Does mask manipulation work?
-
-       $ getfacl --omit-header d/d
-       > user::rwx
--      > user:bin:r-x
-       > user:daemon:r-x
-+      > user:bin:r-x
-       > group::r-x
-       > group:daemon:r-x
-       > group:users:r-x
-       > mask::r-x
-       > other::---
-       > default:user::rwx
--      > default:user:bin:rwx
-       > default:user:daemon:r-x
-+      > default:user:bin:rwx
-       > default:group::r-x
-       > default:mask::rwx
-       > default:other::---
-@@ -333,8 +333,8 @@ Remove the default ACL
-
-       $ getfacl --omit-header d
-       > user::rwx
--      > user:bin:rwx
-       > user:daemon:rw-
-+      > user:bin:rwx
-       > group::r-x
-       > mask::rwx
-       > other::---
-@@ -373,14 +373,14 @@ Now, chmod should change the group_obj entry
-
-       $ getfacl --omit-header d
-       > user::rwx
--      > user:bin:r-x
-       > user:daemon:rwx
-+      > user:bin:r-x
-       > group::rwx
-       > mask::rwx
-       > other::r-x
-       > default:user::rwx
--      > default:user:bin:r-x
-       > default:user:daemon:rwx
-+      > default:user:bin:r-x
-       > default:group::rwx
-       > default:mask::rwx
-       > default:other::r-x
-@@ -392,14 +392,14 @@ Now, chmod should change the group_obj entry
-
-       $ getfacl --omit-header d
-       > user::rwx
--      > user:bin:r-x
-       > user:daemon:rwx       #effective:r-x
-+      > user:bin:r-x
-       > group::rwx    #effective:r-x
-       > mask::r-x
-       > other::---
-       > default:user::rwx
--      > default:user:bin:r-x
-       > default:user:daemon:rwx
-+      > default:user:bin:r-x
-       > default:group::rwx
-       > default:mask::rwx
-       > default:other::r-x
-@@ -411,14 +411,14 @@ Now, chmod should change the group_obj entry
-
-       $ getfacl --omit-header d
-       > user::rwx
--      > user:bin:r-x
-       > user:daemon:rwx       #effective:r-x
-+      > user:bin:r-x
-       > group::rwx    #effective:r-x
-       > mask::r-x
-       > other::---
-       > default:user::rwx
--      > default:user:bin:r-x
-       > default:user:daemon:rwx
-+      > default:user:bin:r-x
-       > default:group::rwx
-       > default:mask::rwx
-       > default:other::r-x
---
-1.7.9.5
-
meta/recipes-support/attr/acl/configure.ac deleted +0 -49
deleted file mode 100644
index 7af2e8d886e..00000000000
@@ -1,49 +0,0 @@
-# Copyright (C) 2009  Andreas Gruenbacher <[email protected]>
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-AC_INIT(include/acl.h)
-AC_CONFIG_AUX_DIR([.])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADER(include/config.h)
-AC_PREFIX_DEFAULT(/usr)
-
-AC_PROG_LIBTOOL
-
-AC_ARG_ENABLE(shared,
-[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],,
-       enable_shared=yes)
-AC_SUBST(enable_shared)
-
-AC_ARG_ENABLE(gettext,
-[ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],,
-       enable_gettext=yes)
-AC_SUBST(enable_gettext)
-
-AC_ARG_ENABLE(lib64,
-[ --enable-lib64=[yes/no] Enable lib64 support [default=no]],,
-       enable_lib64=no)
-AC_SUBST(enable_lib64)
-
-AC_PACKAGE_GLOBALS(acl)
-AC_PACKAGE_UTILITIES(acl)
-AC_PACKAGE_NEED_ATTR_XATTR_H
-AC_PACKAGE_NEED_ATTR_ERROR_H
-AC_MULTILIB($enable_lib64)
-AC_PACKAGE_NEED_GETXATTR_LIBATTR
-AC_MANUAL_FORMAT
-
-AC_FUNC_GCC_VISIBILITY
-
-AC_OUTPUT(include/builddefs)
meta/recipes-support/attr/acl/run-ptest +3 -57
index a56946d8e6f..43128233654 100644
@@ -4,61 +4,7 @@
 
 #umask 077
 
-EXT3_IMAGE=ext3.img
-EXT3_MOUNT_POINT=/mnt/ext3
+mkdir -p /tmp/acl-ptest/test
+cp test/test.* /tmp/acl-ptest/test
 
-trap 'rm -f ${EXT3_IMAGE}' EXIT
-
-dd if=/dev/zero of=${EXT3_IMAGE} bs=1M count=1
-if [ "$?" -eq 0 ]; then
-       echo "PASS: dump ext3.img"
-else
-       echo "FAIL: dump ext3.img"
-       exit 1
-fi
-
-mkfs.ext3 -F ${EXT3_IMAGE}
-if [ "$?" -eq 0 ]; then
-       echo "PASS: mkfs.ext3 -F ext3.img"
-else
-       echo "FAIL: mkfs.ext3 -F ext3.img"
-       exit 1
-fi
-
-if [ -d $EXT3_MOUNT_POINT ]; then
-       echo "mount point exist"
-else
-       mkdir -p $EXT3_MOUNT_POINT
-fi
-
-
-mount -o loop,rw,acl  ${EXT3_IMAGE} $EXT3_MOUNT_POINT
-if [ "$?" -eq 0 ]; then
-       echo "PASS: mount ext3.img"
-else
-       echo "FAIL: mount ext3.img"
-       exit 1
-fi
-
-cp -rf ./test/ $EXT3_MOUNT_POINT
-
-cd $EXT3_MOUNT_POINT/test/
-
-if     sed -e 's!^bin:x:2:$!bin:x:2:daemon!' < /etc/group > gtmp
-then   if      cp /etc/group group.orig;
-       then    cp gtmp /etc/group
-               make  -k tests root-tests | sed \
-                       -e 's|^\[.*\] \(.*\) -- ok$|PASS: \1|' \
-                       -e 's|^\[.*\] \(.*\) -- failed|FAIL: \1|'
-               cp group.orig /etc/group
-       else    echo "FAIL: couldn't save original group file."
-               exit 1
-       fi
-else   echo "FAIL: couldn't create modified group file."
-       exit 1
-fi
-
-cd -
-umount $EXT3_MOUNT_POINT
-rm -rf $EXT3_MOUNT_POINT
-rm $EXT3_IMAGE
+make test-suite.log
meta/recipes-support/attr/acl/test-fix-directory-permissions.patch deleted +0 -37
deleted file mode 100644
index e64990ad5b9..00000000000
@@ -1,37 +0,0 @@
-From 311589fedf196168382d8f0db303ab328bcf9d83 Mon Sep 17 00:00:00 2001
-From: Peter Seebach <[email protected]>
-Date: Wed, 11 May 2016 15:16:06 -0500
-Subject: [PATCH] acl.inc, run-ptest: improve ptest functionality on limited
-
-commit c45bae84817a70fef6c2b661a07a492a0d23ae85
-
-    Fix permissions on temporary directory
-
-    The temporary directory's permissions have to allow other users to
-    view the directory. A default umask of 022 is common, but not mandatory,
-    and secure systems may have more restrictive defaults.
-
-    Signed-off-by: Peter Seebach <[email protected]>
-
-Upstream-Status: Backport [ http://git.savannah.gnu.org/cgit/acl.git/commit/?id=c6772a958800de064482634f77c20a0faafc5af6 ]
-
-Signed-off-by: Dengke Du <[email protected]>
----
- test/root/permissions.test | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/root/permissions.test b/test/root/permissions.test
-index 42615f5..098b52a 100644
---- a/test/root/permissions.test
-+++ b/test/root/permissions.test
-@@ -16,6 +16,7 @@ Cry immediately if we are not running as root.
- First, set up a temporary directory and create a regular file with
- defined permissions.
-
-+      $ umask 022
-       $ mkdir d
-       $ cd d
-       $ umask 027
---
-2.8.1
-
meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch deleted +0 -100
deleted file mode 100644
index f392465b58e..00000000000
@@ -1,100 +0,0 @@
-From e98ce8acf84d12ea67a3ac76bf63c6d87d9af86d Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <[email protected]>
-Date: Mon, 20 May 2013 16:38:06 +0200
-Subject: [PATCH] test: fix insufficient quoting of '\'
-
-This is a follow-up to 7f2c91b8369242a8dbc2b304a5b71b2a85f5b855, which
-caused sbits-restore.test to fail in the following way in case SELinux
-was disabled:
-
-*** sbits-restore.test ***
-[3] $ umask 022 -- ok
-[4] $ mkdir d -- ok
-[5] $ touch d/g -- ok
-[6] $ touch d/u -- ok
-[7] $ chmod u+s d/u -- ok
-[8] $ chmod g+s d/g -- ok
-[9] $ chmod +t d -- ok
-[10] $ getfacl -R d > d.acl -- ok
-[11] $ rm -R d -- ok
-[12] $ mkdir d -- ok
-[13] $ touch d/g -- ok
-[14] $ touch d/u -- ok
-[15] $ setfacl --restore d.acl -- ok
-[16] $ ls -dl d | awk '{print $1}' | sed 's/.$//g' -- failed
-drwxr-xr-                             != drwxr-xr-t
-[18] $ ls -dl d/u | awk '{print $1}' | sed 's/.$//g' -- failed
--rwSr--r-                             != -rwSr--r--
-[20] $ ls -dl d/g | awk '{print $1}' | sed 's/.$//g' -- failed
--rw-r-Sr-                             != -rw-r-Sr--
-[22] $ rm -Rf d -- ok
-17 commands (14 passed, 3 failed)
-
-Upstream-Status: Backport
-http://git.savannah.gnu.org/cgit/acl.git/commit/?id=e98ce8acf84d12ea67a3ac76bf63c6d87d9af86d
-
-Signed-off-by: Kamil Dudka <[email protected]>
-Signed-off-by: He Zhe <[email protected]>
-
-Index: acl-2.2.52/test/cp.test
-===================================================================
---- acl-2.2.52.orig/test/cp.test
-+++ acl-2.2.52/test/cp.test
-@@ -9,7 +9,7 @@ The cp utility should only copy ACLs if
-       > -rw-rw-r--+
-
-       $ cp f g
--      $ ls -l g | awk -- '{ print $1 }' | sed 's/\.$//g'
-+      $ ls -l g | awk -- '{ print $1 }' | sed 's/\\.$//g'
-       > -rw-r--r--
-
-       $ rm g
-Index: acl-2.2.52/test/misc.test
-===================================================================
---- acl-2.2.52.orig/test/misc.test
-+++ acl-2.2.52/test/misc.test
-@@ -254,7 +254,7 @@ Add some users and groups
- Symlink in directory with default ACL?
-
-       $ ln -s d d/l
--      $ ls -dl d/l | awk '{print $1}' | sed 's/\.$//g'
-+      $ ls -dl d/l | awk '{print $1}' | sed 's/\\.$//g'
-       > lrwxrwxrwx
-
-       $ ls -dl -L d/l | awk '{print $1}'
-@@ -343,7 +343,7 @@ Remove the default ACL
- Reset to base entries
-
-       $ setfacl -b d
--      $ ls -dl d | awk '{print $1}' | sed 's/\.$//g'
-+      $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g'
-       > drwxr-x---
-
-       $ getfacl --omit-header d
-@@ -355,7 +355,7 @@ Reset to base entries
- Now, chmod should change the group_obj entry
-
-       $ chmod 775 d
--      $ ls -dl d | awk '{print $1}' | sed 's/\.$//g'
-+      $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g'
-       > drwxrwxr-x
-
-       $ getfacl --omit-header d
-Index: acl-2.2.52/test/sbits-restore.test
-===================================================================
---- acl-2.2.52.orig/test/sbits-restore.test
-+++ acl-2.2.52/test/sbits-restore.test
-@@ -13,10 +13,10 @@ Ensure setting of SUID/SGID/sticky via -
-       $ touch d/g
-       $ touch d/u
-       $ setfacl --restore d.acl
--      $ ls -dl d | awk '{print $1}' | sed 's/\.$//g'
-+      $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g'
-       > drwxr-xr-t
--      $ ls -dl d/u | awk '{print $1}' | sed 's/\.$//g'
-+      $ ls -dl d/u | awk '{print $1}' | sed 's/\\.$//g'
-       > -rwSr--r--
--      $ ls -dl d/g | awk '{print $1}' | sed 's/\.$//g'
-+      $ ls -dl d/g | awk '{print $1}' | sed 's/\\.$//g'
-       > -rw-r-Sr--
-       $ rm -Rf d
meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch deleted +0 -84
deleted file mode 100644
index 8cc11a63e12..00000000000
@@ -1,84 +0,0 @@
-From d2f49ee6fe4850b8dda5b08676b36201d3c43710 Mon Sep 17 00:00:00 2001
-From: He Zhe <[email protected]>
-Date: Wed, 2 Mar 2016 15:46:57 +0800
-Subject: [PATCH] test: fixups on SELinux machines for root testcases
-
-ls adds a '.' at the end of the permission field list on SELinux
-machines, filter this out so root tests work on SELinux machines.
-
-Upstream-Status: Accepted
-http://git.savannah.gnu.org/cgit/acl.git/commit/?id=26a87d36f80d5e98bccb5878834d9e69dadfe3e9
-
-Signed-off-by: He Zhe <[email protected]>
----
- test/root/permissions.test | 8 ++++----
- test/root/restore.test     | 2 +-
- test/root/setfacl.test     | 2 +-
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/test/root/permissions.test b/test/root/permissions.test
-index 9b9e3de..665339a 100644
---- a/test/root/permissions.test
-+++ b/test/root/permissions.test
-@@ -19,7 +19,7 @@ defined permissions.
-       $ cd d
-       $ umask 027
-       $ touch f
--      $ ls -l f | awk -- '{ print $1, $3, $4 }'
-+      $ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g'
-       > -rw-r----- root root
-
-
-@@ -39,7 +39,7 @@ Now, change the ownership of the file to bin:bin and verify that this
- gives user bin write access.
-
-       $ chown bin:bin f
--      $ ls -l f | awk -- '{ print $1, $3, $4 }'
-+      $ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g'
-       > -rw-r----- bin bin
-       $ su bin
-       $ echo bin >> f
-@@ -256,12 +256,12 @@ directories if the file has an ACL and only CAP_FOWNER would grant them.
-       $ mkdir -m 600 x
-       $ chown daemon:daemon x
-       $ echo j > x/j
--      $ ls -l x/j | awk -- '{ print $1, $3, $4 }'
-+      $ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g'
-       > -rw-r----- root root
-
-       $ setfacl -m u:daemon:r x
-
--      $ ls -l x/j | awk -- '{ print $1, $3, $4 }'
-+      $ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g'
-       > -rw-r----- root root
-       (With the bug this gives: `ls: x/j: Permission denied'.)
-
-diff --git a/test/root/restore.test b/test/root/restore.test
-index 63a9d01..c85097c 100644
---- a/test/root/restore.test
-+++ b/test/root/restore.test
-@@ -21,7 +21,7 @@ Cry immediately if we are not running as root.
-       $ chown bin passwd
-       $ chmod u+s passwd
-       $ setfacl --restore passwd.acl
--      $ ls -dl passwd | awk '{print $1 " " $3 " " $4}'
-+      $ ls -dl passwd | awk '{print $1 " " $3 " " $4}' | sed 's/\\.//g'
-       > -rwsr-xr-x root root
-
-       $ rm passwd passwd.acl
-diff --git a/test/root/setfacl.test b/test/root/setfacl.test
-index a46a9f4..7efbad7 100644
---- a/test/root/setfacl.test
-+++ b/test/root/setfacl.test
-@@ -12,7 +12,7 @@ Cry immediately if we are not running as root.
-       $ sg bin
-       $ umask 027
-       $ touch g
--      $ ls -dl g | awk '{print $1}'
-+      $ ls -dl g | awk '{print $1}' | sed 's/\\.//g'
-       > -rw-r-----
-
-       $ setfacl -m m:- g
---
-1.9.1
-
meta/recipes-support/attr/acl_2.2.52.bb deleted +0 -52
deleted file mode 100644
index 6bc77d868d5..00000000000
@@ -1,52 +0,0 @@
-SUMMARY = "Utilities for managing POSIX Access Control Lists"
-HOMEPAGE = "http://savannah.nongnu.org/projects/acl/"
-SECTION = "libs"
-
-LICENSE = "LGPLv2.1+ & GPLv2+"
-LICENSE_${PN} = "GPLv2+"
-LICENSE_lib${BPN} = "LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \
-                    file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764"
-
-DEPENDS = "attr"
-
-SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.src.tar.gz \
-           file://configure.ac;subdir=${BP} \
-           file://run-ptest \
-           file://acl-fix-the-order-of-expected-output-of-getfacl.patch \
-           file://test-fix-insufficient-quoting-of.patch \
-           file://test-fixups-on-SELinux-machines-for-root-testcases.patch \
-           file://test-fix-directory-permissions.patch \
-           file://Makefile-libacl-should-depend-on-include.patch \
-"
-
-SRC_URI[md5sum] = "a61415312426e9c2212bd7dc7929abda"
-SRC_URI[sha256sum] = "179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23"
-
-require ea-acl.inc
-
-# avoid RPATH hardcode to staging dir
-do_configure_append() {
-       sed -i ${S}/config.status -e s,^\\\(hardcode_into_libs=\\\).*$,\\1\'no\',
-       ${S}/config.status
-}
-
-# libdir should point to .la
-do_install_append() {
-       sed -i ${D}${libdir}/libacl.la -e \
-           s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
-}
-
-inherit ptest
-
-PTEST_BUILD_HOST_FILES = "builddefs"
-PTEST_BUILD_HOST_PATTERN = "^RPM"
-do_install_ptest() {
-       tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
-       install -d ${D}${PTEST_PATH}/include
-       install -m 644 ${S}/include/builddefs ${S}/include/buildmacros ${S}/include/buildrules ${D}${PTEST_PATH}/include/
-}
-
-RDEPENDS_${PN}-ptest = "acl bash coreutils perl perl-module-filehandle perl-module-getopt-std perl-module-posix shadow"
-
-BBCLASSEXTEND = "native nativesdk"
meta/recipes-support/attr/acl_2.2.53.bb new file +60 -0
new file mode 100644
index 00000000000..c95e0524eb4
@@ -0,0 +1,60 @@
+SUMMARY = "Utilities for managing POSIX Access Control Lists"
+HOMEPAGE = "http://savannah.nongnu.org/projects/acl/"
+SECTION = "libs"
+
+LICENSE = "LGPLv2.1+ & GPLv2+"
+LICENSE_${PN} = "GPLv2+"
+LICENSE_lib${BPN} = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \
+                    file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764"
+
+DEPENDS = "attr"
+
+SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.tar.gz \
+           file://run-ptest \
+           file://0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch \
+           file://0001-test-patch-out-failing-bits.patch \
+           "
+
+SRC_URI[md5sum] = "007aabf1dbb550bcddde52a244cd1070"
+SRC_URI[sha256sum] = "06be9865c6f418d851ff4494e12406568353b891ffe1f596b34693c387af26c7"
+
+inherit autotools gettext ptest
+
+PTEST_BUILD_HOST_FILES = "builddefs"
+PTEST_BUILD_HOST_PATTERN = "^RPM"
+
+do_compile_ptest() {
+        oe_runmake libtestlookup.la
+}
+
+do_install_ptest() {
+       cp -rf ${S}/test/ ${D}${PTEST_PATH}
+       cp -rf ${S}/build-aux/ ${D}${PTEST_PATH}
+        mkdir -p ${D}${PTEST_PATH}/.libs
+       cp -rf ${B}/.libs/libtestlookup* ${D}${PTEST_PATH}/.libs
+        cp ${B}/Makefile ${D}${PTEST_PATH}
+        sed -i "s|^srcdir =.*|srcdir = \.|g" ${D}${PTEST_PATH}/Makefile
+        sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" ${D}${PTEST_PATH}/Makefile
+        sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g" ${D}${PTEST_PATH}/Makefile
+        sed -i "s|^Makefile:.*|Makefile:|g" ${D}${PTEST_PATH}/Makefile
+}
+
+RDEPENDS_${PN}-ptest = "acl \
+                        bash \
+                        coreutils \
+                        perl \
+                        perl-module-filehandle \
+                        perl-module-getopt-std \
+                        perl-module-posix \
+                        shadow \
+                        make \
+                        gawk \
+                        e2fsprogs-mke2fs \
+                        perl-module-cwd \
+                        perl-module-file-basename \
+                        perl-module-file-path \
+                        perl-module-file-spec \
+                       "
+
+BBCLASSEXTEND = "native nativesdk"
meta/recipes-support/attr/attr.inc +23 -18
index 3503d66b9e1..5661301c15a 100644
@@ -8,22 +8,14 @@ LICENSE = "LGPLv2.1+ & GPLv2+"
 LICENSE_${PN} = "GPLv2+"
 LICENSE_lib${BPN} = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \
-                    file://attr/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \
+                    file://tools/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \
                     file://libattr/libattr.c;endline=17;md5=7970f77049f8fa1199fff62a7ab724fb"
 
-SRC_URI = "${SAVANNAH_GNU_MIRROR}/attr/${BP}.src.tar.gz \
+SRC_URI = "${SAVANNAH_GNU_MIRROR}/attr/${BP}.tar.gz \
            file://run-ptest \
 "
 
-require ea-acl.inc
-
-# libdir should point to .la
-do_install_append() {
-       sed -i ${D}${libdir}/libattr.la -e \
-           s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
-}
-
-inherit ptest update-alternatives
+inherit ptest update-alternatives autotools gettext
 
 ALTERNATIVE_PRIORITY = "100"
 ALTERNATIVE_${PN} = "setfattr"
@@ -33,14 +25,27 @@ PTEST_BUILD_HOST_FILES = "builddefs"
 PTEST_BUILD_HOST_PATTERN = "^RPM"
 
 do_install_ptest() {
-       tar -c --exclude=ext test/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
-       mkdir ${D}${PTEST_PATH}/include
-       for i in builddefs buildmacros buildrules; \
-         do cp ${S}/include/$i ${D}${PTEST_PATH}/include/; \
-       done
-       sed -e 's|; @echo|; echo|' -i ${D}${PTEST_PATH}/test/Makefile
+        cp ${B}/Makefile ${D}${PTEST_PATH}
+        sed -i "s|^srcdir =.*|srcdir = \.|g" ${D}${PTEST_PATH}/Makefile
+        sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" ${D}${PTEST_PATH}/Makefile
+        sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g" ${D}${PTEST_PATH}/Makefile
+        sed -i "s|^Makefile:.*|Makefile:|g" ${D}${PTEST_PATH}/Makefile
+       cp -rf ${S}/build-aux/ ${D}${PTEST_PATH}
+       cp -rf ${S}/test/ ${D}${PTEST_PATH}
 }
 
-RDEPENDS_${PN}-ptest = "attr coreutils perl-module-filehandle perl-module-getopt-std perl-module-posix make perl"
+RDEPENDS_${PN}-ptest = "attr \
+                        coreutils \
+                        perl-module-filehandle \
+                        perl-module-getopt-std \
+                        perl-module-posix \
+                        make \
+                        perl \
+                        gawk \
+                        perl-module-cwd \
+                        perl-module-file-basename \
+                        perl-module-file-path \
+                        perl-module-file-spec \
+                        "
 
 BBCLASSEXTEND = "native nativesdk"
meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch deleted +0 -69
deleted file mode 100644
index dcd6507bcc5..00000000000
@@ -1,69 +0,0 @@
-From 37a27b6fd09ecb37097b85e5db74e4f77b80fe0a Mon Sep 17 00:00:00 2001
-From: Felix Janda <[email protected]>
-Date: Tue, 12 Jan 2016 22:20:33 +0100
-Subject: [PATCH] Use stdint types consistently
-
----
-Upstream-Status: Backport
-Signed-off-by: Khem Raj <[email protected]>
-
- include/attributes.h | 6 ++++--
- man/man3/attr_list.3 | 8 ++++----
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-Index: attr-2.4.47/include/attributes.h
-===================================================================
---- attr-2.4.47.orig/include/attributes.h
-+++ attr-2.4.47/include/attributes.h
-@@ -22,6 +22,7 @@
- extern "C" {
- #endif
-
-+#include <stdint.h>
- /*
-  *    An almost-IRIX-compatible extended attributes API
-  *    (the IRIX attribute "list" operation is missing, added ATTR_SECURE).
-@@ -69,7 +70,7 @@ typedef struct attrlist {
-  * al_offset[i] entry points to.
-  */
- typedef struct attrlist_ent { /* data from attr_list() */
--      u_int32_t       a_valuelen;     /* number bytes in value of attr */
-+      uint32_t        a_valuelen;     /* number bytes in value of attr */
-       char            a_name[1];      /* attr name (NULL terminated) */
- } attrlist_ent_t;
-
-@@ -90,7 +91,7 @@ typedef struct attrlist_ent {        /* data fr
-  * operation on a cursor is to bzero() it.
-  */
- typedef struct attrlist_cursor {
--      u_int32_t       opaque[4];      /* an opaque cookie */
-+      uint32_t        opaque[4];      /* an opaque cookie */
- } attrlist_cursor_t;
-
- /*
-Index: attr-2.4.47/man/man3/attr_list.3
-===================================================================
---- attr-2.4.47.orig/man/man3/attr_list.3
-+++ attr-2.4.47/man/man3/attr_list.3
-@@ -72,9 +72,9 @@ The contents of an \f4attrlist_t\fP stru
- .nf
- .ft 4
- .ta 9n 22n
--__int32_t al_count; /\(** number of entries in attrlist \(**/
--__int32_t al_more; /\(** T/F: more attrs (do syscall again) \(**/
--__int32_t al_offset[1]; /\(** byte offsets of attrs [var-sized] \(**/
-+int32_t al_count; /\(** number of entries in attrlist \(**/
-+int32_t al_more; /\(** T/F: more attrs (do syscall again) \(**/
-+int32_t al_offset[1]; /\(** byte offsets of attrs [var-sized] \(**/
- .ft 1
- .fi
- .RE
-@@ -113,7 +113,7 @@ include the following members:
- .nf
- .ft 4
- .ta 9n 22n
--u_int32_t a_valuelen; /\(** number bytes in value of attr \(**/
-+uint32_t a_valuelen; /\(** number bytes in value of attr \(**/
- char a_name[]; /\(** attr name (NULL terminated) \(**/
- .ft 1
- .fi
meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch deleted +0 -63
deleted file mode 100644
index 20fcc3cee7b..00000000000
@@ -1,63 +0,0 @@
-Subject: [PATCH] attr: Missing configure.ac
-
-Upstream-Status: Backport [Upstream released tarball missing this file]
-Signed-off-by: Nathan Rossi <[email protected]>
----
- configure.ac |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 48 insertions(+)
- create mode 100644 configure.ac
-
-diff --git a/configure.ac b/configure.ac
-new file mode 100644
-index 0000000..b966d0e
---- /dev/null
-+++ b/configure.ac
-@@ -0,0 +1,48 @@
-+# Copyright (C) 2009  Andreas Gruenbacher <[email protected]>
-+#
-+# This program is free software: you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+#
-+AC_INIT(include/attributes.h)
-+AC_CONFIG_AUX_DIR([.])
-+AC_CONFIG_MACRO_DIR([m4])
-+AC_CONFIG_HEADER(include/config.h)
-+AC_PREFIX_DEFAULT(/usr)
-+
-+AC_PROG_LIBTOOL
-+
-+AC_ARG_ENABLE(shared,
-+[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],,
-+      enable_shared=yes)
-+AC_SUBST(enable_shared)
-+
-+AC_ARG_ENABLE(gettext,
-+[ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],,
-+      enable_gettext=yes)
-+AC_SUBST(enable_gettext)
-+
-+AC_ARG_ENABLE(lib64,
-+[ --enable-lib64=[yes/no] Enable lib64 support [default=no]],,
-+      enable_lib64=no)
-+AC_SUBST(enable_lib64)
-+
-+AC_PACKAGE_GLOBALS(attr)
-+AC_PACKAGE_UTILITIES(attr)
-+AC_MANUAL_FORMAT
-+AC_MULTILIB($enable_lib64)
-+
-+AC_C_CONST
-+AC_TYPE_MODE_T
-+AC_FUNC_ALLOCA
-+
-+AC_OUTPUT(include/builddefs)
meta/recipes-support/attr/attr/dont-use-decl-macros.patch deleted +0 -56
deleted file mode 100644
index 9d4b8929e89..00000000000
@@ -1,56 +0,0 @@
-Use extern "C" instead of __BEGIN_DECL/__END_DECL macros
-these macros are defined in sys/cdefs.h for glibc and this header is not available on all libc
-
-anyway they defined like below
-
-#ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
-#else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
-#endif
-
-__THROW macro is also not available on musl, defined thusly
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
-
-Index: attr-2.4.47/include/xattr.h
-===================================================================
---- attr-2.4.47.orig/include/xattr.h   2014-04-02 00:01:30.252091280 -0700
-+++ attr-2.4.47/include/xattr.h        2014-04-02 00:12:57.985428099 -0700
-@@ -30,8 +30,20 @@
- #define XATTR_CREATE  0x1       /* set value, fail if attr already exists */
- #define XATTR_REPLACE 0x2       /* set value, fail if attr does not exist */
-
--
--__BEGIN_DECLS
-+#ifndef __THROW
-+# ifndef __GNUC_PREREQ
-+#  define __GNUC_PREREQ(maj, min) (0)
-+# endif
-+# if defined __cplusplus && __GNUC_PREREQ (2,8)
-+#  define __THROW       throw ()
-+# else
-+#  define __THROW
-+# endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- extern int setxattr (const char *__path, const char *__name,
-                     const void *__value, size_t __size, int __flags) __THROW;
-@@ -58,6 +70,8 @@
- extern int lremovexattr (const char *__path, const char *__name) __THROW;
- extern int fremovexattr (int __filedes,   const char *__name) __THROW;
-
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif        /* __XATTR_H__ */
meta/recipes-support/attr/attr/run-ptest new file +3 -0
new file mode 100644
index 00000000000..f64244f2393
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+make test-suite.log
meta/recipes-support/attr/attr_2.4.47.bb deleted +0 -15
deleted file mode 100644
index fc88bef830b..00000000000
@@ -1,15 +0,0 @@
-require attr.inc
-
-# configure.ac was missing from the release tarball. This should be fixed in
-# future releases of attr, remove this when updating the recipe.
-SRC_URI += "file://attr-Missing-configure.ac.patch \
-            file://dont-use-decl-macros.patch \
-            file://Remove-the-section-2-man-pages.patch \
-            file://Remove-the-attr.5-man-page-moved-to-man-pages.patch \
-            file://0001-Use-stdint-types-consistently.patch \
-           "
-
-SRC_URI[md5sum] = "84f58dec00b60f2dc8fd1c9709291cc7"
-SRC_URI[sha256sum] = "25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859"
-
-BBCLASSEXTEND = "native nativesdk"
meta/recipes-support/attr/attr_2.4.48.bb new file +6 -0
new file mode 100644
index 00000000000..530d4e48833
@@ -0,0 +1,6 @@
+require attr.inc
+
+SRC_URI[md5sum] = "bc1e5cb5c96d99b24886f1f527d3bb3d"
+SRC_URI[sha256sum] = "5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7"
+
+BBCLASSEXTEND = "native nativesdk"
meta/recipes-support/attr/ea-acl.inc deleted +0 -52
deleted file mode 100644
index 9336ffc9389..00000000000
@@ -1,52 +0,0 @@
-# this build system is mostly shared by attr and acl
-
-SRC_URI += "file://relative-libdir.patch;striplevel=0 \
-           "
-# This patch should be applied after '(attr\|acl)-Missing-configure.ac.patch'
-SRC_URI_append = " file://0001-Added-configure-option-to-enable-disable-static-libr.patch"
-
-inherit autotools-brokensep gettext
-
-# When upstream is using automake properly, this can be removed
-CLEANBROKEN = "1"
-
-# the package comes with a custom config.h.in, it cannot be
-# overwritten by autoheader
-EXTRA_AUTORECONF += "--exclude=autoheader"
-EXTRA_OECONF = "INSTALL_USER=root INSTALL_GROUP=root"
-EXTRA_OECONF_append_class-native = " --enable-gettext=no"
-EXTRA_OECONF_append_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS') == 'no')]}"
-
-EXTRA_OEMAKE = "PKG_LIB_DIR=${base_libdir} PKG_DEVLIB_DIR=${libdir}"
-
-do_install () {
-       oe_runmake install install-lib install-dev DIST_ROOT="${D}" ZIP="gzip -n"
-}
-
-do_install_append_class-native () {
-       if test "${libdir}" = "${base_libdir}" ; then
-               return
-       fi
-       librelpath=${@os.path.relpath(d.getVar('libdir'), d.getVar('base_libdir'))}
-       baselibrelpath=${@os.path.relpath(d.getVar('base_libdir'), d.getVar('libdir'))}
-
-       # Remove bad symlinks & create the correct symlinks
-       if test -L ${D}${libdir}/lib${BPN}.so ; then
-               rm -rf ${D}${libdir}/lib${BPN}.so
-               ln -sf $baselibrelpath/lib${BPN}.so ${D}${libdir}/lib${BPN}.so
-       fi
-       if test -L ${D}${base_libdir}/lib${BPN}.a ; then
-               rm -rf ${D}${base_libdir}/lib${BPN}.a
-               ln -sf $librelpath/lib${BPN}.a ${D}${base_libdir}/lib${BPN}.a
-       fi
-       if test -L  ${D}${base_libdir}/lib${BPN}.la ; then
-               rm -rf ${D}${base_libdir}/lib${BPN}.la
-               ln -sf $librelpath/lib${BPN}.la ${D}${base_libdir}/lib${BPN}.la
-       fi
-}
-
-PACKAGES =+ "lib${BPN}"
-
-FILES_lib${BPN} = "${base_libdir}/lib*${SOLIBS}"
-
-BBCLASSEXTEND = "native"
meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch deleted +0 -70
deleted file mode 100644
index 1c1159f2c90..00000000000
@@ -1,70 +0,0 @@
-From 01256c61ba126449c46dd4ab5d5e145488b981fa Mon Sep 17 00:00:00 2001
-From: Amarnath Valluri <[email protected]>
-Date: Mon, 23 Jan 2017 13:25:13 +0200
-Subject: [PATCH] Added configure option to enable/disable static library
-
-Create static library archive only in case of --enable-static.
-
-Upstream-Status: Pending
-
-Signed-off-by: Amarnath Valluri <[email protected]>
----
- configure.ac         | 6 ++++++
- include/builddefs.in | 1 +
- include/buildmacros  | 3 +++
- 3 files changed, 10 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index b966d0e..e48268b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -26,6 +26,12 @@ AC_ARG_ENABLE(shared,
-       enable_shared=yes)
- AC_SUBST(enable_shared)
-
-+AC_ARG_ENABLE(static,
-+[ --enable-static=[yes/no] Enable use of static libraries [default=yes]],,
-+      enable_static=yes)
-+AC_SUBST(enable_static)
-+
-+
- AC_ARG_ENABLE(gettext,
- [ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],,
-       enable_gettext=yes)
-diff --git a/include/builddefs.in b/include/builddefs.in
-index d9931db..3b3dbd2 100644
---- a/include/builddefs.in
-+++ b/include/builddefs.in
-@@ -71,6 +71,7 @@ RPMBUILD     = @rpmbuild@
- RPM_VERSION   = @rpm_version@
-
- ENABLE_SHARED = @enable_shared@
-+ENABLE_STATIC         = @enable_static@
- ENABLE_GETTEXT        = @enable_gettext@
-
- HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@
-diff --git a/include/buildmacros b/include/buildmacros
-index 39fa7e2..b0f25c5 100644
---- a/include/buildmacros
-+++ b/include/buildmacros
-@@ -80,6 +80,7 @@ endif
- # /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB_DEV = \
-+      set -x; \
-       cd $(TOPDIR)/$(LIBNAME)/.libs; \
-       ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
-       ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \
-@@ -88,7 +89,9 @@ INSTALL_LTLIB_DEV = \
-       ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
-       if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
-       rel_lib_prefix=$$(echo $(PKG_LIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
-+      if test "$(ENABLE_STATIC)" = "yes" ; then \
-       ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
-+      fi ;\
-       ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
-       rel_devlib_prefix=$$(echo $(PKG_DEVLIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
-       ../$(INSTALL) -S $$rel_devlib_prefix$(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
---
-2.7.4
-
meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch deleted +0 -240
deleted file mode 100644
index d5ab83d7c68..00000000000
@@ -1,240 +0,0 @@
-From 6047c8522b91235ad1e835f44f5e36472d9d49b2 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <[email protected]>
-Date: Wed, 22 Apr 2015 11:46:59 +0200
-Subject: [PATCH 2/2] Remove the attr.5 man page (moved to man-pages)
-
-Commit dce9b4448c7f2b22bd206cd068fb05cb2f3255b9 from
-https://git.savannah.nongnu.org/git/attr.git
-
-The attr.5 page is part of the extended attribute system call documentation,
-which has been moved into the man-pages package. Move the attr.5 page there
-as well.
-
-Upstream-Status: Backport
-
-[MA: updated to apply directly to v2.4.47]
-Signed-off-by: Mark Asselstine <[email protected]>
----
- man/Makefile      |   2 +-
- man/man5/Makefile |  35 -------------
- man/man5/attr.5   | 153 ------------------------------------------------------
- 3 files changed, 1 insertion(+), 189 deletions(-)
- delete mode 100644 man/man5/Makefile
- delete mode 100644 man/man5/attr.5
-
-diff --git a/man/Makefile b/man/Makefile
-index 755daed..9301f09 100644
---- a/man/Makefile
-+++ b/man/Makefile
-@@ -19,7 +19,7 @@
- TOPDIR = ..
- include $(TOPDIR)/include/builddefs
-
--SUBDIRS = man1 man3 man5
-+SUBDIRS = man1 man3
-
- default : $(SUBDIRS)
-
-diff --git a/man/man5/Makefile b/man/man5/Makefile
-deleted file mode 100644
-index 6b70d3d..0000000
---- a/man/man5/Makefile
-+++ /dev/null
-@@ -1,35 +0,0 @@
--#
--# Copyright (c) 2000, 2002 Silicon Graphics, Inc.  All Rights Reserved.
--# Copyright (C) 2009  Andreas Gruenbacher <[email protected]>
--#
--# This program is free software: you can redistribute it and/or modify it
--# under the terms of the GNU General Public License as published by
--# the Free Software Foundation, either version 2 of the License, or
--# (at your option) any later version.
--#
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program.  If not, see <http://www.gnu.org/licenses/>.
--#
--
--TOPDIR = ../..
--include $(TOPDIR)/include/builddefs
--
--MAN_SECTION   = 5
--
--MAN_PAGES     = $(shell echo *.$(MAN_SECTION))
--MAN_DEST      = $(PKG_MAN_DIR)/man$(MAN_SECTION)
--LSRCFILES     = $(MAN_PAGES)
--
--default : $(MAN_PAGES)
--
--include $(BUILDRULES)
--
--install : default
--      $(INSTALL) -m 755 -d $(MAN_DEST)
--      $(INSTALL_MAN)
--install-dev install-lib:
-diff --git a/man/man5/attr.5 b/man/man5/attr.5
-deleted file mode 100644
-index a02757d..0000000
---- a/man/man5/attr.5
-+++ /dev/null
-@@ -1,153 +0,0 @@
--.\" Extended attributes manual page
--.\"
--.\" Copyright (C) 2000, 2002, 2007  Andreas Gruenbacher <[email protected]>
--.\" Copyright (C) 2001, 2002, 2004, 2007 Silicon Graphics, Inc.
--.\" All rights reserved.
--.\"
--.\" This is free documentation; you can redistribute it and/or
--.\" modify it under the terms of the GNU General Public License as
--.\" published by the Free Software Foundation; either version 2 of
--.\" the License, or (at your option) any later version.
--.\"
--.\" The GNU General Public License's references to "object code"
--.\" and "executables" are to be interpreted as the output of any
--.\" document formatting or typesetting system, including
--.\" intermediate and printed output.
--.\"
--.\" This manual is distributed in the hope that it will be useful,
--.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
--.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--.\" GNU General Public License for more details.
--.\"
--.\" You should have received a copy of the GNU General Public
--.\" License along with this manual.  If not, see
--.\" <http://www.gnu.org/licenses/>.
--.\"
--.TH ATTR 5
--.SH NAME
--attr - Extended attributes
--.SH DESCRIPTION
--Extended attributes are name:value pairs associated permanently with
--files and directories, similar to the environment strings associated
--with a process.
--An attribute may be defined or undefined.
--If it is defined, its value may be empty or non-empty.
--.PP
--Extended attributes are extensions to the normal attributes which are
--associated with all inodes in the system (i.e. the
--.BR stat (2)
--data).
--They are often used to provide additional functionality
--to a filesystem \- for example, additional security features such as
--Access Control Lists (ACLs) may be implemented using extended attributes.
--.PP
--Users with search access to a file or directory may retrieve a list of
--attribute names defined for that file or directory.
--.PP
--Extended attributes are accessed as atomic objects.
--Reading retrieves the whole value of an attribute and stores it in a buffer.
--Writing replaces any previous value with the new value.
--.PP
--Space consumed for extended attributes is counted towards the disk quotas
--of the file owner and file group.
--.PP
--Currently, support for extended attributes is implemented on Linux by the
--ext2, ext3, ext4, XFS, JFS and reiserfs filesystems.
--.SH EXTENDED ATTRIBUTE NAMESPACES
--Attribute names are zero-terminated strings.
--The attribute name is always specified in the fully qualified
--.IR namespace.attribute
--form, eg.
--.IR user.mime_type ,
--.IR trusted.md5sum ,
--.IR system.posix_acl_access ,
--or
--.IR security.selinux .
--.PP
--The namespace mechanism is used to define different classes of extended
--attributes.
--These different classes exist for several reasons, e.g. the permissions
--and capabilities required for manipulating extended attributes of one
--namespace may differ to another.
--.PP
--Currently the
--.IR security ,
--.IR system ,
--.IR trusted ,
--and
--.IR user
--extended attribute classes are defined as described below. Additional
--classes may be added in the future.
--.SS Extended security attributes
--The security attribute namespace is used by kernel security modules,
--such as Security Enhanced Linux.
--Read and write access permissions to security attributes depend on the
--policy implemented for each security attribute by the security module.
--When no security module is loaded, all processes have read access to
--extended security attributes, and write access is limited to processes
--that have the CAP_SYS_ADMIN capability.
--.SS Extended system attributes
--Extended system attributes are used by the kernel to store system
--objects such as Access Control Lists and Capabilities.  Read and write
--access permissions to system attributes depend on the policy implemented
--for each system attribute implemented by filesystems in the kernel.
--.SS Trusted extended attributes
--Trusted extended attributes are visible and accessible only to processes that
--have the CAP_SYS_ADMIN capability (the super user usually has this
--capability).
--Attributes in this class are used to implement mechanisms in user
--space (i.e., outside the kernel) which keep information in extended attributes
--to which ordinary processes should not have access.
--.SS Extended user attributes
--Extended user attributes may be assigned to files and directories for
--storing arbitrary additional information such as the mime type,
--character set or encoding of a file. The access permissions for user
--attributes are defined by the file permission bits.
--.PP
--The file permission bits of regular files and directories are
--interpreted differently from the file permission bits of special files
--and symbolic links. For regular files and directories the file
--permission bits define access to the file's contents, while for device special
--files they define access to the device described by the special file.
--The file permissions of symbolic links are not used in access
--checks. These differences would allow users to consume filesystem resources in
--a way not controllable by disk quotas for group or world writable special files and directories.
--.PP
--For this reason, extended user attributes are only allowed for regular files and directories, and access to extended user attributes is restricted to the
--owner and to users with appropriate capabilities for directories with the
--sticky bit set (see the
--.BR chmod (1)
--manual page for an explanation of Sticky Directories).
--.SH FILESYSTEM DIFFERENCES
--The kernel and the filesystem may place limits on the maximum number
--and size of extended attributes that can be associated with a file.
--Some file systems, such as ext2/3 and reiserfs, require the filesystem
--to be mounted with the
--.B user_xattr
--mount option in order for extended user attributes to be used.
--.PP
--In the current ext2, ext3 and ext4 filesystem implementations, each
--extended attribute must fit on a single filesystem block (1024, 2048
--or 4096 bytes, depending on the block size specified when the
--filesystem was created).
--.PP
--In the XFS and reiserfs filesystem implementations, there is no
--practical limit on the number or size of extended attributes
--associated with a file, and the algorithms used to store extended
--attribute information on disk are scalable.
--.PP
--In the JFS filesystem implementation, names can be up to 255 bytes and
--values up to 65,535 bytes.
--.SH ADDITIONAL NOTES
--Since the filesystems on which extended attributes are stored might also
--be used on architectures with a different byte order and machine word
--size, care should be taken to store attribute values in an architecture
--independent format.
--.SH AUTHORS
--Andreas Gruenbacher,
--.RI < [email protected] >
--and the SGI XFS development team,
--.RI < [email protected] >.
--.SH SEE ALSO
--getfattr(1),
--setfattr(1).
---
-2.7.4
-
meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch deleted +0 -666
deleted file mode 100644
index 044c5a037c8..00000000000
@@ -1,666 +0,0 @@
-From b972600a26f3a930e53e2fce2625266a5d29813e Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <[email protected]>
-Date: Tue, 14 Apr 2015 23:53:11 +0200
-Subject: [PATCH 1/2] Remove the section 2 man pages
-
-Commit 8d1263bca95722d66a6f8e83450f49d0956ea534 from upstream
-https://git.savannah.nongnu.org/git/attr.git/
-
-The section 2 man pages have long since been added to the man-pages package
-which documents all system calls; they were disabled in attr by default since
-January 2014.  Get rid of them here.
-
-Upstream-Status: Backport
-
-[MA: modified to apply directly to v2.4.47]
-Signed-off-by: Mark Asselstine <[email protected]>
----
- man/Makefile           |   2 +-
- man/man2/Makefile      |  35 -----------
- man/man2/getxattr.2    | 143 --------------------------------------------
- man/man2/listxattr.2   | 158 -------------------------------------------------
- man/man2/removexattr.2 | 111 ----------------------------------
- man/man2/setxattr.2    | 143 --------------------------------------------
- 6 files changed, 1 insertion(+), 591 deletions(-)
- delete mode 100644 man/man2/Makefile
- delete mode 100644 man/man2/getxattr.2
- delete mode 100644 man/man2/listxattr.2
- delete mode 100644 man/man2/removexattr.2
- delete mode 100644 man/man2/setxattr.2
-
-diff --git a/man/Makefile b/man/Makefile
-index 9535426..755daed 100644
---- a/man/Makefile
-+++ b/man/Makefile
-@@ -19,7 +19,7 @@
- TOPDIR = ..
- include $(TOPDIR)/include/builddefs
-
--SUBDIRS = man1 man2 man3 man5
-+SUBDIRS = man1 man3 man5
-
- default : $(SUBDIRS)
-
-diff --git a/man/man2/Makefile b/man/man2/Makefile
-deleted file mode 100644
-index d77309d..0000000
---- a/man/man2/Makefile
-+++ /dev/null
-@@ -1,35 +0,0 @@
--#
--# Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
--# Copyright (C) 2009  Andreas Gruenbacher <[email protected]>
--#
--# This program is free software: you can redistribute it and/or modify it
--# under the terms of the GNU General Public License as published by
--# the Free Software Foundation, either version 2 of the License, or
--# (at your option) any later version.
--#
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program.  If not, see <http://www.gnu.org/licenses/>.
--#
--
--TOPDIR = ../..
--include $(TOPDIR)/include/builddefs
--
--MAN_SECTION   = 2
--
--MAN_PAGES     = $(shell echo *.$(MAN_SECTION))
--MAN_DEST      = $(PKG_MAN_DIR)/man$(MAN_SECTION)
--LSRCFILES     = $(MAN_PAGES)
--
--default install : $(MAN_PAGES)
--
--include $(BUILDRULES)
--
--install-dev : default
--      $(INSTALL) -m 755 -d $(MAN_DEST)
--      $(INSTALL_MAN)
--install-lib:
-diff --git a/man/man2/getxattr.2 b/man/man2/getxattr.2
-deleted file mode 100644
-index 405ad89..0000000
---- a/man/man2/getxattr.2
-+++ /dev/null
-@@ -1,143 +0,0 @@
--.\"
--.\" Extended attributes system calls manual pages
--.\"
--.\" (C) Andreas Gruenbacher, February 2001
--.\" (C) Silicon Graphics Inc, September 2001
--.\"
--.\" This is free documentation; you can redistribute it and/or
--.\" modify it under the terms of the GNU General Public License as
--.\" published by the Free Software Foundation; either version 2 of
--.\" the License, or (at your option) any later version.
--.\"
--.\" The GNU General Public License's references to "object code"
--.\" and "executables" are to be interpreted as the output of any
--.\" document formatting or typesetting system, including
--.\" intermediate and printed output.
--.\"
--.\" This manual is distributed in the hope that it will be useful,
--.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
--.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--.\" GNU General Public License for more details.
--.\"
--.\" You should have received a copy of the GNU General Public
--.\" License along with this manual.  If not, see
--.\" <http://www.gnu.org/licenses/>.
--.\"
--.TH GETXATTR 2 "Extended Attributes" "Dec 2001" "System calls"
--.SH NAME
--getxattr, lgetxattr, fgetxattr \- retrieve an extended attribute value
--.SH SYNOPSIS
--.fam C
--.nf
--.B #include <sys/types.h>
--.B #include <attr/xattr.h>
--.sp
--.BI "ssize_t getxattr (const char\ *" path ", const char\ *" name ",
--.BI "\t\t\t\t void\ *" value ", size_t " size );
--.BI "ssize_t lgetxattr (const char\ *" path ", const char\ *" name ",
--.BI "\t\t\t\t void\ *" value ", size_t " size );
--.BI "ssize_t fgetxattr (int " filedes ", const char\ *" name ",
--.BI "\t\t\t\t void\ *" value ", size_t " size );
--.fi
--.fam T
--.SH DESCRIPTION
--Extended attributes are
--.IR name :\c
--.I value
--pairs associated with inodes (files, directories, symlinks, etc).
--They are extensions to the normal attributes which are associated
--with all inodes in the system (i.e. the
--.BR stat (2)
--data).
--A complete overview of extended attributes concepts can be found in
--.BR attr (5).
--.PP
--.B getxattr
--retrieves the
--.I value
--of the extended attribute identified by
--.I name
--and associated with the given
--.I path
--in the filesystem.
--The length of the attribute
--.I value
--is returned.
--.PP
--.B lgetxattr
--is identical to
--.BR getxattr ,
--except in the case of a symbolic link, where the link itself is
--interrogated, not the file that it refers to.
--.PP
--.B fgetxattr
--is identical to
--.BR getxattr ,
--only the open file pointed to by
--.I filedes
--(as returned by
--.BR open (2))
--is interrogated in place of
--.IR path .
--.PP
--An extended attribute
--.I name
--is a simple NULL-terminated string.
--The name includes a namespace prefix \- there may be several, disjoint
--namespaces associated with an individual inode.
--The value of an extended attribute is a chunk of arbitrary textual or
--binary data of specified length.
--.PP
--An empty buffer of
--.I size
--zero can be passed into these calls to return the current size of the
--named extended attribute, which can be used to estimate the size of a
--buffer which is sufficiently large to hold the value associated with
--the extended attribute.
--.PP
--The interface is designed to allow guessing of initial buffer
--sizes, and to enlarge buffers when the return value indicates
--that the buffer provided was too small.
--.SH RETURN VALUE
--On success, a positive number is returned indicating the size of the
--extended attribute value.
--On failure, \-1 is returned and
--.I errno
--is set appropriately.
--.PP
--If the named attribute does not exist, or the process has no access to
--this attribute,
--.I errno
--is set to ENOATTR.
--.PP
--If the
--.I size
--of the
--.I value
--buffer is too small to hold the result,
--.I errno
--is set to ERANGE.
--.PP
--If extended attributes are not supported by the filesystem, or are disabled,
--.I errno
--is set to ENOTSUP.
--.PP
--The errors documented for the
--.BR stat (2)
--system call are also applicable here.
--.SH AUTHORS
--Andreas Gruenbacher,
--.RI < [email protected] >
--and the SGI XFS development team,
--.RI < [email protected] >.
--Please send any bug reports or comments to these addresses.
--.SH SEE ALSO
--.BR getfattr (1),
--.BR setfattr (1),
--.BR open (2),
--.BR stat (2),
--.BR setxattr (2),
--.BR listxattr (2),
--.BR removexattr (2),
--and
--.BR attr (5).
-diff --git a/man/man2/listxattr.2 b/man/man2/listxattr.2
-deleted file mode 100644
-index 8b4371c..0000000
---- a/man/man2/listxattr.2
-+++ /dev/null
-@@ -1,158 +0,0 @@
--.\"
--.\" Extended attributes system calls manual pages
--.\"
--.\" (C) Andreas Gruenbacher, February 2001
--.\" (C) Silicon Graphics Inc, September 2001
--.\"
--.\" This is free documentation; you can redistribute it and/or
--.\" modify it under the terms of the GNU General Public License as
--.\" published by the Free Software Foundation; either version 2 of
--.\" the License, or (at your option) any later version.
--.\"
--.\" The GNU General Public License's references to "object code"
--.\" and "executables" are to be interpreted as the output of any
--.\" document formatting or typesetting system, including
--.\" intermediate and printed output.
--.\"
--.\" This manual is distributed in the hope that it will be useful,
--.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
--.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--.\" GNU General Public License for more details.
--.\"
--.\" You should have received a copy of the GNU General Public
--.\" License along with this manual.  If not, see
--.\" <http://www.gnu.org/licenses/>.
--.\"
--.TH LISTXATTR 2 "Extended Attributes" "Dec 2001" "System calls"
--.SH NAME
--listxattr, llistxattr, flistxattr \- list extended attribute names
--.SH SYNOPSIS
--.fam C
--.nf
--.B #include <sys/types.h>
--.B #include <attr/xattr.h>
--.sp
--.BI "ssize_t listxattr (const char\ *" path ",
--.BI "\t\t\t\t char\ *" list ", size_t " size );
--.BI "ssize_t llistxattr (const char\ *" path ",
--.BI "\t\t\t\t char\ *" list ", size_t " size );
--.BI "ssize_t flistxattr (int " filedes ",
--.BI "\t\t\t\t char\ *" list ", size_t " size );
--.fi
--.fam T
--.SH DESCRIPTION
--Extended attributes are name:value
--pairs associated with inodes (files, directories, symlinks, etc).
--They are extensions to the normal attributes which are associated
--with all inodes in the system (i.e. the
--.BR stat (2)
--data).
--A complete overview of extended attributes concepts can be found in
--.BR attr (5).
--.PP
--.B listxattr
--retrieves the
--.I list
--of extended attribute names associated with the given
--.I path
--in the filesystem.
--The list is the set of (NULL-terminated) names, one after the other.
--Names of extended attributes to which the calling process does not
--have access may be omitted from the list.
--The length of the attribute name
--.I list
--is returned.
--.PP
--.B llistxattr
--is identical to
--.BR listxattr ,
--except in the case of a symbolic link, where the list of names of
--extended attributes associated with the link itself is retrieved,
--not the file that it refers to.
--.I list
--is a caller-allocated buffer of size
--.IR size .
--.PP
--.B flistxattr
--is identical to
--.BR listxattr ,
--only the open file pointed to by
--.I filedes
--(as returned by
--.BR open (2))
--is interrogated in place of
--.IR path .
--.PP
--A single extended attribute
--.I name
--is a simple NULL-terminated string.
--The name includes a namespace prefix \- there may be several, disjoint
--namespaces associated with an individual inode.
--.PP
--An empty buffer of
--.I size
--zero can be passed into these calls to return the current size of the
--list of extended attribute names, which can be used to estimate the
--size of a buffer which is sufficiently large to hold the list of names.
--.SH EXAMPLES
--The
--.I list
--of names is returned as an unordered array of NULL-terminated character
--strings (attribute names are separated by NULL characters), like this:
--.fam C
--.RS
--.nf
--user.name1\\0system.name1\\0user.name2\\0
--.fi
--.RE
--.fam T
--.P
--Filesystems like ext2, ext3 and XFS which implement POSIX ACLs using
--extended attributes, might return a
--.I list
--like this:
--.fam C
--.RS
--.nf
--system.posix_acl_access\\0system.posix_acl_default\\0
--.fi
--.RE
--.fam T
--.SH RETURN VALUE
--On success, a positive number is returned indicating the size of the
--extended attribute name list.
--On failure, \-1 is returned and
--.I errno
--is set appropriately.
--.PP
--If the
--.I size
--of the
--.I list
--buffer is too small to hold the result,
--.I errno
--is set to ERANGE.
--.PP
--If extended attributes are not supported by the filesystem, or are disabled,
--.I errno
--is set to ENOTSUP.
--.PP
--The errors documented for the
--.BR stat (2)
--system call are also applicable here.
--.SH AUTHORS
--Andreas Gruenbacher,
--.RI < [email protected] >
--and the SGI XFS development team,
--.RI < [email protected] >.
--Please send any bug reports or comments to these addresses.
--.SH SEE ALSO
--.BR getfattr (1),
--.BR setfattr (1),
--.BR open (2),
--.BR stat (2),
--.BR getxattr (2),
--.BR setxattr (2),
--.BR removexattr (2),
--and
--.BR attr (5).
-diff --git a/man/man2/removexattr.2 b/man/man2/removexattr.2
-deleted file mode 100644
-index 2c7d934..0000000
---- a/man/man2/removexattr.2
-+++ /dev/null
-@@ -1,111 +0,0 @@
--.\"
--.\" Extended attributes system calls manual pages
--.\"
--.\" (C) Andreas Gruenbacher, February 2001
--.\" (C) Silicon Graphics Inc, September 2001
--.\"
--.\" This is free documentation; you can redistribute it and/or
--.\" modify it under the terms of the GNU General Public License as
--.\" published by the Free Software Foundation; either version 2 of
--.\" the License, or (at your option) any later version.
--.\"
--.\" The GNU General Public License's references to "object code"
--.\" and "executables" are to be interpreted as the output of any
--.\" document formatting or typesetting system, including
--.\" intermediate and printed output.
--.\"
--.\" This manual is distributed in the hope that it will be useful,
--.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
--.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--.\" GNU General Public License for more details.
--.\"
--.\" You should have received a copy of the GNU General Public
--.\" License along with this manual.  If not, see
--.\" <http://www.gnu.org/licenses/>.
--.\"
--.TH REMOVEXATTR 2 "Extended Attributes" "Dec 2001" "System calls"
--.SH NAME
--removexattr, lremovexattr, fremovexattr \- remove an extended attribute
--.SH SYNOPSIS
--.fam C
--.nf
--.B #include <sys/types.h>
--.B #include <attr/xattr.h>
--.sp
--.BI "int removexattr (const char\ *" path ", const char\ *" name );
--.BI "int lremovexattr (const char\ *" path ", const char\ *" name );
--.BI "int fremovexattr (int " filedes ", const char\ *" name );
--.fi
--.fam T
--.SH DESCRIPTION
--Extended attributes are
--.IR name :\c
--value pairs associated with inodes (files, directories, symlinks, etc).
--They are extensions to the normal attributes which are associated
--with all inodes in the system (i.e. the
--.BR stat (2)
--data).
--A complete overview of extended attributes concepts can be found in
--.BR attr (5).
--.PP
--.B removexattr
--removes the extended attribute identified by
--.I name
--and associated with the given
--.I path
--in the filesystem.
--.PP
--.B lremovexattr
--is identical to
--.BR removexattr ,
--except in the case of a symbolic link, where the extended attribute is
--removed from the link itself, not the file that it refers to.
--.PP
--.B fremovexattr
--is identical to
--.BR removexattr ,
--only the extended attribute is removed from the open file pointed to by
--.I filedes
--(as returned by
--.BR open (2))
--in place of
--.IR path .
--.PP
--An extended attribute name is a simple NULL-terminated string.
--The
--.I name
--includes a namespace prefix \- there may be several, disjoint
--namespaces associated with an individual inode.
--.SH RETURN VALUE
--On success, zero is returned.
--On failure, \-1 is returned and
--.I errno
--is set appropriately.
--.PP
--If the named attribute does not exist,
--.I errno
--is set to ENOATTR.
--.PP
--If extended attributes are not supported by the filesystem, or are disabled,
--.I errno
--is set to ENOTSUP.
--.PP
--The errors documented for the
--.BR stat (2)
--system call are also applicable here.
--.SH AUTHORS
--Andreas Gruenbacher,
--.RI < [email protected] >
--and the SGI XFS development team,
--.RI < [email protected] >.
--Please send any bug reports or comments to these addresses.
--.SH SEE ALSO
--.BR getfattr (1),
--.BR setfattr (1),
--.BR open (2),
--.BR stat (2),
--.BR setxattr (2),
--.BR getxattr (2),
--.BR listxattr (2),
--and
--.BR attr (5).
-diff --git a/man/man2/setxattr.2 b/man/man2/setxattr.2
-deleted file mode 100644
-index b20dc9f..0000000
---- a/man/man2/setxattr.2
-+++ /dev/null
-@@ -1,143 +0,0 @@
--.\"
--.\" Extended attributes system calls manual pages
--.\"
--.\" (C) Andreas Gruenbacher, February 2001
--.\" (C) Silicon Graphics Inc, September 2001
--.\"
--.\" This is free documentation; you can redistribute it and/or
--.\" modify it under the terms of the GNU General Public License as
--.\" published by the Free Software Foundation; either version 2 of
--.\" the License, or (at your option) any later version.
--.\"
--.\" The GNU General Public License's references to "object code"
--.\" and "executables" are to be interpreted as the output of any
--.\" document formatting or typesetting system, including
--.\" intermediate and printed output.
--.\"
--.\" This manual is distributed in the hope that it will be useful,
--.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
--.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--.\" GNU General Public License for more details.
--.\"
--.\" You should have received a copy of the GNU General Public
--.\" License along with this manual.  If not, see
--.\" <http://www.gnu.org/licenses/>.
--.\"
--.TH SETXATTR 2 "Extended Attributes" "Dec 2001" "System calls"
--.SH NAME
--setxattr, lsetxattr, fsetxattr \- set an extended attribute value
--.SH SYNOPSIS
--.fam C
--.nf
--.B #include <sys/types.h>
--.B #include <attr/xattr.h>
--.sp
--.BI "int setxattr (const char\ *" path ", const char\ *" name ",
--.BI "\t\t\t const void\ *" value ", size_t " size ", int " flags );
--.BI "int lsetxattr (const char\ *" path ", const char\ *" name ",
--.BI "\t\t\t const void\ *" value ", size_t " size ", int " flags );
--.BI "int fsetxattr (int " filedes ", const char\ *" name ",
--.BI "\t\t\t const void\ *" value ", size_t " size ", int " flags );
--.fi
--.fam T
--.SH DESCRIPTION
--Extended attributes are
--.IR name :\c
--.I value
--pairs associated with inodes (files, directories, symlinks, etc).
--They are extensions to the normal attributes which are associated
--with all inodes in the system (i.e. the
--.BR stat (2)
--data).
--A complete overview of extended attributes concepts can be found in
--.BR attr (5).
--.PP
--.B setxattr
--sets the
--.I value
--of the extended attribute identified by
--.I name
--and associated with the given
--.I path
--in the filesystem.
--The
--.I size
--of the
--.I value
--must be specified.
--.PP
--.B lsetxattr
--is identical to
--.BR setxattr ,
--except in the case of a symbolic link, where the extended attribute is
--set on the link itself, not the file that it refers to.
--.PP
--.B fsetxattr
--is identical to
--.BR setxattr ,
--only the extended attribute is set on the open file pointed to by
--.I filedes
--(as returned by
--.BR open (2))
--in place of
--.IR path .
--.PP
--An extended attribute name is a simple NULL-terminated string.
--The
--.I name
--includes a namespace prefix \- there may be several, disjoint
--namespaces associated with an individual inode.
--The
--.I value
--of an extended attribute is a chunk of arbitrary textual or
--binary data of specified length.
--.PP
--The
--.I flags
--parameter can be used to refine the semantics of the operation.
--XATTR_CREATE specifies a pure create, which fails if the named
--attribute exists already.
--XATTR_REPLACE specifies a pure replace operation, which fails if the
--named attribute does not already exist.
--By default (no flags), the extended attribute will be created if
--need be, or will simply replace the value if the attribute exists.
--.SH RETURN VALUE
--On success, zero is returned.
--On failure, \-1 is returned and
--.I errno
--is set appropriately.
--.PP
--If XATTR_CREATE is specified, and the attribute exists already,
--.I errno
--is set to EEXIST.
--If XATTR_REPLACE is specified, and the attribute does not exist,
--.I errno
--is set to ENOATTR.
--.PP
--If there is insufficient space remaining to store the extended attribute,
--.I errno
--is set to either ENOSPC, or EDQUOT if quota enforcement was the cause.
--.PP
--If extended attributes are not supported by the filesystem, or are disabled,
--.I errno
--is set to ENOTSUP.
--.PP
--The errors documented for the
--.BR stat (2)
--system call are also applicable here.
--.SH AUTHORS
--Andreas Gruenbacher,
--.RI < [email protected] >
--and the SGI XFS development team,
--.RI < [email protected] >.
--Please send any bug reports or comments to these addresses.
--.SH SEE ALSO
--.BR getfattr (1),
--.BR setfattr (1),
--.BR open (2),
--.BR stat (2),
--.BR getxattr (2),
--.BR listxattr (2),
--.BR removexattr (2),
--and
--.BR attr (5).
---
-2.7.4
-
meta/recipes-support/attr/files/relative-libdir.patch deleted +0 -25
deleted file mode 100644
index b72bf184d6f..00000000000
@@ -1,25 +0,0 @@
-Upstream-Status: Pending
-
-use relative path in symbolic links, or it fails in staging
-sed expression from udev
-
-7/29/2010 - created by Qing He <[email protected]>
-
-diff -u include.orig/buildmacros include/buildmacros
---- include.orig/buildmacros   2010-07-29 17:39:48.000000000 +0800
-+++ include/buildmacros        2010-07-29 18:20:34.000000000 +0800
-@@ -88,9 +88,11 @@
-       ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-       ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
-       if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
--      ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
--      ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
--      ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
-+      rel_lib_prefix=$$(echo $(PKG_LIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
-+      ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
-+      ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
-+      rel_devlib_prefix=$$(echo $(PKG_DEVLIB_DIR) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
-+      ../$(INSTALL) -S $$rel_devlib_prefix$(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
-       fi
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
meta/recipes-support/attr/files/run-ptest deleted +0 -6
deleted file mode 100644
index a6c6867f2d9..00000000000
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-make -C test -k tests root-tests |sed \
- -e 's|^\[.*\] \(.*\) -- ok$|PASS: \1|' \
- -e 's|^\[.*\] \(.*\) -- failed|FAIL: \1|'
--

2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#35 lore raw

Re: [PATCH 19/30] acl/attr: update to latest upstream releases

How come I do not see these issues in local testing? :-/

I'll investigate on Monday.

Alex

Quoted 2,497 lines · Khem Raj

breaks pseudo-native

http://errors.yoctoproject.org/Errors/Details/297280/

Quoted 26 lines · Alexander Kanavin

The latest release use standard autotools, so drop all the build system related hacks and patches.

Ptests have been rewritten, with 100% pass rate for both.

---
 .../0001-test-patch-out-failing-bits.patch    |  63 ++
 ...dcode-the-build-path-into-a-helper-l.patch |  24 +
 ...file-libacl-should-depend-on-include.patch |  51 --
 ...-order-of-expected-output-of-getfacl.patch | 198 ------
 meta/recipes-support/attr/acl/configure.ac    |  49 --
 meta/recipes-support/attr/acl/run-ptest       |  60 +-
 .../acl/test-fix-directory-permissions.patch  |  37 -
 .../test-fix-insufficient-quoting-of.patch    | 100 ---
 ...-SELinux-machines-for-root-testcases.patch |  84 ---
 meta/recipes-support/attr/acl_2.2.52.bb       |  52 --
 meta/recipes-support/attr/acl_2.2.53.bb       |  60 ++
 meta/recipes-support/attr/attr.inc            |  41 +-
 .../0001-Use-stdint-types-consistently.patch  |  69 --
 .../attr/attr/attr-Missing-configure.ac.patch |  63 --
 .../attr/attr/dont-use-decl-macros.patch      |  56 --
 meta/recipes-support/attr/attr/run-ptest      |   3 +
 meta/recipes-support/attr/attr_2.4.47.bb      |  15 -
 meta/recipes-support/attr/attr_2.4.48.bb      |   6 +
Quoted 8 lines
 meta/recipes-support/attr/ea-acl.inc          |  52 --
 ...option-to-enable-disable-static-libr.patch |  70 --
 ...e-attr.5-man-page-moved-to-man-pages.patch | 240 -------
 .../Remove-the-section-2-man-pages.patch      | 666 ------------------
 .../attr/files/relative-libdir.patch          |  25 -
 meta/recipes-support/attr/files/run-ptest     |   5 -
 24 files changed, 182 insertions(+), 1907 deletions(-)
 create mode 100644

meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch

Quoted 1 line
 create mode 100644

meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch

Quoted 1 line
 delete mode 100644

meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch

Quoted 1 line
 delete mode 100644

meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch

Quoted 2 lines
 delete mode 100644 meta/recipes-support/attr/acl/configure.ac
 delete mode 100644

meta/recipes-support/attr/acl/test-fix-directory-permissions.patch

Quoted 1 line
 delete mode 100644

meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch

Quoted 1 line
 delete mode 100644

meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch

Quoted 3 lines
 delete mode 100644 meta/recipes-support/attr/acl_2.2.52.bb
 create mode 100644 meta/recipes-support/attr/acl_2.2.53.bb
 delete mode 100644

meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch

Quoted 1 line
 delete mode 100644

meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch

Quoted 1 line
 delete mode 100644

meta/recipes-support/attr/attr/dont-use-decl-macros.patch

Quoted 5 lines
 create mode 100644 meta/recipes-support/attr/attr/run-ptest
 delete mode 100644 meta/recipes-support/attr/attr_2.4.47.bb
 create mode 100644 meta/recipes-support/attr/attr_2.4.48.bb
 delete mode 100644 meta/recipes-support/attr/ea-acl.inc
 delete mode 100644

meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch

Quoted 1 line
 delete mode 100644

meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch

Quoted 1 line
 delete mode 100644

meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch

Quoted 4 lines
 delete mode 100644 meta/recipes-support/attr/files/relative-libdir.patch
 delete mode 100644 meta/recipes-support/attr/files/run-ptest

diff --git

a/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch b/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch

Quoted 4 lines

new file mode 100644
index 00000000000..ba2ffee5d27
--- /dev/null
+++

b/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch

meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch line 10

Quoted 11 lines
meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch new file +10 -0
@@ -0,0 +1,63 @@
+From 9e08219e0e99ee2589cf35fa8d52cef3515accce Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Thu, 12 Dec 2019 15:47:49 +0100
+Subject: [PATCH] test: patch out failing bits
+
+I have confirmed on the host distro (Ubuntu 18.04) that they
+fail as well; upstream probably haven't noticed because the
+test is only executed under sudo.
+
+Upstream-Status: Inappropriate [disabling tests instead of fixing them

properly]

meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch

Quoted 10 lines
meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch new file +10 -0
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ test/root/permissions.test | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+diff --git a/test/root/permissions.test b/test/root/permissions.test
+index 8f8f825..21e8a95 100644
+--- a/test/root/permissions.test
++++ b/test/root/permissions.test
+@@ -50,10 +50,6 @@ User daemon is a member in the owning group, which

has only read access.

meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch

Quoted 11 lines
meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch new file +11 -0
+ Verify this.
+
+       $ su daemon
+-      $ cat f
+-      > root
+-      > bin
+-
+       $ echo daemon >> f
+       >~ .*f: Permission denied$
+
+@@ -146,8 +142,6 @@ the owning group, he should still have no write

access.

Quoted 32 lines
meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch new file +32 -0
+       $ setfacl -x g:daemon f
+
+       $ su daemon
+-      $ echo daemon4 >> f
+-      >~ .*f: Permission denied$
+
+
+ Change the owning group. The other permissions should now grant user
+@@ -158,12 +152,6 @@ daemon write access.
+
+       $ su daemon
+       $ echo daemon5 >> f
+-      $ cat f
+-      > root
+-      > bin
+-      > daemon
+-      > daemon2
+-      > daemon5
+
+
+ Verify that permissions in separate matching ACL entries do not
+@@ -173,7 +161,6 @@ accumulate.
+       $ setfacl -m g:bin:r,g:daemon:w f
+
+       $ su daemon
+-      $ : < f
+       $ : > f
+       $ : <> f
+       >~ .*f: Permission denied$
+--
+2.17.1
+
Quoted 1 line

diff --git

a/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch b/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch

Quoted 4 lines

new file mode 100644
index 00000000000..57ef0bb728c
--- /dev/null
+++

b/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch

meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch line 4

Quoted 5 lines
meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch new file +4 -0
@@ -0,0 +1,24 @@
+From 39d332a8801de5d9ef09dacb3dba85c208b7b2ad Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Thu, 12 Dec 2019 13:45:52 +0100
+Subject: [PATCH] tests: do not hardcode the build path into a helper

library

Quoted 20 lines
meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch new file +20 -0
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ test/Makemodule.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/Makemodule.am b/test/Makemodule.am
+index 17d4927..015de7f 100644
+--- a/test/Makemodule.am
++++ b/test/Makemodule.am
+@@ -30,7 +30,7 @@ EXTRA_DIST += \
+ check_LTLIBRARIES = libtestlookup.la
+
+ libtestlookup_la_SOURCES = test/test_passwd.c test/test_group.c
+-libtestlookup_la_CFLAGS = -DBASEDIR=\"$(abs_srcdir)\"
++libtestlookup_la_CFLAGS = -DBASEDIR=\"/tmp/acl-ptest\"
+ libtestlookup_la_LDFLAGS = -rpath $(abs_builddir)
+
+ AM_TESTS_ENVIRONMENT = PATH="$(abs_top_builddir):$$PATH";
Quoted 1 line

diff --git

a/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch b/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch

Quoted 3 lines

deleted file mode 100644
index 4c7cba3b88d..00000000000
---

a/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch

Quoted 6 lines

+++ /dev/null

meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch deleted +0 -4
@@ -1,51 +0,0 @@
-From d82457ce5ca7455e336da5e244d95f90e52aaef8 Mon Sep 17 00:00:00 2001
-From: Robert Yang <[email protected]>
-Date: Tue, 18 Apr 2017 01:17:26 -0700
-Subject: [PATCH] Makefile: libacl should depend on include

meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch line 14

Quoted 10 lines
meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch deleted +0 -10
-
-Fixed race issue:
- In file included from acl_copy_entry.c:22:0:
- libacl.h:19:21: fatal error: sys/acl.h: No such file or directory
-  #include <sys/acl.h>
-
-[snip]
-
- compilation terminated.
- acl_get_file.c:27:24: fatal error: acl/libacl.h: No such file or

directory

Quoted 37 lines
meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch deleted +0 -37
-  #include <acl/libacl.h>
-                         ^
-
-The acl.h is in "include" directory, and include/Makefile creates
-symlink "sys" and "acl" poinst to current dirctory:
-$ ls include/ -l
-acl -> .
-sys -> .
-
-So if "libacl" target runs before "include", the error would happen
-since no "acl" or "sys" directory.
-
-Let libacl depend on include can fix the problem.
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <[email protected]>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index dce32d3..8a79379 100644
---- a/Makefile
-+++ b/Makefile
-@@ -48,7 +48,7 @@ else
- endif
-
- # tool/lib dependencies
--libacl: libmisc
-+libacl: include libmisc
- getfacl setfacl chacl: libacl
-
- ifeq ($(HAVE_BUILDDEFS), yes)
---
-2.10.2
-
Quoted 1 line

diff --git

a/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch b/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch

Quoted 3 lines

deleted file mode 100644
index cf765fdbb89..00000000000
---

a/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch

Review

Quoted 201 lines

+++ /dev/null

meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch deleted +0 -198
@@ -1,198 +0,0 @@
-acl: fix the order of expected output of getfacl
-
-The result of getfacl is sorted by user id.
-In Centos or RHEL, bin user id is 1 and daemon user id is 2.
-But in our image, bin user id is 2 and daemon user id is 1.
-The patch fixes this issue to make ptest pass.
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Chong Lu <[email protected]>
----
- test/misc.test |   38 +++++++++++++++++++-------------------
- 1 file changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/test/misc.test b/test/misc.test
-index 6e98053..53ae5b0 100644
---- a/test/misc.test
-+++ b/test/misc.test
-@@ -79,8 +79,8 @@ Multiple users
-
-       $ getfacl --omit-header f
-       > user::rw-
--      > user:bin:rw-
-       > user:daemon:r--
-+      > user:bin:rw-
-       > group::r--
-       > mask::rw-
-       > other::r--
-@@ -94,8 +94,8 @@ Multiple groups
-
-       $ getfacl --omit-header f
-       > user::rw-
--      > user:bin:rw-
-       > user:daemon:r--
-+      > user:bin:rw-
-       > group::r--
-       > group:daemon:r--
-       > group:users:rw-
-@@ -111,8 +111,8 @@ Remove one group
-
-       $ getfacl --omit-header f
-       > user::rw-
--      > user:bin:rw-
-       > user:daemon:r--
-+      > user:bin:rw-
-       > group::r--
-       > group:daemon:r--
-       > mask::rw-
-@@ -146,8 +146,8 @@ Default ACL
-
-       $ getfacl --omit-header d
-       > user::rwx
--      > user:bin:rwx
-       > user:daemon:rw-
-+      > user:bin:rwx
-       > group::r-x
-       > mask::rwx
-       > other::---
-@@ -236,16 +236,16 @@ Add some users and groups
-
-       $ getfacl --omit-header d/d
-       > user::rwx
--      > user:bin:rwx  #effective:r-x
-       > user:daemon:r-x
-+      > user:bin:rwx  #effective:r-x
-       > group::r-x
-       > group:daemon:rwx      #effective:r-x
-       > group:users:r-x
-       > mask::r-x
-       > other::---
-       > default:user::rwx
--      > default:user:bin:rwx  #effective:r-x
-       > default:user:daemon:r-x
-+      > default:user:bin:rwx  #effective:r-x
-       > default:group::r-x
-       > default:mask::r-x
-       > default:other::---
-@@ -262,16 +262,16 @@ Symlink in directory with default ACL?
-
-       $ getfacl --omit-header d/l
-       > user::rwx
--      > user:bin:rwx  #effective:r-x
-       > user:daemon:r-x
-+      > user:bin:rwx  #effective:r-x
-       > group::r-x
-       > group:daemon:rwx      #effective:r-x
-       > group:users:r-x
-       > mask::r-x
-       > other::---
-       > default:user::rwx
--      > default:user:bin:rwx  #effective:r-x
-       > default:user:daemon:r-x
-+      > default:user:bin:rwx  #effective:r-x
-       > default:group::r-x
-       > default:mask::r-x
-       > default:other::---
-@@ -287,16 +287,16 @@ Does mask manipulation work?
-
-       $ getfacl --omit-header d/d
-       > user::rwx
--      > user:bin:r-x
-       > user:daemon:r-x
-+      > user:bin:r-x
-       > group::r-x
-       > group:daemon:r-x
-       > group:users:r-x
-       > mask::r-x
-       > other::---
-       > default:user::rwx
--      > default:user:bin:rwx  #effective:r-x
-       > default:user:daemon:r-x
-+      > default:user:bin:rwx  #effective:r-x
-       > default:group::r-x
-       > default:mask::r-x
-       > default:other::---
-@@ -308,16 +308,16 @@ Does mask manipulation work?
-
-       $ getfacl --omit-header d/d
-       > user::rwx
--      > user:bin:r-x
-       > user:daemon:r-x
-+      > user:bin:r-x
-       > group::r-x
-       > group:daemon:r-x
-       > group:users:r-x
-       > mask::r-x
-       > other::---
-       > default:user::rwx
--      > default:user:bin:rwx
-       > default:user:daemon:r-x
-+      > default:user:bin:rwx
-       > default:group::r-x
-       > default:mask::rwx
-       > default:other::---
-@@ -333,8 +333,8 @@ Remove the default ACL
-
-       $ getfacl --omit-header d
-       > user::rwx
--      > user:bin:rwx
-       > user:daemon:rw-
-+      > user:bin:rwx
-       > group::r-x
-       > mask::rwx
-       > other::---
-@@ -373,14 +373,14 @@ Now, chmod should change the group_obj entry
-
-       $ getfacl --omit-header d
-       > user::rwx
--      > user:bin:r-x
-       > user:daemon:rwx
-+      > user:bin:r-x
-       > group::rwx
-       > mask::rwx
-       > other::r-x
-       > default:user::rwx
--      > default:user:bin:r-x
-       > default:user:daemon:rwx
-+      > default:user:bin:r-x
-       > default:group::rwx
-       > default:mask::rwx
-       > default:other::r-x
-@@ -392,14 +392,14 @@ Now, chmod should change the group_obj entry
-
-       $ getfacl --omit-header d
-       > user::rwx
--      > user:bin:r-x
-       > user:daemon:rwx       #effective:r-x
-+      > user:bin:r-x
-       > group::rwx    #effective:r-x
-       > mask::r-x
-       > other::---
-       > default:user::rwx
--      > default:user:bin:r-x
-       > default:user:daemon:rwx
-+      > default:user:bin:r-x
-       > default:group::rwx
-       > default:mask::rwx
-       > default:other::r-x
-@@ -411,14 +411,14 @@ Now, chmod should change the group_obj entry
-
-       $ getfacl --omit-header d
-       > user::rwx
--      > user:bin:r-x
-       > user:daemon:rwx       #effective:r-x
-+      > user:bin:r-x
-       > group::rwx    #effective:r-x
-       > mask::r-x
-       > other::---
-       > default:user::rwx
--      > default:user:bin:r-x
-       > default:user:daemon:rwx
-+      > default:user:bin:r-x
-       > default:group::rwx
-       > default:mask::rwx
-       > default:other::r-x
---
-1.7.9.5
-
(quoted diff) +0 -0

b/meta/recipes-support/attr/acl/configure.ac

meta/recipes-support/attr/acl/configure.ac line 3

Quoted 8 lines

deleted file mode 100644
index 7af2e8d886e..00000000000

meta/recipes-support/attr/acl/configure.ac deleted +0 -3
@@ -1,49 +0,0 @@
-# Copyright (C) 2009  Andreas Gruenbacher <[email protected]>
-#
-# This program is free software: you can redistribute it and/or modify

it

Quoted 12 lines
meta/recipes-support/attr/acl/configure.ac deleted +0 -12
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#

meta/recipes-support/attr/acl/configure.ac

Quoted 10 lines
meta/recipes-support/attr/acl/configure.ac deleted +0 -10
-AC_INIT(include/acl.h)
-AC_CONFIG_AUX_DIR([.])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADER(include/config.h)
-AC_PREFIX_DEFAULT(/usr)
-
-AC_PROG_LIBTOOL
-
-AC_ARG_ENABLE(shared,
-[ --enable-shared=[yes/no] Enable use of shared libraries

[default=yes]],,

meta/recipes-support/attr/acl/configure.ac

Quoted 5 lines
meta/recipes-support/attr/acl/configure.ac deleted +0 -5
-       enable_shared=yes)
-AC_SUBST(enable_shared)
-
-AC_ARG_ENABLE(gettext,
-[ --enable-gettext=[yes/no] Enable alternate language support

[default=yes]],,

Review

Quoted 20 lines
meta/recipes-support/attr/acl/configure.ac deleted +0 -19
-       enable_gettext=yes)
-AC_SUBST(enable_gettext)
-
-AC_ARG_ENABLE(lib64,
-[ --enable-lib64=[yes/no] Enable lib64 support [default=no]],,
-       enable_lib64=no)
-AC_SUBST(enable_lib64)
-
-AC_PACKAGE_GLOBALS(acl)
-AC_PACKAGE_UTILITIES(acl)
-AC_PACKAGE_NEED_ATTR_XATTR_H
-AC_PACKAGE_NEED_ATTR_ERROR_H
-AC_MULTILIB($enable_lib64)
-AC_PACKAGE_NEED_GETXATTR_LIBATTR
-AC_MANUAL_FORMAT
-
-AC_FUNC_GCC_VISIBILITY
-
-AC_OUTPUT(include/builddefs)
(quoted diff) +0 -0

b/meta/recipes-support/attr/acl/run-ptest

Quoted 68 lines

index a56946d8e6f..43128233654 100644

meta/recipes-support/attr/acl/run-ptest +3 -57
@@ -4,61 +4,7 @@
 
 #umask 077
 
-EXT3_IMAGE=ext3.img
-EXT3_MOUNT_POINT=/mnt/ext3
+mkdir -p /tmp/acl-ptest/test
+cp test/test.* /tmp/acl-ptest/test
 
-trap 'rm -f ${EXT3_IMAGE}' EXIT
-
-dd if=/dev/zero of=${EXT3_IMAGE} bs=1M count=1
-if [ "$?" -eq 0 ]; then
-       echo "PASS: dump ext3.img"
-else
-       echo "FAIL: dump ext3.img"
-       exit 1
-fi
-
-mkfs.ext3 -F ${EXT3_IMAGE}
-if [ "$?" -eq 0 ]; then
-       echo "PASS: mkfs.ext3 -F ext3.img"
-else
-       echo "FAIL: mkfs.ext3 -F ext3.img"
-       exit 1
-fi
-
-if [ -d $EXT3_MOUNT_POINT ]; then
-       echo "mount point exist"
-else
-       mkdir -p $EXT3_MOUNT_POINT
-fi
-
-
-mount -o loop,rw,acl  ${EXT3_IMAGE} $EXT3_MOUNT_POINT
-if [ "$?" -eq 0 ]; then
-       echo "PASS: mount ext3.img"
-else
-       echo "FAIL: mount ext3.img"
-       exit 1
-fi
-
-cp -rf ./test/ $EXT3_MOUNT_POINT
-
-cd $EXT3_MOUNT_POINT/test/
-
-if     sed -e 's!^bin:x:2:$!bin:x:2:daemon!' < /etc/group > gtmp
-then   if      cp /etc/group group.orig;
-       then    cp gtmp /etc/group
-               make  -k tests root-tests | sed \
-                       -e 's|^\[.*\] \(.*\) -- ok$|PASS: \1|' \
-                       -e 's|^\[.*\] \(.*\) -- failed|FAIL: \1|'
-               cp group.orig /etc/group
-       else    echo "FAIL: couldn't save original group file."
-               exit 1
-       fi
-else   echo "FAIL: couldn't create modified group file."
-       exit 1
-fi
-
-cd -
-umount $EXT3_MOUNT_POINT
-rm -rf $EXT3_MOUNT_POINT
-rm $EXT3_IMAGE
+make test-suite.log
Quoted 1 line

diff --git

a/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch b/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch

meta/recipes-support/attr/acl/test-fix-directory-permissions.patch line 4

Quoted 9 lines

deleted file mode 100644
index e64990ad5b9..00000000000

meta/recipes-support/attr/acl/test-fix-directory-permissions.patch deleted +0 -4
@@ -1,37 +0,0 @@
-From 311589fedf196168382d8f0db303ab328bcf9d83 Mon Sep 17 00:00:00 2001
-From: Peter Seebach <[email protected]>
-Date: Wed, 11 May 2016 15:16:06 -0500
-Subject: [PATCH] acl.inc, run-ptest: improve ptest functionality on

limited

meta/recipes-support/attr/acl/test-fix-directory-permissions.patch

Quoted 7 lines
meta/recipes-support/attr/acl/test-fix-directory-permissions.patch deleted +0 -7
-
-commit c45bae84817a70fef6c2b661a07a492a0d23ae85
-
-    Fix permissions on temporary directory
-
-    The temporary directory's permissions have to allow other users to
-    view the directory. A default umask of 022 is common, but not

mandatory,

meta/recipes-support/attr/acl/test-fix-directory-permissions.patch

Quoted 5 lines
meta/recipes-support/attr/acl/test-fix-directory-permissions.patch deleted +0 -5
-    and secure systems may have more restrictive defaults.
-
-    Signed-off-by: Peter Seebach <[email protected]>
-
-Upstream-Status: Backport [

http://git.savannah.gnu.org/cgit/acl.git/commit/?id=c6772a958800de064482634f77c20a0faafc5af6
]

Quoted 21 lines
meta/recipes-support/attr/acl/test-fix-directory-permissions.patch deleted +0 -21
-
-Signed-off-by: Dengke Du <[email protected]>
----
- test/root/permissions.test | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/root/permissions.test b/test/root/permissions.test
-index 42615f5..098b52a 100644
---- a/test/root/permissions.test
-+++ b/test/root/permissions.test
-@@ -16,6 +16,7 @@ Cry immediately if we are not running as root.
- First, set up a temporary directory and create a regular file with
- defined permissions.
-
-+      $ umask 022
-       $ mkdir d
-       $ cd d
-       $ umask 027
---
-2.8.1
-
Quoted 1 line

diff --git

a/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch b/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch

Quoted 3 lines

deleted file mode 100644
index f392465b58e..00000000000
---

a/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch

Quoted 26 lines

+++ /dev/null

meta/recipes-support/attr/acl/test-fix-directory-permissions.patch deleted +0 -24
@@ -1,100 +0,0 @@
-From e98ce8acf84d12ea67a3ac76bf63c6d87d9af86d Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <[email protected]>
-Date: Mon, 20 May 2013 16:38:06 +0200
-Subject: [PATCH] test: fix insufficient quoting of '\'
-
-This is a follow-up to 7f2c91b8369242a8dbc2b304a5b71b2a85f5b855, which
-caused sbits-restore.test to fail in the following way in case SELinux
-was disabled:
-
-*** sbits-restore.test ***
-[3] $ umask 022 -- ok
-[4] $ mkdir d -- ok
-[5] $ touch d/g -- ok
-[6] $ touch d/u -- ok
-[7] $ chmod u+s d/u -- ok
-[8] $ chmod g+s d/g -- ok
-[9] $ chmod +t d -- ok
-[10] $ getfacl -R d > d.acl -- ok
-[11] $ rm -R d -- ok
-[12] $ mkdir d -- ok
-[13] $ touch d/g -- ok
-[14] $ touch d/u -- ok
-[15] $ setfacl --restore d.acl -- ok
-[16] $ ls -dl d | awk '{print $1}' | sed 's/.$//g' -- failed

meta/recipes-support/attr/acl/test-fix-directory-permissions.patch line 34

Quoted 10 lines
meta/recipes-support/attr/acl/test-fix-directory-permissions.patch deleted +0 -10
-drwxr-xr-                             != drwxr-xr-t
-[18] $ ls -dl d/u | awk '{print $1}' | sed 's/.$//g' -- failed
--rwSr--r-                             != -rwSr--r--
-[20] $ ls -dl d/g | awk '{print $1}' | sed 's/.$//g' -- failed
--rw-r-Sr-                             != -rw-r-Sr--
-[22] $ rm -Rf d -- ok
-17 commands (14 passed, 3 failed)
-
-Upstream-Status: Backport
-

http://git.savannah.gnu.org/cgit/acl.git/commit/?id=e98ce8acf84d12ea67a3ac76bf63c6d87d9af86d

Quoted 66 lines
meta/recipes-support/attr/acl/test-fix-directory-permissions.patch deleted +0 -66
-
-Signed-off-by: Kamil Dudka <[email protected]>
-Signed-off-by: He Zhe <[email protected]>
-
-Index: acl-2.2.52/test/cp.test
-===================================================================
---- acl-2.2.52.orig/test/cp.test
-+++ acl-2.2.52/test/cp.test
-@@ -9,7 +9,7 @@ The cp utility should only copy ACLs if
-       > -rw-rw-r--+
-
-       $ cp f g
--      $ ls -l g | awk -- '{ print $1 }' | sed 's/\.$//g'
-+      $ ls -l g | awk -- '{ print $1 }' | sed 's/\\.$//g'
-       > -rw-r--r--
-
-       $ rm g
-Index: acl-2.2.52/test/misc.test
-===================================================================
---- acl-2.2.52.orig/test/misc.test
-+++ acl-2.2.52/test/misc.test
-@@ -254,7 +254,7 @@ Add some users and groups
- Symlink in directory with default ACL?
-
-       $ ln -s d d/l
--      $ ls -dl d/l | awk '{print $1}' | sed 's/\.$//g'
-+      $ ls -dl d/l | awk '{print $1}' | sed 's/\\.$//g'
-       > lrwxrwxrwx
-
-       $ ls -dl -L d/l | awk '{print $1}'
-@@ -343,7 +343,7 @@ Remove the default ACL
- Reset to base entries
-
-       $ setfacl -b d
--      $ ls -dl d | awk '{print $1}' | sed 's/\.$//g'
-+      $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g'
-       > drwxr-x---
-
-       $ getfacl --omit-header d
-@@ -355,7 +355,7 @@ Reset to base entries
- Now, chmod should change the group_obj entry
-
-       $ chmod 775 d
--      $ ls -dl d | awk '{print $1}' | sed 's/\.$//g'
-+      $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g'
-       > drwxrwxr-x
-
-       $ getfacl --omit-header d
-Index: acl-2.2.52/test/sbits-restore.test
-===================================================================
---- acl-2.2.52.orig/test/sbits-restore.test
-+++ acl-2.2.52/test/sbits-restore.test
-@@ -13,10 +13,10 @@ Ensure setting of SUID/SGID/sticky via -
-       $ touch d/g
-       $ touch d/u
-       $ setfacl --restore d.acl
--      $ ls -dl d | awk '{print $1}' | sed 's/\.$//g'
-+      $ ls -dl d | awk '{print $1}' | sed 's/\\.$//g'
-       > drwxr-xr-t
--      $ ls -dl d/u | awk '{print $1}' | sed 's/\.$//g'
-+      $ ls -dl d/u | awk '{print $1}' | sed 's/\\.$//g'
-       > -rwSr--r--
--      $ ls -dl d/g | awk '{print $1}' | sed 's/\.$//g'
-+      $ ls -dl d/g | awk '{print $1}' | sed 's/\\.$//g'
-       > -rw-r-Sr--
-       $ rm -Rf d
Quoted 1 line

diff --git

a/meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch b/meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch

Quoted 3 lines

deleted file mode 100644
index 8cc11a63e12..00000000000
---

a/meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch

meta/recipes-support/attr/acl/test-fix-directory-permissions.patch line 10

Quoted 12 lines

+++ /dev/null

meta/recipes-support/attr/acl/test-fix-directory-permissions.patch deleted +0 -10
@@ -1,84 +0,0 @@
-From d2f49ee6fe4850b8dda5b08676b36201d3c43710 Mon Sep 17 00:00:00 2001
-From: He Zhe <[email protected]>
-Date: Wed, 2 Mar 2016 15:46:57 +0800
-Subject: [PATCH] test: fixups on SELinux machines for root testcases
-
-ls adds a '.' at the end of the permission field list on SELinux
-machines, filter this out so root tests work on SELinux machines.
-
-Upstream-Status: Accepted
-

http://git.savannah.gnu.org/cgit/acl.git/commit/?id=26a87d36f80d5e98bccb5878834d9e69dadfe3e9

Quoted 12 lines
meta/recipes-support/attr/acl/test-fix-directory-permissions.patch deleted +0 -12
-
-Signed-off-by: He Zhe <[email protected]>
----
- test/root/permissions.test | 8 ++++----
- test/root/restore.test     | 2 +-
- test/root/setfacl.test     | 2 +-
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/test/root/permissions.test b/test/root/permissions.test
-index 9b9e3de..665339a 100644
---- a/test/root/permissions.test
-+++ b/test/root/permissions.test

meta/recipes-support/attr/acl/test-fix-directory-permissions.patch line 32

Quoted 10 lines
meta/recipes-support/attr/acl/test-fix-directory-permissions.patch deleted +0 -10
-@@ -19,7 +19,7 @@ defined permissions.
-       $ cd d
-       $ umask 027
-       $ touch f
--      $ ls -l f | awk -- '{ print $1, $3, $4 }'
-+      $ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g'
-       > -rw-r----- root root
-
-
-@@ -39,7 +39,7 @@ Now, change the ownership of the file to bin:bin and

verify that this

meta/recipes-support/attr/acl/test-fix-directory-permissions.patch line 41

Quoted 9 lines
meta/recipes-support/attr/acl/test-fix-directory-permissions.patch deleted +0 -9
- gives user bin write access.
-
-       $ chown bin:bin f
--      $ ls -l f | awk -- '{ print $1, $3, $4 }'
-+      $ ls -l f | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g'
-       > -rw-r----- bin bin
-       $ su bin
-       $ echo bin >> f
-@@ -256,12 +256,12 @@ directories if the file has an ACL and only

CAP_FOWNER would grant them.

Review

Quoted 44 lines
meta/recipes-support/attr/acl/test-fix-directory-permissions.patch deleted +0 -43
-       $ mkdir -m 600 x
-       $ chown daemon:daemon x
-       $ echo j > x/j
--      $ ls -l x/j | awk -- '{ print $1, $3, $4 }'
-+      $ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g'
-       > -rw-r----- root root
-
-       $ setfacl -m u:daemon:r x
-
--      $ ls -l x/j | awk -- '{ print $1, $3, $4 }'
-+      $ ls -l x/j | awk -- '{ print $1, $3, $4 }' | sed 's/\\.//g'
-       > -rw-r----- root root
-       (With the bug this gives: `ls: x/j: Permission denied'.)
-
-diff --git a/test/root/restore.test b/test/root/restore.test
-index 63a9d01..c85097c 100644
---- a/test/root/restore.test
-+++ b/test/root/restore.test
-@@ -21,7 +21,7 @@ Cry immediately if we are not running as root.
-       $ chown bin passwd
-       $ chmod u+s passwd
-       $ setfacl --restore passwd.acl
--      $ ls -dl passwd | awk '{print $1 " " $3 " " $4}'
-+      $ ls -dl passwd | awk '{print $1 " " $3 " " $4}' | sed 's/\\.//g'
-       > -rwsr-xr-x root root
-
-       $ rm passwd passwd.acl
-diff --git a/test/root/setfacl.test b/test/root/setfacl.test
-index a46a9f4..7efbad7 100644
---- a/test/root/setfacl.test
-+++ b/test/root/setfacl.test
-@@ -12,7 +12,7 @@ Cry immediately if we are not running as root.
-       $ sg bin
-       $ umask 027
-       $ touch g
--      $ ls -dl g | awk '{print $1}'
-+      $ ls -dl g | awk '{print $1}' | sed 's/\\.//g'
-       > -rw-r-----
-
-       $ setfacl -m m:- g
---
-1.9.1
-
(quoted diff) +0 -0

b/meta/recipes-support/attr/acl_2.2.52.bb

meta/recipes-support/attr/acl_2.2.52.bb line 8

Quoted 13 lines

deleted file mode 100644
index 6bc77d868d5..00000000000

meta/recipes-support/attr/acl_2.2.52.bb deleted +0 -8
@@ -1,52 +0,0 @@
-SUMMARY = "Utilities for managing POSIX Access Control Lists"
-HOMEPAGE = "http://savannah.nongnu.org/projects/acl/"
-SECTION = "libs"
-
-LICENSE = "LGPLv2.1+ & GPLv2+"
-LICENSE_${PN} = "GPLv2+"
-LICENSE_lib${BPN} = "LGPLv2.1+"
-LIC_FILES_CHKSUM =

"file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \

meta/recipes-support/attr/acl_2.2.52.bb line 9

Quoted 1 line
meta/recipes-support/attr/acl_2.2.52.bb deleted +0 -1
-

file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764"

meta/recipes-support/attr/acl_2.2.52.bb

Quoted 7 lines
meta/recipes-support/attr/acl_2.2.52.bb deleted +0 -7
-
-DEPENDS = "attr"
-
-SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.src.tar.gz \
-           file://configure.ac;subdir=${BP} \
-           file://run-ptest \
-           file://acl-fix-the-order-of-expected-output-of-getfacl.patch

\

meta/recipes-support/attr/acl_2.2.52.bb line 22

Quoted 2 lines
meta/recipes-support/attr/acl_2.2.52.bb deleted +0 -2
-           file://test-fix-insufficient-quoting-of.patch \
-

file://test-fixups-on-SELinux-machines-for-root-testcases.patch \

meta/recipes-support/attr/acl_2.2.52.bb

Quoted 6 lines
meta/recipes-support/attr/acl_2.2.52.bb deleted +0 -6
-           file://test-fix-directory-permissions.patch \
-           file://Makefile-libacl-should-depend-on-include.patch \
-"
-
-SRC_URI[md5sum] = "a61415312426e9c2212bd7dc7929abda"
-SRC_URI[sha256sum] =

"179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23"

meta/recipes-support/attr/acl_2.2.52.bb

Quoted 6 lines
meta/recipes-support/attr/acl_2.2.52.bb deleted +0 -6
-
-require ea-acl.inc
-
-# avoid RPATH hardcode to staging dir
-do_configure_append() {
-       sed -i ${S}/config.status -e

s,^\\\(hardcode_into_libs=\\\).*$,\\1\'no\',

Quoted 5 lines
meta/recipes-support/attr/acl_2.2.52.bb deleted +0 -5
-       ${S}/config.status
-}
-
-# libdir should point to .la
-do_install_append() {

meta/recipes-support/attr/acl_2.2.52.bb

Quoted 10 lines
meta/recipes-support/attr/acl_2.2.52.bb deleted +0 -10
-       sed -i ${D}${libdir}/libacl.la -e \
-           s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
-}
-
-inherit ptest
-
-PTEST_BUILD_HOST_FILES = "builddefs"
-PTEST_BUILD_HOST_PATTERN = "^RPM"
-do_install_ptest() {
-       tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf -

)

meta/recipes-support/attr/acl_2.2.52.bb line 47

Quoted 2 lines
meta/recipes-support/attr/acl_2.2.52.bb deleted +0 -2
-       install -d ${D}${PTEST_PATH}/include
-       install -m 644 ${S}/include/builddefs ${S}/include/buildmacros

${S}/include/buildrules ${D}${PTEST_PATH}/include/

meta/recipes-support/attr/acl_2.2.52.bb

Quoted 3 lines
meta/recipes-support/attr/acl_2.2.52.bb deleted +0 -3
-}
-
-RDEPENDS_${PN}-ptest = "acl bash coreutils perl perl-module-filehandle

perl-module-getopt-std perl-module-posix shadow"

Review

Quoted 3 lines
meta/recipes-support/attr/acl_2.2.52.bb deleted +0 -2
-
-BBCLASSEXTEND = "native nativesdk"
(quoted diff) +0 -0

b/meta/recipes-support/attr/acl_2.2.53.bb

meta/recipes-support/attr/acl_2.2.53.bb line 8

Quoted 13 lines

new file mode 100644
index 00000000000..c95e0524eb4

meta/recipes-support/attr/acl_2.2.53.bb new file +8 -0
@@ -0,0 +1,60 @@
+SUMMARY = "Utilities for managing POSIX Access Control Lists"
+HOMEPAGE = "http://savannah.nongnu.org/projects/acl/"
+SECTION = "libs"
+
+LICENSE = "LGPLv2.1+ & GPLv2+"
+LICENSE_${PN} = "GPLv2+"
+LICENSE_lib${BPN} = "LGPLv2.1+"
+LIC_FILES_CHKSUM =

"file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \

meta/recipes-support/attr/acl_2.2.53.bb line 9

Quoted 1 line
meta/recipes-support/attr/acl_2.2.53.bb new file +1 -0
+

file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764"

meta/recipes-support/attr/acl_2.2.53.bb line 18

Quoted 6 lines
meta/recipes-support/attr/acl_2.2.53.bb new file +6 -0
+
+DEPENDS = "attr"
+
+SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.tar.gz \
+           file://run-ptest \
+

file://0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch \

meta/recipes-support/attr/acl_2.2.53.bb

Quoted 5 lines
meta/recipes-support/attr/acl_2.2.53.bb new file +5 -0
+           file://0001-test-patch-out-failing-bits.patch \
+           "
+
+SRC_URI[md5sum] = "007aabf1dbb550bcddde52a244cd1070"
+SRC_URI[sha256sum] =

"06be9865c6f418d851ff4494e12406568353b891ffe1f596b34693c387af26c7"

Quoted 8 lines
meta/recipes-support/attr/acl_2.2.53.bb new file +8 -0
+
+inherit autotools gettext ptest
+
+PTEST_BUILD_HOST_FILES = "builddefs"
+PTEST_BUILD_HOST_PATTERN = "^RPM"
+
+do_compile_ptest() {
+        oe_runmake libtestlookup.la

meta/recipes-support/attr/acl_2.2.53.bb

Quoted 10 lines
meta/recipes-support/attr/acl_2.2.53.bb new file +10 -0
+}
+
+do_install_ptest() {
+       cp -rf ${S}/test/ ${D}${PTEST_PATH}
+       cp -rf ${S}/build-aux/ ${D}${PTEST_PATH}
+        mkdir -p ${D}${PTEST_PATH}/.libs
+       cp -rf ${B}/.libs/libtestlookup* ${D}${PTEST_PATH}/.libs
+        cp ${B}/Makefile ${D}${PTEST_PATH}
+        sed -i "s|^srcdir =.*|srcdir = \.|g" ${D}${PTEST_PATH}/Makefile
+        sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g"

${D}${PTEST_PATH}/Makefile

meta/recipes-support/attr/acl_2.2.53.bb line 39

Quoted 1 line
meta/recipes-support/attr/acl_2.2.53.bb new file +1 -0
+        sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g"

${D}${PTEST_PATH}/Makefile

Review

Quoted 22 lines
meta/recipes-support/attr/acl_2.2.53.bb new file +21 -0
+        sed -i "s|^Makefile:.*|Makefile:|g" ${D}${PTEST_PATH}/Makefile
+}
+
+RDEPENDS_${PN}-ptest = "acl \
+                        bash \
+                        coreutils \
+                        perl \
+                        perl-module-filehandle \
+                        perl-module-getopt-std \
+                        perl-module-posix \
+                        shadow \
+                        make \
+                        gawk \
+                        e2fsprogs-mke2fs \
+                        perl-module-cwd \
+                        perl-module-file-basename \
+                        perl-module-file-path \
+                        perl-module-file-spec \
+                       "
+
+BBCLASSEXTEND = "native nativesdk"
(quoted diff) +0 -0

b/meta/recipes-support/attr/attr.inc

meta/recipes-support/attr/attr.inc LICENSE = "LGPLv2.1+ & GPLv2+" · line 10

Quoted 7 lines

index 3503d66b9e1..5661301c15a 100644

meta/recipes-support/attr/attr.inc +0 -0
@@ -8,22 +8,14 @@ LICENSE = "LGPLv2.1+ & GPLv2+"
 LICENSE_${PN} = "GPLv2+"
 LICENSE_lib${BPN} = "LGPLv2.1+"
 LIC_FILES_CHKSUM =

"file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \

meta/recipes-support/attr/attr.inc LICENSE = "LGPLv2.1+ & GPLv2+" · line 11

Quoted 1 line
meta/recipes-support/attr/attr.inc +0 -1
-

file://attr/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \

meta/recipes-support/attr/attr.inc LICENSE = "LGPLv2.1+ & GPLv2+" · line 11

Quoted 1 line
meta/recipes-support/attr/attr.inc +1 -0
+

file://tools/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \

Quoted 1 line

file://libattr/libattr.c;endline=17;md5=7970f77049f8fa1199fff62a7ab724fb"

Quoted 20 lines
meta/recipes-support/attr/attr.inc +2 -10
-SRC_URI = "${SAVANNAH_GNU_MIRROR}/attr/${BP}.src.tar.gz \
+SRC_URI = "${SAVANNAH_GNU_MIRROR}/attr/${BP}.tar.gz \
            file://run-ptest \
 "
 
-require ea-acl.inc
-
-# libdir should point to .la
-do_install_append() {
-       sed -i ${D}${libdir}/libattr.la -e \
-           s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
-}
-
-inherit ptest update-alternatives
+inherit ptest update-alternatives autotools gettext
 
 ALTERNATIVE_PRIORITY = "100"
 ALTERNATIVE_${PN} = "setfattr"

meta/recipes-support/attr/attr.inc PTEST_BUILD_HOST_FILES = "builddefs" · line 36

Quoted 4 lines
meta/recipes-support/attr/attr.inc +0 -1
@@ -33,14 +25,27 @@ PTEST_BUILD_HOST_FILES = "builddefs"
 PTEST_BUILD_HOST_PATTERN = "^RPM"
 
 do_install_ptest() {
-       tar -c --exclude=ext test/ | ( cd ${D}${PTEST_PATH} && tar -xf -

)

meta/recipes-support/attr/attr.inc PTEST_BUILD_HOST_FILES = "builddefs"

Quoted 8 lines
meta/recipes-support/attr/attr.inc +3 -5
-       mkdir ${D}${PTEST_PATH}/include
-       for i in builddefs buildmacros buildrules; \
-         do cp ${S}/include/$i ${D}${PTEST_PATH}/include/; \
-       done
-       sed -e 's|; @echo|; echo|' -i ${D}${PTEST_PATH}/test/Makefile
+        cp ${B}/Makefile ${D}${PTEST_PATH}
+        sed -i "s|^srcdir =.*|srcdir = \.|g" ${D}${PTEST_PATH}/Makefile
+        sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g"

${D}${PTEST_PATH}/Makefile

meta/recipes-support/attr/attr.inc PTEST_BUILD_HOST_FILES = "builddefs" · line 31

Quoted 1 line
meta/recipes-support/attr/attr.inc +1 -0
+        sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g"

${D}${PTEST_PATH}/Makefile

meta/recipes-support/attr/attr.inc PTEST_BUILD_HOST_FILES = "builddefs"

Quoted 6 lines
meta/recipes-support/attr/attr.inc +3 -1
+        sed -i "s|^Makefile:.*|Makefile:|g" ${D}${PTEST_PATH}/Makefile
+       cp -rf ${S}/build-aux/ ${D}${PTEST_PATH}
+       cp -rf ${S}/test/ ${D}${PTEST_PATH}
 }
 
-RDEPENDS_${PN}-ptest = "attr coreutils perl-module-filehandle

perl-module-getopt-std perl-module-posix make perl"

Quoted 15 lines
meta/recipes-support/attr/attr.inc +13 -0
+RDEPENDS_${PN}-ptest = "attr \
+                        coreutils \
+                        perl-module-filehandle \
+                        perl-module-getopt-std \
+                        perl-module-posix \
+                        make \
+                        perl \
+                        gawk \
+                        perl-module-cwd \
+                        perl-module-file-basename \
+                        perl-module-file-path \
+                        perl-module-file-spec \
+                        "
 
 BBCLASSEXTEND = "native nativesdk"
Quoted 1 line

diff --git

a/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch b/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch

Quoted 3 lines

deleted file mode 100644
index dcd6507bcc5..00000000000
---

a/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch

Quoted 17 lines

+++ /dev/null

meta/recipes-support/attr/attr.inc +0 -15
@@ -1,69 +0,0 @@
-From 37a27b6fd09ecb37097b85e5db74e4f77b80fe0a Mon Sep 17 00:00:00 2001
-From: Felix Janda <[email protected]>
-Date: Tue, 12 Jan 2016 22:20:33 +0100
-Subject: [PATCH] Use stdint types consistently
-
----
-Upstream-Status: Backport
-Signed-off-by: Khem Raj <[email protected]>
-
- include/attributes.h | 6 ++++--
- man/man3/attr_list.3 | 8 ++++----
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-Index: attr-2.4.47/include/attributes.h
-===================================================================

meta/recipes-support/attr/attr.inc line 25

Quoted 10 lines
meta/recipes-support/attr/attr.inc +0 -10
---- attr-2.4.47.orig/include/attributes.h
-+++ attr-2.4.47/include/attributes.h
-@@ -22,6 +22,7 @@
- extern "C" {
- #endif
-
-+#include <stdint.h>
- /*
-  *    An almost-IRIX-compatible extended attributes API
-  *    (the IRIX attribute "list" operation is missing, added

ATTR_SECURE).

meta/recipes-support/attr/attr.inc line 30

Quoted 5 lines
meta/recipes-support/attr/attr.inc +0 -5
-@@ -69,7 +70,7 @@ typedef struct attrlist {
-  * al_offset[i] entry points to.
-  */
- typedef struct attrlist_ent { /* data from attr_list() */
--      u_int32_t       a_valuelen;     /* number bytes in value of attr

*/

meta/recipes-support/attr/attr.inc line 31

Quoted 1 line
meta/recipes-support/attr/attr.inc +0 -1
-+      uint32_t        a_valuelen;     /* number bytes in value of attr

*/

Quoted 38 lines
meta/recipes-support/attr/attr.inc +0 -38
-       char            a_name[1];      /* attr name (NULL terminated) */
- } attrlist_ent_t;
-
-@@ -90,7 +91,7 @@ typedef struct attrlist_ent {        /* data fr
-  * operation on a cursor is to bzero() it.
-  */
- typedef struct attrlist_cursor {
--      u_int32_t       opaque[4];      /* an opaque cookie */
-+      uint32_t        opaque[4];      /* an opaque cookie */
- } attrlist_cursor_t;
-
- /*
-Index: attr-2.4.47/man/man3/attr_list.3
-===================================================================
---- attr-2.4.47.orig/man/man3/attr_list.3
-+++ attr-2.4.47/man/man3/attr_list.3
-@@ -72,9 +72,9 @@ The contents of an \f4attrlist_t\fP stru
- .nf
- .ft 4
- .ta 9n 22n
--__int32_t al_count; /\(** number of entries in attrlist \(**/
--__int32_t al_more; /\(** T/F: more attrs (do syscall again) \(**/
--__int32_t al_offset[1]; /\(** byte offsets of attrs [var-sized] \(**/
-+int32_t al_count; /\(** number of entries in attrlist \(**/
-+int32_t al_more; /\(** T/F: more attrs (do syscall again) \(**/
-+int32_t al_offset[1]; /\(** byte offsets of attrs [var-sized] \(**/
- .ft 1
- .fi
- .RE
-@@ -113,7 +113,7 @@ include the following members:
- .nf
- .ft 4
- .ta 9n 22n
--u_int32_t a_valuelen; /\(** number bytes in value of attr \(**/
-+uint32_t a_valuelen; /\(** number bytes in value of attr \(**/
- char a_name[]; /\(** attr name (NULL terminated) \(**/
- .ft 1
- .fi
Quoted 1 line

diff --git

a/meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch b/meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch

Quoted 13 lines

deleted file mode 100644
index 20fcc3cee7b..00000000000

meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch deleted +0 -8
@@ -1,63 +0,0 @@
-Subject: [PATCH] attr: Missing configure.ac
-
-Upstream-Status: Backport [Upstream released tarball missing this file]
-Signed-off-by: Nathan Rossi <[email protected]>
----
- configure.ac |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 48 insertions(+)
- create mode 100644 configure.ac

meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch line 18

Quoted 10 lines
meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch deleted +0 -10
-
-diff --git a/configure.ac b/configure.ac
-new file mode 100644
-index 0000000..b966d0e
---- /dev/null
-+++ b/configure.ac
-@@ -0,0 +1,48 @@
-+# Copyright (C) 2009  Andreas Gruenbacher <[email protected]>
-+#
-+# This program is free software: you can redistribute it and/or modify

it

Quoted 15 lines
meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch deleted +0 -11
-+# under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/

.
-+#
-+AC_INIT(include/attributes.h)
-+AC_CONFIG_AUX_DIR([.])

Quoted 8 lines

-+AC_CONFIG_MACRO_DIR([m4]) -+AC_CONFIG_HEADER(include/config.h) -+AC_PREFIX_DEFAULT(/usr)
-+
-+AC_PROG_LIBTOOL
-+
-+AC_ARG_ENABLE(shared,
-+[ --enable-shared=[yes/no] Enable use of shared libraries

[default=yes]],,

Quoted 5 lines

-+ enable_shared=yes)
-+AC_SUBST(enable_shared)
-+
-+AC_ARG_ENABLE(gettext,
-+[ --enable-gettext=[yes/no] Enable alternate language support

[default=yes]],,

Quoted 18 lines

-+ enable_gettext=yes)
-+AC_SUBST(enable_gettext)
-+
-+AC_ARG_ENABLE(lib64,
-+[ --enable-lib64=[yes/no] Enable lib64 support [default=no]],,
-+ enable_lib64=no)
-+AC_SUBST(enable_lib64)
-+
-+AC_PACKAGE_GLOBALS(attr) -+AC_PACKAGE_UTILITIES(attr)
-+AC_MANUAL_FORMAT
-+AC_MULTILIB($enable_lib64)
-+
-+AC_C_CONST
-+AC_TYPE_MODE_T
-+AC_FUNC_ALLOCA
-+
-+AC_OUTPUT(include/builddefs)

Review

Quoted 1 line
(quoted diff) +0 -0

b/meta/recipes-support/attr/attr/dont-use-decl-macros.patch

meta/recipes-support/attr/attr/dont-use-decl-macros.patch line 2

Quoted 7 lines

deleted file mode 100644
index 9d4b8929e89..00000000000

meta/recipes-support/attr/attr/dont-use-decl-macros.patch deleted +0 -2
@@ -1,56 +0,0 @@
-Use extern "C" instead of __BEGIN_DECL/__END_DECL macros
-these macros are defined in sys/cdefs.h for glibc and this header is

not available on all libc

Quoted 10 lines
meta/recipes-support/attr/attr/dont-use-decl-macros.patch deleted +0 -10
-
-anyway they defined like below
-
-#ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
-#else
-# define __BEGIN_DECLS /* empty */
-# define __END_DECLS /* empty */
-#endif

meta/recipes-support/attr/attr/dont-use-decl-macros.patch

Quoted 10 lines
meta/recipes-support/attr/attr/dont-use-decl-macros.patch deleted +0 -10
-
-__THROW macro is also not available on musl, defined thusly
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
-
-Index: attr-2.4.47/include/xattr.h
-===================================================================
---- attr-2.4.47.orig/include/xattr.h   2014-04-02 00:01:30.252091280

-0700

meta/recipes-support/attr/attr/dont-use-decl-macros.patch line 23

Quoted 1 line
meta/recipes-support/attr/attr/dont-use-decl-macros.patch deleted +0 -1
-+++ attr-2.4.47/include/xattr.h        2014-04-02 00:12:57.985428099

-0700

meta/recipes-support/attr/attr/dont-use-decl-macros.patch line 25

Quoted 2 lines
meta/recipes-support/attr/attr/dont-use-decl-macros.patch deleted +0 -2
-@@ -30,8 +30,20 @@
- #define XATTR_CREATE  0x1       /* set value, fail if attr already

exists */

meta/recipes-support/attr/attr/dont-use-decl-macros.patch line 26

Quoted 1 line
meta/recipes-support/attr/attr/dont-use-decl-macros.patch deleted +0 -1
- #define XATTR_REPLACE 0x2       /* set value, fail if attr does not

exist */

Quoted 10 lines
meta/recipes-support/attr/attr/dont-use-decl-macros.patch deleted +0 -10
-
--
--__BEGIN_DECLS
-+#ifndef __THROW
-+# ifndef __GNUC_PREREQ
-+#  define __GNUC_PREREQ(maj, min) (0)
-+# endif
-+# if defined __cplusplus && __GNUC_PREREQ (2,8)
-+#  define __THROW       throw ()
-+# else

meta/recipes-support/attr/attr/dont-use-decl-macros.patch

Quoted 10 lines
meta/recipes-support/attr/attr/dont-use-decl-macros.patch deleted +0 -10
-+#  define __THROW
-+# endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- extern int setxattr (const char *__path, const char *__name,
-                     const void *__value, size_t __size, int __flags)

__THROW;

meta/recipes-support/attr/attr/dont-use-decl-macros.patch line 48

Quoted 2 lines
meta/recipes-support/attr/attr/dont-use-decl-macros.patch deleted +0 -2
-@@ -58,6 +70,8 @@
- extern int lremovexattr (const char *__path, const char *__name)

__THROW;

Review

Quoted 9 lines
meta/recipes-support/attr/attr/dont-use-decl-macros.patch deleted +0 -8
- extern int fremovexattr (int __filedes,   const char *__name) __THROW;
-
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif        /* __XATTR_H__ */
(quoted diff) +0 -0

b/meta/recipes-support/attr/attr/run-ptest

Review

Quoted 9 lines

new file mode 100644
index 00000000000..f64244f2393

meta/recipes-support/attr/attr/run-ptest new file +3 -0
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+make test-suite.log
(quoted diff) +0 -0

b/meta/recipes-support/attr/attr_2.4.47.bb

meta/recipes-support/attr/attr_2.4.47.bb line 3

Quoted 8 lines

deleted file mode 100644
index fc88bef830b..00000000000

meta/recipes-support/attr/attr_2.4.47.bb deleted +0 -3
@@ -1,15 +0,0 @@
-require attr.inc
-
-# configure.ac was missing from the release tarball. This should be

fixed in

meta/recipes-support/attr/attr_2.4.47.bb

Quoted 10 lines
meta/recipes-support/attr/attr_2.4.47.bb deleted +0 -10
-# future releases of attr, remove this when updating the recipe.
-SRC_URI += "file://attr-Missing-configure.ac.patch \
-            file://dont-use-decl-macros.patch \
-            file://Remove-the-section-2-man-pages.patch \
-            file://Remove-the-attr.5-man-page-moved-to-man-pages.patch \
-            file://0001-Use-stdint-types-consistently.patch \
-           "
-
-SRC_URI[md5sum] = "84f58dec00b60f2dc8fd1c9709291cc7"
-SRC_URI[sha256sum] =

"25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859"

Review

Quoted 3 lines
meta/recipes-support/attr/attr_2.4.47.bb deleted +0 -2
-
-BBCLASSEXTEND = "native nativesdk"
(quoted diff) +0 -0

b/meta/recipes-support/attr/attr_2.4.48.bb

meta/recipes-support/attr/attr_2.4.48.bb line 4

Quoted 9 lines

new file mode 100644
index 00000000000..530d4e48833

meta/recipes-support/attr/attr_2.4.48.bb new file +4 -0
@@ -0,0 +1,6 @@
+require attr.inc
+
+SRC_URI[md5sum] = "bc1e5cb5c96d99b24886f1f527d3bb3d"
+SRC_URI[sha256sum] =

"5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7"

Review

Quoted 3 lines
meta/recipes-support/attr/attr_2.4.48.bb new file +2 -0
+
+BBCLASSEXTEND = "native nativesdk"
(quoted diff) +0 -0

b/meta/recipes-support/attr/ea-acl.inc

meta/recipes-support/attr/ea-acl.inc line 5

Quoted 10 lines

deleted file mode 100644
index 9336ffc9389..00000000000

meta/recipes-support/attr/ea-acl.inc deleted +0 -5
@@ -1,52 +0,0 @@
-# this build system is mostly shared by attr and acl
-
-SRC_URI += "file://relative-libdir.patch;striplevel=0 \
-           "
-# This patch should be applied after

'(attr\|acl)-Missing-configure.ac.patch'

meta/recipes-support/attr/ea-acl.inc line 6

Quoted 1 line
meta/recipes-support/attr/ea-acl.inc deleted +0 -1
-SRC_URI_append = "

file://0001-Added-configure-option-to-enable-disable-static-libr.patch"

meta/recipes-support/attr/ea-acl.inc

Quoted 12 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -12
-
-inherit autotools-brokensep gettext
-
-# When upstream is using automake properly, this can be removed
-CLEANBROKEN = "1"
-
-# the package comes with a custom config.h.in, it cannot be
-# overwritten by autoheader
-EXTRA_AUTORECONF += "--exclude=autoheader"
-EXTRA_OECONF = "INSTALL_USER=root INSTALL_GROUP=root"
-EXTRA_OECONF_append_class-native = " --enable-gettext=no"
-EXTRA_OECONF_append_class-target = "${@['', ' --disable-gettext

'][(d.getVar('USE_NLS') == 'no')]}"

meta/recipes-support/attr/ea-acl.inc

Quoted 5 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -5
-
-EXTRA_OEMAKE = "PKG_LIB_DIR=${base_libdir} PKG_DEVLIB_DIR=${libdir}"
-
-do_install () {
-       oe_runmake install install-lib install-dev DIST_ROOT="${D}"

ZIP="gzip -n"

meta/recipes-support/attr/ea-acl.inc

Quoted 7 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -7
-}
-
-do_install_append_class-native () {
-       if test "${libdir}" = "${base_libdir}" ; then
-               return
-       fi
-       librelpath=${@os.path.relpath(d.getVar('libdir'),

d.getVar('base_libdir'))}

meta/recipes-support/attr/ea-acl.inc line 31

Quoted 1 line
meta/recipes-support/attr/ea-acl.inc deleted +0 -1
-       baselibrelpath=${@os.path.relpath(d.getVar('base_libdir'),

d.getVar('libdir'))}

meta/recipes-support/attr/ea-acl.inc

Quoted 5 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -5
-
-       # Remove bad symlinks & create the correct symlinks
-       if test -L ${D}${libdir}/lib${BPN}.so ; then
-               rm -rf ${D}${libdir}/lib${BPN}.so
-               ln -sf $baselibrelpath/lib${BPN}.so

${D}${libdir}/lib${BPN}.so

meta/recipes-support/attr/ea-acl.inc

Quoted 4 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -4
-       fi
-       if test -L ${D}${base_libdir}/lib${BPN}.a ; then
-               rm -rf ${D}${base_libdir}/lib${BPN}.a
-               ln -sf $librelpath/lib${BPN}.a

${D}${base_libdir}/lib${BPN}.a

meta/recipes-support/attr/ea-acl.inc

Quoted 4 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -4
-       fi
-       if test -L  ${D}${base_libdir}/lib${BPN}.la ; then
-               rm -rf ${D}${base_libdir}/lib${BPN}.la
-               ln -sf $librelpath/lib${BPN}.la

${D}${base_libdir}/lib${BPN}.la

Quoted 9 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -8
-       fi
-}
-
-PACKAGES =+ "lib${BPN}"
-
-FILES_lib${BPN} = "${base_libdir}/lib*${SOLIBS}"
-
-BBCLASSEXTEND = "native"

diff --git

a/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch b/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch

Quoted 3 lines

deleted file mode 100644
index 1c1159f2c90..00000000000
---

a/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch

Quoted 18 lines

+++ /dev/null

meta/recipes-support/attr/ea-acl.inc deleted +0 -16
@@ -1,70 +0,0 @@
-From 01256c61ba126449c46dd4ab5d5e145488b981fa Mon Sep 17 00:00:00 2001
-From: Amarnath Valluri <[email protected]>
-Date: Mon, 23 Jan 2017 13:25:13 +0200
-Subject: [PATCH] Added configure option to enable/disable static library
-
-Create static library archive only in case of --enable-static.
-
-Upstream-Status: Pending
-
-Signed-off-by: Amarnath Valluri <[email protected]>
----
- configure.ac         | 6 ++++++
- include/builddefs.in | 1 +
- include/buildmacros  | 3 +++
- 3 files changed, 10 insertions(+)
-

meta/recipes-support/attr/ea-acl.inc line 26

Quoted 10 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -10
-diff --git a/configure.ac b/configure.ac
-index b966d0e..e48268b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -26,6 +26,12 @@ AC_ARG_ENABLE(shared,
-       enable_shared=yes)
- AC_SUBST(enable_shared)
-
-+AC_ARG_ENABLE(static,
-+[ --enable-static=[yes/no] Enable use of static libraries

[default=yes]],,

meta/recipes-support/attr/ea-acl.inc line 32

Quoted 6 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -6
-+      enable_static=yes)
-+AC_SUBST(enable_static)
-+
-+
- AC_ARG_ENABLE(gettext,
- [ --enable-gettext=[yes/no] Enable alternate language support

[default=yes]],,

Quoted 15 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -15
-       enable_gettext=yes)
-diff --git a/include/builddefs.in b/include/builddefs.in
-index d9931db..3b3dbd2 100644
---- a/include/builddefs.in
-+++ b/include/builddefs.in
-@@ -71,6 +71,7 @@ RPMBUILD     = @rpmbuild@
- RPM_VERSION   = @rpm_version@
-
- ENABLE_SHARED = @enable_shared@
-+ENABLE_STATIC         = @enable_static@
- ENABLE_GETTEXT        = @enable_gettext@
-
- HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@
-diff --git a/include/buildmacros b/include/buildmacros
-index 39fa7e2..b0f25c5 100644

meta/recipes-support/attr/ea-acl.inc line 57

Quoted 10 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -10
---- a/include/buildmacros
-+++ b/include/buildmacros
-@@ -80,6 +80,7 @@ endif
- # /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB_DEV = \
-+      set -x; \
-       cd $(TOPDIR)/$(LIBNAME)/.libs; \
-       ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
-       ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai

$(PKG_DEVLIB_DIR); \

meta/recipes-support/attr/ea-acl.inc line 61

Quoted 4 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -4
-@@ -88,7 +89,9 @@ INSTALL_LTLIB_DEV = \
-       ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
-       if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
-       rel_lib_prefix=$$(echo $(PKG_LIB_DIR) | sed

's,\(^/\|\)[^/][^/]*,..,g'); \

meta/recipes-support/attr/ea-acl.inc line 63

Quoted 2 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -2
-+      if test "$(ENABLE_STATIC)" = "yes" ; then \
-       ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).a

$(PKG_LIB_DIR)/$(LIBNAME).a; \

meta/recipes-support/attr/ea-acl.inc line 65

Quoted 2 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -2
-+      fi ;\
-       ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).la

$(PKG_LIB_DIR)/$(LIBNAME).la; \

meta/recipes-support/attr/ea-acl.inc line 66

Quoted 1 line
meta/recipes-support/attr/ea-acl.inc deleted +0 -1
-       rel_devlib_prefix=$$(echo $(PKG_DEVLIB_DIR) | sed

's,\(^/\|\)[^/][^/]*,..,g'); \

meta/recipes-support/attr/ea-acl.inc line 67

Quoted 1 line
meta/recipes-support/attr/ea-acl.inc deleted +0 -1
-       ../$(INSTALL) -S $$rel_devlib_prefix$(PKG_LIB_DIR)/$(LIBNAME).so

$(PKG_DEVLIB_DIR)/$(LIBNAME).so; \

Quoted 4 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -3
---
-2.7.4
-

diff --git

a/meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch b/meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch

Quoted 3 lines

deleted file mode 100644
index d5ab83d7c68..00000000000
---

a/meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch

meta/recipes-support/attr/ea-acl.inc line 9

Quoted 11 lines

+++ /dev/null

meta/recipes-support/attr/ea-acl.inc deleted +0 -9
@@ -1,240 +0,0 @@
-From 6047c8522b91235ad1e835f44f5e36472d9d49b2 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <[email protected]>
-Date: Wed, 22 Apr 2015 11:46:59 +0200
-Subject: [PATCH 2/2] Remove the attr.5 man page (moved to man-pages)
-
-Commit dce9b4448c7f2b22bd206cd068fb05cb2f3255b9 from
-https://git.savannah.nongnu.org/git/attr.git
-
-The attr.5 page is part of the extended attribute system call

documentation,

meta/recipes-support/attr/ea-acl.inc line 10

Quoted 1 line
meta/recipes-support/attr/ea-acl.inc deleted +0 -1
-which has been moved into the man-pages package. Move the attr.5 page

there

meta/recipes-support/attr/ea-acl.inc line 20

Quoted 10 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -10
-as well.
-
-Upstream-Status: Backport
-
-[MA: updated to apply directly to v2.4.47]
-Signed-off-by: Mark Asselstine <[email protected]>
----
- man/Makefile      |   2 +-
- man/man5/Makefile |  35 -------------
- man/man5/attr.5   | 153

------------------------------------------------------

Quoted 18 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -18
- 3 files changed, 1 insertion(+), 189 deletions(-)
- delete mode 100644 man/man5/Makefile
- delete mode 100644 man/man5/attr.5
-
-diff --git a/man/Makefile b/man/Makefile
-index 755daed..9301f09 100644
---- a/man/Makefile
-+++ b/man/Makefile
-@@ -19,7 +19,7 @@
- TOPDIR = ..
- include $(TOPDIR)/include/builddefs
-
--SUBDIRS = man1 man3 man5
-+SUBDIRS = man1 man3
-
- default : $(SUBDIRS)
-
-diff --git a/man/man5/Makefile b/man/man5/Makefile

meta/recipes-support/attr/ea-acl.inc line 48

Quoted 10 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -10
-deleted file mode 100644
-index 6b70d3d..0000000
---- a/man/man5/Makefile
-+++ /dev/null
-@@ -1,35 +0,0 @@
--#
--# Copyright (c) 2000, 2002 Silicon Graphics, Inc.  All Rights Reserved.
--# Copyright (C) 2009  Andreas Gruenbacher <[email protected]>
--#
--# This program is free software: you can redistribute it and/or modify

it

Quoted 31 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -11
--# under the terms of the GNU General Public License as published by
--# the Free Software Foundation, either version 2 of the License, or
--# (at your option) any later version.
--#
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program.  If not, see <http://www.gnu.org/licenses/

.
--#
--
--TOPDIR = ../..
--include $(TOPDIR)/include/builddefs
--
--MAN_SECTION = 5
--

--MAN_PAGES     = $(shell echo *.$(MAN_SECTION))
--MAN_DEST      = $(PKG_MAN_DIR)/man$(MAN_SECTION)
--LSRCFILES     = $(MAN_PAGES)

--
--default : $(MAN_PAGES)
--
--include $(BUILDRULES)
--
--install : default
-- $(INSTALL) -m 755 -d $(MAN_DEST)
-- $(INSTALL_MAN)
--install-dev install-lib:

meta/recipes-support/attr/ea-acl.inc

Quoted 9 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -9
-diff --git a/man/man5/attr.5 b/man/man5/attr.5
-deleted file mode 100644
-index a02757d..0000000
---- a/man/man5/attr.5
-+++ /dev/null
-@@ -1,153 +0,0 @@
--.\" Extended attributes manual page
--.\"
--.\" Copyright (C) 2000, 2002, 2007  Andreas Gruenbacher <

[email protected]>

Quoted 31 lines

--.\" Copyright (C) 2001, 2002, 2004, 2007 Silicon Graphics, Inc. --.\" All rights reserved.
--.\"
--.\" This is free documentation; you can redistribute it and/or --.\" modify it under the terms of the GNU General Public License as --.\" published by the Free Software Foundation; either version 2 of --.\" the License, or (at your option) any later version. --.\"
--.\" The GNU General Public License's references to "object code" --.\" and "executables" are to be interpreted as the output of any --.\" document formatting or typesetting system, including --.\" intermediate and printed output.
--.\"
--.\" This manual is distributed in the hope that it will be useful, --.\" but WITHOUT ANY WARRANTY; without even the implied warranty of --.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --.\" GNU General Public License for more details.
--.\"
--.\" You should have received a copy of the GNU General Public --.\" License along with this manual. If not, see
--.\" <http://www.gnu.org/licenses/>.
--.\"
--.TH ATTR 5
--.SH NAME
--attr - Extended attributes
--.SH DESCRIPTION
--Extended attributes are name:value pairs associated permanently with --files and directories, similar to the environment strings associated --with a process.
--An attribute may be defined or undefined.
--If it is defined, its value may be empty or non-empty.

Quoted 8 lines

--.PP
--Extended attributes are extensions to the normal attributes which are --associated with all inodes in the system (i.e. the
--.BR stat (2)
--data).
--They are often used to provide additional functionality --to a filesystem \- for example, additional security features such as --Access Control Lists (ACLs) may be implemented using extended

attributes.

Quoted 6 lines

--.PP
--Users with search access to a file or directory may retrieve a list of --attribute names defined for that file or directory.
--.PP
--Extended attributes are accessed as atomic objects. --Reading retrieves the whole value of an attribute and stores it in a

buffer.

Quoted 3 lines

--Writing replaces any previous value with the new value. --.PP
--Space consumed for extended attributes is counted towards the disk

quotas

Quoted 3 lines

--of the file owner and file group.
--.PP
--Currently, support for extended attributes is implemented on Linux by

the

Quoted 30 lines

--ext2, ext3, ext4, XFS, JFS and reiserfs filesystems.
--.SH EXTENDED ATTRIBUTE NAMESPACES
--Attribute names are zero-terminated strings.
--The attribute name is always specified in the fully qualified --.IR namespace.attribute
--form, eg.
--.IR user.mime_type ,
--.IR trusted.md5sum ,
--.IR system.posix_acl_access ,
--or
--.IR security.selinux .
--.PP
--The namespace mechanism is used to define different classes of extended --attributes.
--These different classes exist for several reasons, e.g. the permissions --and capabilities required for manipulating extended attributes of one --namespace may differ to another.
--.PP
--Currently the
--.IR security ,
--.IR system ,
--.IR trusted ,
--and
--.IR user
--extended attribute classes are defined as described below. Additional --classes may be added in the future.
--.SS Extended security attributes
--The security attribute namespace is used by kernel security modules, --such as Security Enhanced Linux.
--Read and write access permissions to security attributes depend on the

Quoted 8 lines

--policy implemented for each security attribute by the security module. --When no security module is loaded, all processes have read access to --extended security attributes, and write access is limited to processes --that have the CAP_SYS_ADMIN capability.
--.SS Extended system attributes
--Extended system attributes are used by the kernel to store system --objects such as Access Control Lists and Capabilities. Read and write --access permissions to system attributes depend on the policy

implemented

Quoted 3 lines

--for each system attribute implemented by filesystems in the kernel. --.SS Trusted extended attributes
--Trusted extended attributes are visible and accessible only to

processes that

Quoted 4 lines

--have the CAP_SYS_ADMIN capability (the super user usually has this --capability).
--Attributes in this class are used to implement mechanisms in user --space (i.e., outside the kernel) which keep information in extended

attributes

Quoted 11 lines

--to which ordinary processes should not have access.
--.SS Extended user attributes
--Extended user attributes may be assigned to files and directories for --storing arbitrary additional information such as the mime type, --character set or encoding of a file. The access permissions for user --attributes are defined by the file permission bits.
--.PP
--The file permission bits of regular files and directories are --interpreted differently from the file permission bits of special files --and symbolic links. For regular files and directories the file --permission bits define access to the file's contents, while for device

special

Quoted 3 lines

--files they define access to the device described by the special file. --The file permissions of symbolic links are not used in access --checks. These differences would allow users to consume filesystem

resources in

Quoted 1 line

--a way not controllable by disk quotas for group or world writable

special files and directories.

Quoted 2 lines

--.PP
--For this reason, extended user attributes are only allowed for regular

files and directories, and access to extended user attributes is restricted to the

Quoted 1 line

--owner and to users with appropriate capabilities for directories with

the

Quoted 17 lines

--sticky bit set (see the
--.BR chmod (1)
--manual page for an explanation of Sticky Directories). --.SH FILESYSTEM DIFFERENCES
--The kernel and the filesystem may place limits on the maximum number --and size of extended attributes that can be associated with a file. --Some file systems, such as ext2/3 and reiserfs, require the filesystem --to be mounted with the
--.B user_xattr
--mount option in order for extended user attributes to be used. --.PP
--In the current ext2, ext3 and ext4 filesystem implementations, each --extended attribute must fit on a single filesystem block (1024, 2048 --or 4096 bytes, depending on the block size specified when the --filesystem was created).
--.PP
--In the XFS and reiserfs filesystem implementations, there is no

Quoted 8 lines

--practical limit on the number or size of extended attributes --associated with a file, and the algorithms used to store extended --attribute information on disk are scalable.
--.PP
--In the JFS filesystem implementation, names can be up to 255 bytes and --values up to 65,535 bytes.
--.SH ADDITIONAL NOTES
--Since the filesystems on which extended attributes are stored might

also

Quoted 7 lines

--be used on architectures with a different byte order and machine word --size, care should be taken to store attribute values in an architecture --independent format.
--.SH AUTHORS
--Andreas Gruenbacher,
--.RI < [email protected] >
--and the SGI XFS development team,

Quoted 8 lines

--.RI < [email protected] >.
--.SH SEE ALSO
--getfattr(1),
--setfattr(1).
---
-2.7.4
-
diff --git

a/meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch b/meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch

Quoted 3 lines

deleted file mode 100644
index 044c5a037c8..00000000000
---

a/meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch

meta/recipes-support/attr/ea-acl.inc line 9

Quoted 11 lines

+++ /dev/null

meta/recipes-support/attr/ea-acl.inc deleted +0 -9
@@ -1,666 +0,0 @@
-From b972600a26f3a930e53e2fce2625266a5d29813e Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <[email protected]>
-Date: Tue, 14 Apr 2015 23:53:11 +0200
-Subject: [PATCH 1/2] Remove the section 2 man pages
-
-Commit 8d1263bca95722d66a6f8e83450f49d0956ea534 from upstream
-https://git.savannah.nongnu.org/git/attr.git/
-
-The section 2 man pages have long since been added to the man-pages

package

meta/recipes-support/attr/ea-acl.inc line 10

Quoted 1 line
meta/recipes-support/attr/ea-acl.inc deleted +0 -1
-which documents all system calls; they were disabled in attr by default

since

meta/recipes-support/attr/ea-acl.inc line 20

Quoted 10 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -10
-January 2014.  Get rid of them here.
-
-Upstream-Status: Backport
-
-[MA: modified to apply directly to v2.4.47]
-Signed-off-by: Mark Asselstine <[email protected]>
----
- man/Makefile           |   2 +-
- man/man2/Makefile      |  35 -----------
- man/man2/getxattr.2    | 143

--------------------------------------------

meta/recipes-support/attr/ea-acl.inc line 21

Quoted 1 line
meta/recipes-support/attr/ea-acl.inc deleted +0 -1
- man/man2/listxattr.2   | 158

-------------------------------------------------

meta/recipes-support/attr/ea-acl.inc line 23

Quoted 2 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -2
- man/man2/removexattr.2 | 111 ----------------------------------
- man/man2/setxattr.2    | 143

--------------------------------------------

Quoted 21 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -21
- 6 files changed, 1 insertion(+), 591 deletions(-)
- delete mode 100644 man/man2/Makefile
- delete mode 100644 man/man2/getxattr.2
- delete mode 100644 man/man2/listxattr.2
- delete mode 100644 man/man2/removexattr.2
- delete mode 100644 man/man2/setxattr.2
-
-diff --git a/man/Makefile b/man/Makefile
-index 9535426..755daed 100644
---- a/man/Makefile
-+++ b/man/Makefile
-@@ -19,7 +19,7 @@
- TOPDIR = ..
- include $(TOPDIR)/include/builddefs
-
--SUBDIRS = man1 man2 man3 man5
-+SUBDIRS = man1 man3 man5
-
- default : $(SUBDIRS)
-
-diff --git a/man/man2/Makefile b/man/man2/Makefile

meta/recipes-support/attr/ea-acl.inc line 54

Quoted 10 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -10
-deleted file mode 100644
-index d77309d..0000000
---- a/man/man2/Makefile
-+++ /dev/null
-@@ -1,35 +0,0 @@
--#
--# Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
--# Copyright (C) 2009  Andreas Gruenbacher <[email protected]>
--#
--# This program is free software: you can redistribute it and/or modify

it

Quoted 148 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -11
--# under the terms of the GNU General Public License as published by
--# the Free Software Foundation, either version 2 of the License, or
--# (at your option) any later version.
--#
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program.  If not, see <http://www.gnu.org/licenses/

.
--#
--
--TOPDIR = ../..
--include $(TOPDIR)/include/builddefs
--
--MAN_SECTION = 2
--

--MAN_PAGES     = $(shell echo *.$(MAN_SECTION))
--MAN_DEST      = $(PKG_MAN_DIR)/man$(MAN_SECTION)
--LSRCFILES     = $(MAN_PAGES)

--
--default install : $(MAN_PAGES)
--
--include $(BUILDRULES)
--
--install-dev : default
-- $(INSTALL) -m 755 -d $(MAN_DEST)
-- $(INSTALL_MAN)
--install-lib:

meta/recipes-support/attr/ea-acl.inc deleted +0 -117
-diff --git a/man/man2/getxattr.2 b/man/man2/getxattr.2
-deleted file mode 100644
-index 405ad89..0000000
---- a/man/man2/getxattr.2
-+++ /dev/null
-@@ -1,143 +0,0 @@
--.\"
--.\" Extended attributes system calls manual pages
--.\"
--.\" (C) Andreas Gruenbacher, February 2001
--.\" (C) Silicon Graphics Inc, September 2001
--.\"
--.\" This is free documentation; you can redistribute it and/or
--.\" modify it under the terms of the GNU General Public License as
--.\" published by the Free Software Foundation; either version 2 of
--.\" the License, or (at your option) any later version.
--.\"
--.\" The GNU General Public License's references to "object code"
--.\" and "executables" are to be interpreted as the output of any
--.\" document formatting or typesetting system, including
--.\" intermediate and printed output.
--.\"
--.\" This manual is distributed in the hope that it will be useful,
--.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
--.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--.\" GNU General Public License for more details.
--.\"
--.\" You should have received a copy of the GNU General Public
--.\" License along with this manual.  If not, see
--.\" <http://www.gnu.org/licenses/>.
--.\"
--.TH GETXATTR 2 "Extended Attributes" "Dec 2001" "System calls"
--.SH NAME
--getxattr, lgetxattr, fgetxattr \- retrieve an extended attribute value
--.SH SYNOPSIS
--.fam C
--.nf
--.B #include <sys/types.h>
--.B #include <attr/xattr.h>
--.sp
--.BI "ssize_t getxattr (const char\ *" path ", const char\ *" name ",
--.BI "\t\t\t\t void\ *" value ", size_t " size );
--.BI "ssize_t lgetxattr (const char\ *" path ", const char\ *" name ",
--.BI "\t\t\t\t void\ *" value ", size_t " size );
--.BI "ssize_t fgetxattr (int " filedes ", const char\ *" name ",
--.BI "\t\t\t\t void\ *" value ", size_t " size );
--.fi
--.fam T
--.SH DESCRIPTION
--Extended attributes are
--.IR name :\c
--.I value
--pairs associated with inodes (files, directories, symlinks, etc).
--They are extensions to the normal attributes which are associated
--with all inodes in the system (i.e. the
--.BR stat (2)
--data).
--A complete overview of extended attributes concepts can be found in
--.BR attr (5).
--.PP
--.B getxattr
--retrieves the
--.I value
--of the extended attribute identified by
--.I name
--and associated with the given
--.I path
--in the filesystem.
--The length of the attribute
--.I value
--is returned.
--.PP
--.B lgetxattr
--is identical to
--.BR getxattr ,
--except in the case of a symbolic link, where the link itself is
--interrogated, not the file that it refers to.
--.PP
--.B fgetxattr
--is identical to
--.BR getxattr ,
--only the open file pointed to by
--.I filedes
--(as returned by
--.BR open (2))
--is interrogated in place of
--.IR path .
--.PP
--An extended attribute
--.I name
--is a simple NULL-terminated string.
--The name includes a namespace prefix \- there may be several, disjoint
--namespaces associated with an individual inode.
--The value of an extended attribute is a chunk of arbitrary textual or
--binary data of specified length.
--.PP
--An empty buffer of
--.I size
--zero can be passed into these calls to return the current size of the
--named extended attribute, which can be used to estimate the size of a
--buffer which is sufficiently large to hold the value associated with
--the extended attribute.
--.PP
--The interface is designed to allow guessing of initial buffer
--sizes, and to enlarge buffers when the return value indicates
--that the buffer provided was too small.
--.SH RETURN VALUE
--On success, a positive number is returned indicating the size of the
--extended attribute value.
--On failure, \-1 is returned and
--.I errno
--is set appropriately.
--.PP
--If the named attribute does not exist, or the process has no access to
--this attribute,
--.I errno
--is set to ENOATTR.

meta/recipes-support/attr/ea-acl.inc

Quoted 10 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -10
--.PP
--If the
--.I size
--of the
--.I value
--buffer is too small to hold the result,
--.I errno
--is set to ERANGE.
--.PP
--If extended attributes are not supported by the filesystem, or are

disabled,

Quoted 154 lines

--.I errno
--is set to ENOTSUP.
--.PP
--The errors documented for the
--.BR stat (2)
--system call are also applicable here.
--.SH AUTHORS
--Andreas Gruenbacher,
--.RI < [email protected] >
--and the SGI XFS development team,
--.RI < [email protected] >.
--Please send any bug reports or comments to these addresses. --.SH SEE ALSO
--.BR getfattr (1),
--.BR setfattr (1),
--.BR open (2),
--.BR stat (2),
--.BR setxattr (2),
--.BR listxattr (2),
--.BR removexattr (2),
--and
--.BR attr (5).

meta/recipes-support/attr/ea-acl.inc deleted +0 -132
-diff --git a/man/man2/listxattr.2 b/man/man2/listxattr.2
-deleted file mode 100644
-index 8b4371c..0000000
---- a/man/man2/listxattr.2
-+++ /dev/null
-@@ -1,158 +0,0 @@
--.\"
--.\" Extended attributes system calls manual pages
--.\"
--.\" (C) Andreas Gruenbacher, February 2001
--.\" (C) Silicon Graphics Inc, September 2001
--.\"
--.\" This is free documentation; you can redistribute it and/or
--.\" modify it under the terms of the GNU General Public License as
--.\" published by the Free Software Foundation; either version 2 of
--.\" the License, or (at your option) any later version.
--.\"
--.\" The GNU General Public License's references to "object code"
--.\" and "executables" are to be interpreted as the output of any
--.\" document formatting or typesetting system, including
--.\" intermediate and printed output.
--.\"
--.\" This manual is distributed in the hope that it will be useful,
--.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
--.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--.\" GNU General Public License for more details.
--.\"
--.\" You should have received a copy of the GNU General Public
--.\" License along with this manual.  If not, see
--.\" <http://www.gnu.org/licenses/>.
--.\"
--.TH LISTXATTR 2 "Extended Attributes" "Dec 2001" "System calls"
--.SH NAME
--listxattr, llistxattr, flistxattr \- list extended attribute names
--.SH SYNOPSIS
--.fam C
--.nf
--.B #include <sys/types.h>
--.B #include <attr/xattr.h>
--.sp
--.BI "ssize_t listxattr (const char\ *" path ",
--.BI "\t\t\t\t char\ *" list ", size_t " size );
--.BI "ssize_t llistxattr (const char\ *" path ",
--.BI "\t\t\t\t char\ *" list ", size_t " size );
--.BI "ssize_t flistxattr (int " filedes ",
--.BI "\t\t\t\t char\ *" list ", size_t " size );
--.fi
--.fam T
--.SH DESCRIPTION
--Extended attributes are name:value
--pairs associated with inodes (files, directories, symlinks, etc).
--They are extensions to the normal attributes which are associated
--with all inodes in the system (i.e. the
--.BR stat (2)
--data).
--A complete overview of extended attributes concepts can be found in
--.BR attr (5).
--.PP
--.B listxattr
--retrieves the
--.I list
--of extended attribute names associated with the given
--.I path
--in the filesystem.
--The list is the set of (NULL-terminated) names, one after the other.
--Names of extended attributes to which the calling process does not
--have access may be omitted from the list.
--The length of the attribute name
--.I list
--is returned.
--.PP
--.B llistxattr
--is identical to
--.BR listxattr ,
--except in the case of a symbolic link, where the list of names of
--extended attributes associated with the link itself is retrieved,
--not the file that it refers to.
--.I list
--is a caller-allocated buffer of size
--.IR size .
--.PP
--.B flistxattr
--is identical to
--.BR listxattr ,
--only the open file pointed to by
--.I filedes
--(as returned by
--.BR open (2))
--is interrogated in place of
--.IR path .
--.PP
--A single extended attribute
--.I name
--is a simple NULL-terminated string.
--The name includes a namespace prefix \- there may be several, disjoint
--namespaces associated with an individual inode.
--.PP
--An empty buffer of
--.I size
--zero can be passed into these calls to return the current size of the
--list of extended attribute names, which can be used to estimate the
--size of a buffer which is sufficiently large to hold the list of names.
--.SH EXAMPLES
--The
--.I list
--of names is returned as an unordered array of NULL-terminated character
--strings (attribute names are separated by NULL characters), like this:
--.fam C
--.RS
--.nf
--user.name1\\0system.name1\\0user.name2\\0
--.fi
--.RE
--.fam T
--.P
--Filesystems like ext2, ext3 and XFS which implement POSIX ACLs using
--extended attributes, might return a
--.I list
--like this:
--.fam C
--.RS
--.nf
--system.posix_acl_access\\0system.posix_acl_default\\0
--.fi
--.RE
--.fam T
--.SH RETURN VALUE
--On success, a positive number is returned indicating the size of the
--extended attribute name list.
--On failure, \-1 is returned and
--.I errno
--is set appropriately.

meta/recipes-support/attr/ea-acl.inc

Quoted 10 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -10
--.PP
--If the
--.I size
--of the
--.I list
--buffer is too small to hold the result,
--.I errno
--is set to ERANGE.
--.PP
--If extended attributes are not supported by the filesystem, or are

disabled,

Quoted 107 lines

--.I errno
--is set to ENOTSUP.
--.PP
--The errors documented for the
--.BR stat (2)
--system call are also applicable here.
--.SH AUTHORS
--Andreas Gruenbacher,
--.RI < [email protected] >
--and the SGI XFS development team,
--.RI < [email protected] >.
--Please send any bug reports or comments to these addresses. --.SH SEE ALSO
--.BR getfattr (1),
--.BR setfattr (1),
--.BR open (2),
--.BR stat (2),
--.BR getxattr (2),
--.BR setxattr (2),
--.BR removexattr (2),
--and
--.BR attr (5).

meta/recipes-support/attr/ea-acl.inc deleted +0 -85
-diff --git a/man/man2/removexattr.2 b/man/man2/removexattr.2
-deleted file mode 100644
-index 2c7d934..0000000
---- a/man/man2/removexattr.2
-+++ /dev/null
-@@ -1,111 +0,0 @@
--.\"
--.\" Extended attributes system calls manual pages
--.\"
--.\" (C) Andreas Gruenbacher, February 2001
--.\" (C) Silicon Graphics Inc, September 2001
--.\"
--.\" This is free documentation; you can redistribute it and/or
--.\" modify it under the terms of the GNU General Public License as
--.\" published by the Free Software Foundation; either version 2 of
--.\" the License, or (at your option) any later version.
--.\"
--.\" The GNU General Public License's references to "object code"
--.\" and "executables" are to be interpreted as the output of any
--.\" document formatting or typesetting system, including
--.\" intermediate and printed output.
--.\"
--.\" This manual is distributed in the hope that it will be useful,
--.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
--.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--.\" GNU General Public License for more details.
--.\"
--.\" You should have received a copy of the GNU General Public
--.\" License along with this manual.  If not, see
--.\" <http://www.gnu.org/licenses/>.
--.\"
--.TH REMOVEXATTR 2 "Extended Attributes" "Dec 2001" "System calls"
--.SH NAME
--removexattr, lremovexattr, fremovexattr \- remove an extended attribute
--.SH SYNOPSIS
--.fam C
--.nf
--.B #include <sys/types.h>
--.B #include <attr/xattr.h>
--.sp
--.BI "int removexattr (const char\ *" path ", const char\ *" name );
--.BI "int lremovexattr (const char\ *" path ", const char\ *" name );
--.BI "int fremovexattr (int " filedes ", const char\ *" name );
--.fi
--.fam T
--.SH DESCRIPTION
--Extended attributes are
--.IR name :\c
--value pairs associated with inodes (files, directories, symlinks, etc).
--They are extensions to the normal attributes which are associated
--with all inodes in the system (i.e. the
--.BR stat (2)
--data).
--A complete overview of extended attributes concepts can be found in
--.BR attr (5).
--.PP
--.B removexattr
--removes the extended attribute identified by
--.I name
--and associated with the given
--.I path
--in the filesystem.
--.PP
--.B lremovexattr
--is identical to
--.BR removexattr ,
--except in the case of a symbolic link, where the extended attribute is
--removed from the link itself, not the file that it refers to.
--.PP
--.B fremovexattr
--is identical to
--.BR removexattr ,
--only the extended attribute is removed from the open file pointed to by
--.I filedes
--(as returned by
--.BR open (2))
--in place of
--.IR path .
--.PP
--An extended attribute name is a simple NULL-terminated string.
--The
--.I name
--includes a namespace prefix \- there may be several, disjoint
--namespaces associated with an individual inode.
--.SH RETURN VALUE

meta/recipes-support/attr/ea-acl.inc

Quoted 10 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -10
--On success, zero is returned.
--On failure, \-1 is returned and
--.I errno
--is set appropriately.
--.PP
--If the named attribute does not exist,
--.I errno
--is set to ENOATTR.
--.PP
--If extended attributes are not supported by the filesystem, or are

disabled,

Quoted 135 lines

--.I errno
--is set to ENOTSUP.
--.PP
--The errors documented for the
--.BR stat (2)
--system call are also applicable here.
--.SH AUTHORS
--Andreas Gruenbacher,
--.RI < [email protected] >
--and the SGI XFS development team,
--.RI < [email protected] >.
--Please send any bug reports or comments to these addresses. --.SH SEE ALSO
--.BR getfattr (1),
--.BR setfattr (1),
--.BR open (2),
--.BR stat (2),
--.BR setxattr (2),
--.BR getxattr (2),
--.BR listxattr (2),
--and
--.BR attr (5).

meta/recipes-support/attr/ea-acl.inc deleted +0 -113
-diff --git a/man/man2/setxattr.2 b/man/man2/setxattr.2
-deleted file mode 100644
-index b20dc9f..0000000
---- a/man/man2/setxattr.2
-+++ /dev/null
-@@ -1,143 +0,0 @@
--.\"
--.\" Extended attributes system calls manual pages
--.\"
--.\" (C) Andreas Gruenbacher, February 2001
--.\" (C) Silicon Graphics Inc, September 2001
--.\"
--.\" This is free documentation; you can redistribute it and/or
--.\" modify it under the terms of the GNU General Public License as
--.\" published by the Free Software Foundation; either version 2 of
--.\" the License, or (at your option) any later version.
--.\"
--.\" The GNU General Public License's references to "object code"
--.\" and "executables" are to be interpreted as the output of any
--.\" document formatting or typesetting system, including
--.\" intermediate and printed output.
--.\"
--.\" This manual is distributed in the hope that it will be useful,
--.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
--.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--.\" GNU General Public License for more details.
--.\"
--.\" You should have received a copy of the GNU General Public
--.\" License along with this manual.  If not, see
--.\" <http://www.gnu.org/licenses/>.
--.\"
--.TH SETXATTR 2 "Extended Attributes" "Dec 2001" "System calls"
--.SH NAME
--setxattr, lsetxattr, fsetxattr \- set an extended attribute value
--.SH SYNOPSIS
--.fam C
--.nf
--.B #include <sys/types.h>
--.B #include <attr/xattr.h>
--.sp
--.BI "int setxattr (const char\ *" path ", const char\ *" name ",
--.BI "\t\t\t const void\ *" value ", size_t " size ", int " flags );
--.BI "int lsetxattr (const char\ *" path ", const char\ *" name ",
--.BI "\t\t\t const void\ *" value ", size_t " size ", int " flags );
--.BI "int fsetxattr (int " filedes ", const char\ *" name ",
--.BI "\t\t\t const void\ *" value ", size_t " size ", int " flags );
--.fi
--.fam T
--.SH DESCRIPTION
--Extended attributes are
--.IR name :\c
--.I value
--pairs associated with inodes (files, directories, symlinks, etc).
--They are extensions to the normal attributes which are associated
--with all inodes in the system (i.e. the
--.BR stat (2)
--data).
--A complete overview of extended attributes concepts can be found in
--.BR attr (5).
--.PP
--.B setxattr
--sets the
--.I value
--of the extended attribute identified by
--.I name
--and associated with the given
--.I path
--in the filesystem.
--The
--.I size
--of the
--.I value
--must be specified.
--.PP
--.B lsetxattr
--is identical to
--.BR setxattr ,
--except in the case of a symbolic link, where the extended attribute is
--set on the link itself, not the file that it refers to.
--.PP
--.B fsetxattr
--is identical to
--.BR setxattr ,
--only the extended attribute is set on the open file pointed to by
--.I filedes
--(as returned by
--.BR open (2))
--in place of
--.IR path .
--.PP
--An extended attribute name is a simple NULL-terminated string.
--The
--.I name
--includes a namespace prefix \- there may be several, disjoint
--namespaces associated with an individual inode.
--The
--.I value
--of an extended attribute is a chunk of arbitrary textual or
--binary data of specified length.
--.PP
--The
--.I flags
--parameter can be used to refine the semantics of the operation.
--XATTR_CREATE specifies a pure create, which fails if the named
--attribute exists already.
--XATTR_REPLACE specifies a pure replace operation, which fails if the
--named attribute does not already exist.
--By default (no flags), the extended attribute will be created if
--need be, or will simply replace the value if the attribute exists.
--.SH RETURN VALUE
--On success, zero is returned.
--On failure, \-1 is returned and
--.I errno

meta/recipes-support/attr/ea-acl.inc

Quoted 10 lines
meta/recipes-support/attr/ea-acl.inc deleted +0 -10
--is set appropriately.
--.PP
--If XATTR_CREATE is specified, and the attribute exists already,
--.I errno
--is set to EEXIST.
--If XATTR_REPLACE is specified, and the attribute does not exist,
--.I errno
--is set to ENOATTR.
--.PP
--If there is insufficient space remaining to store the extended

attribute,

Quoted 4 lines

--.I errno
--is set to either ENOSPC, or EDQUOT if quota enforcement was the cause. --.PP
--If extended attributes are not supported by the filesystem, or are

disabled,

Review

Quoted 26 lines

--.I errno
--is set to ENOTSUP.
--.PP
--The errors documented for the
--.BR stat (2)
--system call are also applicable here.
--.SH AUTHORS
--Andreas Gruenbacher,
--.RI < [email protected] >
--and the SGI XFS development team,
--.RI < [email protected] >.
--Please send any bug reports or comments to these addresses. --.SH SEE ALSO
--.BR getfattr (1),
--.BR setfattr (1),
--.BR open (2),
--.BR stat (2),
--.BR getxattr (2),
--.BR listxattr (2),
--.BR removexattr (2),
--and
--.BR attr (5).
---
-2.7.4

meta/recipes-support/attr/ea-acl.inc deleted +0 -1
-
(quoted diff) +0 -0

b/meta/recipes-support/attr/files/relative-libdir.patch

Quoted 10 lines

deleted file mode 100644
index b72bf184d6f..00000000000

meta/recipes-support/attr/files/relative-libdir.patch deleted +0 -5
@@ -1,25 +0,0 @@
-Upstream-Status: Pending
-
-use relative path in symbolic links, or it fails in staging
-sed expression from udev
-

meta/recipes-support/attr/files/relative-libdir.patch line 15

Quoted 10 lines
meta/recipes-support/attr/files/relative-libdir.patch deleted +0 -10
-7/29/2010 - created by Qing He <[email protected]>
-
-diff -u include.orig/buildmacros include/buildmacros
---- include.orig/buildmacros   2010-07-29 17:39:48.000000000 +0800
-+++ include/buildmacros        2010-07-29 18:20:34.000000000 +0800
-@@ -88,9 +88,11 @@
-       ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-       ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
-       if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
--      ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a

$(PKG_LIB_DIR)/$(LIBNAME).a; \

meta/recipes-support/attr/files/relative-libdir.patch line 16

Quoted 1 line
meta/recipes-support/attr/files/relative-libdir.patch deleted +0 -1
--      ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la

$(PKG_LIB_DIR)/$(LIBNAME).la; \

meta/recipes-support/attr/files/relative-libdir.patch line 17

Quoted 1 line
meta/recipes-support/attr/files/relative-libdir.patch deleted +0 -1
--      ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so

$(PKG_DEVLIB_DIR)/$(LIBNAME).so; \

meta/recipes-support/attr/files/relative-libdir.patch line 18

Quoted 1 line
meta/recipes-support/attr/files/relative-libdir.patch deleted +0 -1
-+      rel_lib_prefix=$$(echo $(PKG_LIB_DIR) | sed

's,\(^/\|\)[^/][^/]*,..,g'); \

meta/recipes-support/attr/files/relative-libdir.patch line 19

Quoted 1 line
meta/recipes-support/attr/files/relative-libdir.patch deleted +0 -1
-+      ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).a

$(PKG_LIB_DIR)/$(LIBNAME).a; \

meta/recipes-support/attr/files/relative-libdir.patch line 20

Quoted 1 line
meta/recipes-support/attr/files/relative-libdir.patch deleted +0 -1
-+      ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).la

$(PKG_LIB_DIR)/$(LIBNAME).la; \

meta/recipes-support/attr/files/relative-libdir.patch line 21

Quoted 1 line
meta/recipes-support/attr/files/relative-libdir.patch deleted +0 -1
-+      rel_devlib_prefix=$$(echo $(PKG_DEVLIB_DIR) | sed

's,\(^/\|\)[^/][^/]*,..,g'); \

meta/recipes-support/attr/files/relative-libdir.patch line 22

Quoted 1 line
meta/recipes-support/attr/files/relative-libdir.patch deleted +0 -1
-+      ../$(INSTALL) -S $$rel_devlib_prefix$(PKG_LIB_DIR)/$(LIBNAME).so

$(PKG_DEVLIB_DIR)/$(LIBNAME).so; \

Review

Quoted 4 lines
meta/recipes-support/attr/files/relative-libdir.patch deleted +0 -3
-       fi
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
(quoted diff) +0 -0

b/meta/recipes-support/attr/files/run-ptest

Quoted 18 lines

deleted file mode 100644
index a6c6867f2d9..00000000000

meta/recipes-support/attr/files/run-ptest deleted +0 -6
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-make -C test -k tests root-tests |sed \
- -e 's|^\[.*\] \(.*\) -- ok$|PASS: \1|' \
- -e 's|^\[.*\] \(.*\) -- failed|FAIL: \1|'
--

2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#36 lore raw

PATCH 20/30 lttng-modules: update to 2.11.0

In reply to Alexander Kanavin

Removed the bleeding-edge variant; if it is still useful please maintain it separately.

License-Update: formatting, dropped the gpl texts, as they're not anymore in source tree, and the main file is specific enough.

---
 ...les_2.10.11.bb => lttng-modules_2.11.0.bb} | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)
 rename meta/recipes-kernel/lttng/{lttng-modules_2.10.11.bb => lttng-modules_2.11.0.bb} (51%)
meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb renamed from meta/recipes-kernel/lttng/lttng-modules_2.10.11.bb +3 -18
similarity index 51%
rename from meta/recipes-kernel/lttng/lttng-modules_2.10.11.bb
rename to meta/recipes-kernel/lttng/lttng-modules_2.11.0.bb
index 789a3be8507..ffb703e3678 100644
@@ -2,10 +2,7 @@ SECTION = "devel"
 SUMMARY = "Linux Trace Toolkit KERNEL MODULE"
 DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules"
 LICENSE = "LGPLv2.1 & GPLv2 & MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c4613d1f8a9587bd7b366191830364b3 \
-                    file://gpl-2.0.txt;md5=751419260aa954499f7abaabaa882bbe \
-                    file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad \
-                    "
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3f882d431dc0f32f1f44c0707aa41128"
 
 inherit module
 
@@ -16,8 +13,8 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
            "
 
-SRC_URI[md5sum] = "c618fb646514dfc1bf910cfd7cda4256"
-SRC_URI[sha256sum] = "7f91e39b2e8e46d8bbba2b4c8c1614f1fb380611cd1a1fccc1d1859be26112f1"
+SRC_URI[md5sum] = "46ec6c566e65cf27b391a1bb643e11b4"
+SRC_URI[sha256sum] = "98af92d8c2e00f4eb63bc637a6967103cf6997434493f36e7a535a491e4fad5f"
 
 export INSTALL_MOD_DIR="kernel/lttng-modules"
 
@@ -32,15 +29,3 @@ python do_package_prepend() {
     if not os.path.exists(os.path.join(d.getVar('D'), d.getVar('nonarch_base_libdir')[1:], 'modules')):
         bb.warn("%s: no modules were created; this may be due to CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN'))
 }
-
-BBCLASSEXTEND = "devupstream:target"
-LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=c4613d1f8a9587bd7b366191830364b3"
-DEFAULT_PREFERENCE_class-devupstream = "-1"
-SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.10 \
-           file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \
-           file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
-           "
-SRCREV_class-devupstream = "624aca5d7507fbd11ea4a1a474c3aa1031bd9a31"
-PV_class-devupstream = "2.10.10+git${SRCPV}"
-S_class-devupstream = "${WORKDIR}/git"
-SRCREV_FORMAT ?= "lttng_git"
Signature · 1 line
2.17.1
#37 lore raw

Re: [PATCH 20/30] lttng-modules: update to 2.11.0

Quoted 2 lines · Alexander Kanavin

Removed the bleeding-edge variant; if it is still useful please maintain it separately.

Its needed due to people using varying kernel versions and in particular by Bruce for testing of new kernels.

Cheers,

Richard

#38 lore raw

Re: [PATCH 20/30] lttng-modules: update to 2.11.0

Quoted 7 lines · Richard Purdie
Quoted 2 lines · Alexander Kanavin

Removed the bleeding-edge variant; if it is still useful please maintain it separately.

Its needed due to people using varying kernel versions and in particular by Bruce for testing of new kernels.

The bleeding edge variant has been introduced for the first time by Zhe He of Wind River 6 months ago, and hasn't been updated since. If I had kept that in, it would actually be providing an older version of the component than the main variant. So I am not sure if it's actually being used; if it is, then it should see more frequent updates.

Another problem is that devtool isn't able to upgrade the main variant properly with this included. I'd rather split it it into a different recipe, if someone confirms the need.

Alex

#39 lore raw

Re: [PATCH 20/30] lttng-modules: update to 2.11.0

Quoted 4 lines · Alexander Kanavin
Quoted 2 lines · Richard Purdie

On Thu, 2019-12-12 at 19:14 +0100, Alexander Kanavin wrote:

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

Removed the bleeding-edge variant; if it is still useful please maintain it separately.

Its needed due to people using varying kernel versions and in particular by Bruce for testing of new kernels.

The bleeding edge variant has been introduced for the first time by Zhe He of Wind River 6 months ago, and hasn't been updated since. If I had kept that in, it would actually be providing an older version of the component than the main variant. So I am not sure if it's actually being used; if it is, then it should see more frequent updates.

linux-yocto-dev needs it, and unfortunately I've been hung up for several weeks on getting mips64 to boot with the latest kernels. Hence my entire queue is held up on that at the moment.

Quoted 2 lines

Another problem is that devtool isn't able to upgrade the main variant properly with this included. I'd rather split it it into a different recipe, if someone confirms the need.

It is definitely needed.

So if it is dropped now, I'll just have to re-introduce it in my next series.

Bruce

Quoted 7 lines

Alex
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
#40 lore raw

Re: [PATCH 20/30] lttng-modules: update to 2.11.0

Quoted 6 lines · Bruce Ashfield
Quoted 1 line

Another problem is that devtool isn't able to upgrade the main variant

properly with this included. I'd rather split it it into a different recipe, if someone confirms the need.

It is definitely needed.

Right, then I'll rework this patch to split the dev version into a separate recipe with a shared .inc.

Alex

#41 lore raw

Re: [PATCH 20/30] lttng-modules: update to 2.11.0

Quoted 10 lines · Alexander Kanavin
Quoted 5 lines · Bruce Ashfield
Quoted 1 line

Another problem is that devtool isn't able to upgrade the main

variant properly with this included. I'd rather split it it into a different recipe, if someone confirms the need.

It is definitely needed.

Right, then I'll rework this patch to split the dev version into a separate recipe with a shared .inc.

Can we teach devtool to be able to handle this?

In the back of my mind I'd still like to get poky-bleeding back running to try and get earlier warning of upstream breakage.

This sets a precedent of disallowing devupstream in recipes which I don't really like the idea of :/

Cheers,

Richard

#42 lore raw

Re: [PATCH 20/30] lttng-modules: update to 2.11.0

Quoted 12 lines · Richard Purdie
Quoted 10 lines · Alexander Kanavin
Quoted 5 lines · Bruce Ashfield
Quoted 1 line

Another problem is that devtool isn't able to upgrade the main

variant properly with this included. I'd rather split it it into a different recipe, if someone confirms the need.

It is definitely needed.

Right, then I'll rework this patch to split the dev version into a separate recipe with a shared .inc.

Quoted 8 lines

Can we teach devtool to be able to handle this?

In the back of my mind I'd still like to get poky-bleeding back running to try and get earlier warning of upstream breakage.

This sets a precedent of disallowing devupstream in recipes which I don't really like the idea of :/

Maybe a quick fix would be to tell devtool to ignore devupstream, I'll take a look tomorrow.

Alex

#43 lore raw

PATCH 21/30 lttng-ust: update to 2.11.0

In reply to Alexander Kanavin

Remove patch as issue addressed upstream.

---
 .../lttng-ust-doc-examples-disable.patch        | 17 -----------------
 ...{lttng-ust_2.10.5.bb => lttng-ust_2.11.0.bb} |  9 +++++----
 2 files changed, 5 insertions(+), 21 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch
 rename meta/recipes-kernel/lttng/{lttng-ust_2.10.5.bb => lttng-ust_2.11.0.bb} (89%)
meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch deleted +0 -17
deleted file mode 100644
index bff852799d0..00000000000
@@ -1,17 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Don't build the doc examples - we don't need them and in fact they
-never successfully built in previous iterations of the lttng-ust
-recipe anyway.
-
-Signed-off-by: Tom Zanussi <[email protected]>
-
-Index: lttng-ust-2.9.1/doc/Makefile.am
-===================================================================
---- lttng-ust-2.9.1.orig/doc/Makefile.am
-+++ lttng-ust-2.9.1/doc/Makefile.am
-@@ -1,3 +1,3 @@
--SUBDIRS = . man examples
-+SUBDIRS = . man
- 
- dist_doc_DATA = java-agent.txt
meta/recipes-kernel/lttng/lttng-ust_2.11.0.bb renamed from meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb +5 -4
similarity index 89%
rename from meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb
rename to meta/recipes-kernel/lttng/lttng-ust_2.11.0.bb
index cfaad30b694..6d7c05e65e3 100644
@@ -15,6 +15,8 @@ PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \
 
 inherit autotools lib_package manpages python3native
 
+EXTRA_OECONF = "--disable-numa"
+
 DEPENDS = "liburcu util-linux"
 RDEPENDS_${PN}-bin = "python3-core"
 
@@ -26,12 +28,11 @@ RCONFLICTS_${PN} = "lttng2-ust"
 PE = "2"
 
 SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \
-           file://lttng-ust-doc-examples-disable.patch \
            file://0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch \
-          "
+           "
 
-SRC_URI[md5sum] = "f0c86a9fa7dcfd0205fb42584a310b1c"
-SRC_URI[sha256sum] = "06f9ed9b2198855b1c7fcbf15fe57297ee259409ffa1b3bad87321412d98bc35"
+SRC_URI[md5sum] = "99823cfeb76562d753ffe67880e9cc59"
+SRC_URI[sha256sum] = "683280cfe5e12021e64c32cef9eeb0128f1f23dec32ba28adb5a2074be37c4d8"
 
 CVE_PRODUCT = "ust"
 
Signature · 1 line
2.17.1
#44 lore raw

Re: [PATCH 21/30] lttng-ust: update to 2.11.0

some undefined symbols

https://errors.yoctoproject.org/Errors/Details/297311/

Quoted 74 lines · Alexander Kanavin

Remove patch as issue addressed upstream.

---
 .../lttng-ust-doc-examples-disable.patch        | 17 -----------------
 ...{lttng-ust_2.10.5.bb => lttng-ust_2.11.0.bb} |  9 +++++----
 2 files changed, 5 insertions(+), 21 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch
 rename meta/recipes-kernel/lttng/{lttng-ust_2.10.5.bb => lttng-ust_2.11.0.bb} (89%)
meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch deleted +0 -17
deleted file mode 100644
index bff852799d0..00000000000
@@ -1,17 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Don't build the doc examples - we don't need them and in fact they
-never successfully built in previous iterations of the lttng-ust
-recipe anyway.
-
-Signed-off-by: Tom Zanussi <[email protected]>
-
-Index: lttng-ust-2.9.1/doc/Makefile.am
-===================================================================
---- lttng-ust-2.9.1.orig/doc/Makefile.am
-+++ lttng-ust-2.9.1/doc/Makefile.am
-@@ -1,3 +1,3 @@
--SUBDIRS = . man examples
-+SUBDIRS = . man
-
- dist_doc_DATA = java-agent.txt
meta/recipes-kernel/lttng/lttng-ust_2.11.0.bb renamed from meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb +5 -5
similarity index 89%
rename from meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb
rename to meta/recipes-kernel/lttng/lttng-ust_2.11.0.bb
index cfaad30b694..6d7c05e65e3 100644
@@ -15,6 +15,8 @@ PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \
 
 inherit autotools lib_package manpages python3native
 
+EXTRA_OECONF = "--disable-numa"
+
 DEPENDS = "liburcu util-linux"
 RDEPENDS_${PN}-bin = "python3-core"
 
@@ -26,12 +28,11 @@ RCONFLICTS_${PN} = "lttng2-ust"
 PE = "2"
 
 SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \
-           file://lttng-ust-doc-examples-disable.patch \
            file://0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch \
-          "
+           "
 
-SRC_URI[md5sum] = "f0c86a9fa7dcfd0205fb42584a310b1c"
-SRC_URI[sha256sum] = "06f9ed9b2198855b1c7fcbf15fe57297ee259409ffa1b3bad87321412d98bc35"
+SRC_URI[md5sum] = "99823cfeb76562d753ffe67880e9cc59"
+SRC_URI[sha256sum] = "683280cfe5e12021e64c32cef9eeb0128f1f23dec32ba28adb5a2074be37c4d8"
 
 CVE_PRODUCT = "ust"
 
--

2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#45 lore raw

PATCH 22/30 lttng-tools: update to 2.11.0

In reply to Alexander Kanavin

Remove 0001-Skip-when-testapp-is-not-present.patch as it is unclear whether it needs to be rebased, and difficult to rebase.

Remove 0001-check-for-gettid-API-during-configure.patch as it is no longer needed.

Ptests still seem to run ok, however they are rather slow, so I did not wait for their completion.

---
 ...001-Skip-when-testapp-is-not-present.patch | 610 ------------------
 ...heck-for-gettid-API-during-configure.patch |  55 --
 ...-tests-do-not-strip-a-helper-library.patch |  27 +
 ...ttng-modules-presence-before-testing.patch |  24 -
 ...-tools_2.10.7.bb => lttng-tools_2.11.0.bb} |  14 +-
 5 files changed, 35 insertions(+), 695 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-Skip-when-testapp-is-not-present.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-check-for-gettid-API-during-configure.patch
 create mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/0002-Fix-check-for-lttng-modules-presence-before-testing.patch
 rename meta/recipes-kernel/lttng/{lttng-tools_2.10.7.bb => lttng-tools_2.11.0.bb} (94%)
meta/recipes-kernel/lttng/lttng-tools/0001-Skip-when-testapp-is-not-present.patch deleted +0 -610
deleted file mode 100644
index 6c9f7e462cc..00000000000
@@ -1,610 +0,0 @@
-From 95c27e6acceaeda55c729b9e92e594322adef13f Mon Sep 17 00:00:00 2001
-From: Jonathan Rajotte <[email protected]>
-Date: Wed, 3 Apr 2019 16:31:18 -0400
-Subject: [PATCH lttng-tools] Skip when testapp is not present
-
-We expect lttng-ust do be present, this is a wrong assumptions.
-
-This is a quick fix. The real fix is to either detect at runtime
-lttng-ust support or at build time (HAVE_LIBLTTNG_UST_CTL).
-
-This prevent hang for make check done on a build configured with
---without-lttng-ust.
-
-Upstream-Status: Inappropriate [other] 
-Reason: This patch is inappropriate for upstream for 2.10 stable release 
-since we do not backport "superficial" fix to the test suite. We do 
-backport when a test is broken. The fact that on --without-lttng-ust 
-hang is not a "broken" test per-see. Still, a variation of this fix will 
-be upstreamed in our master branch and possibly 2.11. The upstreamed 
-version will split the test in kernel/ust test and skip them at the 
-build system level. This patch is more succinct.
-
-Signed-off-by: Jonathan Rajotte <[email protected]>
----
- tests/regression/tools/crash/test_crash       |  4 ++
- .../regression/tools/exclusion/test_exclusion |  4 ++
- .../tools/filtering/test_valid_filter         | 21 ++++--
- tests/regression/tools/health/test_thread_ok  | 29 +++++---
- tests/regression/tools/live/Makefile.am       |  2 -
- tests/regression/tools/live/test_lttng_ust    |  4 ++
- tests/regression/tools/live/test_ust          |  4 ++
- .../tools/live/test_ust_tracefile_count       |  4 ++
- tests/regression/tools/mi/test_mi             |  4 ++
- .../notification/test_notification_multi_app  | 18 +++--
- .../tools/notification/test_notification_ust  |  4 ++
- .../regression/tools/regen-metadata/test_ust  |  2 +-
- .../regression/tools/regen-statedump/test_ust |  2 +-
- .../regression/tools/save-load/test_autoload  |  7 ++
- tests/regression/tools/save-load/test_load    |  8 +++
- tests/regression/tools/save-load/test_save    |  7 ++
- .../regression/tools/snapshots/test_ust_fast  |  2 +-
- .../regression/tools/snapshots/test_ust_long  |  2 +-
- .../tools/snapshots/test_ust_streaming        |  2 +-
- tests/regression/tools/snapshots/ust_test     |  2 +-
- .../streaming/test_high_throughput_limits     |  2 +-
- tests/regression/tools/streaming/test_ust     |  2 +-
- .../tracefile-limits/test_tracefile_count     |  2 +-
- .../tracefile-limits/test_tracefile_size      |  2 +-
- .../tools/wildcard/test_event_wildcard        | 67 ++++++++++---------
- 25 files changed, 147 insertions(+), 60 deletions(-)
-
-diff --git a/tests/regression/tools/crash/test_crash b/tests/regression/tools/crash/test_crash
-index 8c62c513d..3cbe97688 100755
---- a/tests/regression/tools/crash/test_crash
-+++ b/tests/regression/tools/crash/test_crash
-@@ -35,6 +35,10 @@ NUM_TESTS=77
- 
- source $TESTDIR/utils/utils.sh
- 
-+if [ ! -x "$TESTAPP_BIN" ]; then
-+	plan_skip_all "No UST events binary detected."
-+fi
-+
- # Global declaration for simplification
- LTTNG_CRASH=$TESTDIR/../src/bin/lttng-crash/$CRASH_BIN
- 
-diff --git a/tests/regression/tools/exclusion/test_exclusion b/tests/regression/tools/exclusion/test_exclusion
-index 949cd41df..42e4d72fb 100755
---- a/tests/regression/tools/exclusion/test_exclusion
-+++ b/tests/regression/tools/exclusion/test_exclusion
-@@ -30,6 +30,10 @@ NUM_TESTS=149
- 
- source $TESTDIR/utils/utils.sh
- 
-+if [ ! -x "$TESTAPP_BIN" ]; then
-+	plan_skip_all "No UST events binary detected."
-+fi
-+
- function enable_ust_lttng_all_event_exclusion()
- {
- 	sess_name="$1"
-diff --git a/tests/regression/tools/filtering/test_valid_filter b/tests/regression/tools/filtering/test_valid_filter
-index 163b32182..1e8da630b 100755
---- a/tests/regression/tools/filtering/test_valid_filter
-+++ b/tests/regression/tools/filtering/test_valid_filter
-@@ -418,12 +418,18 @@ issue_356_filter+="intfield > 4 && intfield > 5 && "
- issue_356_filter+="intfield > 6 && intfield > 7 && "
- issue_356_filter+="intfield > 8 || intfield > 0"
- 
-+BIN_NAME="gen-ust-events"
-+
-+skip_ust=1
-+if [ ! -x "$CURDIR/$BIN_NAME" ]; then
-+	skip_ust=0
-+	skip 0 "No UST nevents binary detected." $NUM_UST_TESTS
-+fi
-+
- start_lttng_sessiond
- 
- ### UST TESTS
- 
--BIN_NAME="gen-ust-events"
--
- KIRK_KRAUSS_TESTS=(
- 	# the tests below were written by Kirk Krauss in this article:
- 	# http://www.drdobbs.com/architecture-and-design/matching-wildcards-an-empirical-way-to-t/240169123
-@@ -897,9 +903,6 @@ UST_STR_FILTERS=(
- 	END
- )
- 
--if [ ! -x "$CURDIR/$BIN_NAME" ]; then
--	BAIL_OUT "No UST nevents binary detected."
--fi
- 
- IFS="$OLDIFS"
- 
-@@ -910,6 +913,10 @@ i=0
- while true; do
- 	validator="${UST_FILTERS[$i]}"
- 
-+	if [ $skip_ust -eq 0 ]; then
-+		break
-+	fi
-+
- 	if [ "$validator" = END ]; then
- 		break
- 	fi
-@@ -929,6 +936,10 @@ i=0
- while true; do
- 	validator="${UST_STR_FILTERS[$i]}"
- 
-+	if [ $skip_ust -eq 0 ]; then
-+		break
-+	fi
-+
- 	if [ "$validator" = END ]; then
- 		break
- 	fi
-diff --git a/tests/regression/tools/health/test_thread_ok b/tests/regression/tools/health/test_thread_ok
-index e81d6ed24..849b7e71f 100755
---- a/tests/regression/tools/health/test_thread_ok
-+++ b/tests/regression/tools/health/test_thread_ok
-@@ -27,6 +27,9 @@ CHANNEL_NAME="testchan"
- HEALTH_CHECK_BIN="health_check"
- NUM_TESTS=17
- SLEEP_TIME=30
-+TESTAPP_PATH="$TESTDIR/utils/testapp"
-+TESTAPP_NAME="gen-ust-events"
-+TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
- 
- source $TESTDIR/utils/utils.sh
- 
-@@ -76,15 +79,19 @@ function test_thread_ok
- 	$CURDIR/$HEALTH_CHECK_BIN > ${STDOUT_PATH} 2> ${STDERR_PATH}
- 	report_errors
- 
--	diag "With UST consumer daemons"
--	create_lttng_session_no_output $SESSION_NAME
--	enable_ust_lttng_event_ok $SESSION_NAME $UST_EVENT_NAME $CHANNEL_NAME
--	start_lttng_tracing_ok $SESSION_NAME
--	destroy_lttng_session_ok $SESSION_NAME
-+	skip $skip_ust "Ust does not seems to be supported" "5" ||
-+	{
-+		diag "With UST consumer daemons"
-+		create_lttng_session_no_output $SESSION_NAME
-+		enable_ust_lttng_event_ok $SESSION_NAME $UST_EVENT_NAME $CHANNEL_NAME
-+		start_lttng_tracing_ok $SESSION_NAME
-+		destroy_lttng_session_ok $SESSION_NAME
- 
--	# Check health status
--	$CURDIR/$HEALTH_CHECK_BIN > ${STDOUT_PATH} 2> ${STDERR_PATH}
--	report_errors
-+
-+		# Check health status
-+		$CURDIR/$HEALTH_CHECK_BIN > ${STDOUT_PATH} 2> ${STDERR_PATH}
-+		report_errors
-+	}
- 
- 	skip $isroot "Root access is needed. Skipping kernel consumer health check test." "5" ||
- 	{
-@@ -141,6 +148,12 @@ else
- 	isroot=0
- fi
- 
-+if [ ! -x "$TESTAPP_BIN" ]; then
-+	skip_ust=0
-+else
-+	skip_ust=1
-+fi
-+
- test_thread_ok
- 
- rm -rf ${HEALTH_PATH}
-diff --git a/tests/regression/tools/live/Makefile.am b/tests/regression/tools/live/Makefile.am
-index 46186d383..db74de8d5 100644
---- a/tests/regression/tools/live/Makefile.am
-+++ b/tests/regression/tools/live/Makefile.am
-@@ -16,9 +16,7 @@ LIVE=$(top_builddir)/src/bin/lttng-sessiond/session.$(OBJEXT) \
- noinst_PROGRAMS = live_test
- EXTRA_DIST = test_kernel test_lttng_kernel
- 
--if HAVE_LIBLTTNG_UST_CTL
- EXTRA_DIST += test_ust test_ust_tracefile_count test_lttng_ust
--endif
- 
- live_test_SOURCES = live_test.c
- live_test_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
-diff --git a/tests/regression/tools/live/test_lttng_ust b/tests/regression/tools/live/test_lttng_ust
-index 06017d01d..be9b3d7f7 100755
---- a/tests/regression/tools/live/test_lttng_ust
-+++ b/tests/regression/tools/live/test_lttng_ust
-@@ -38,6 +38,10 @@ NUM_TESTS=12
- 
- source $TESTDIR/utils/utils.sh
- 
-+if [ ! -x "$TESTAPP_BIN" ]; then
-+	plan_skip_all "No UST events binary detected."
-+fi
-+
- # MUST set TESTDIR before calling those functions
- plan_tests $NUM_TESTS
- 
-diff --git a/tests/regression/tools/live/test_ust b/tests/regression/tools/live/test_ust
-index 0384a706f..add521bfc 100755
---- a/tests/regression/tools/live/test_ust
-+++ b/tests/regression/tools/live/test_ust
-@@ -36,6 +36,10 @@ DIR=$(readlink -f $TESTDIR)
- 
- source $TESTDIR/utils/utils.sh
- 
-+if [ ! -x "$TESTAPP_BIN" ]; then
-+	plan_skip_all "No UST events binary detected."
-+fi
-+
- echo "$TEST_DESC"
- 
- function setup_live_tracing()
-diff --git a/tests/regression/tools/live/test_ust_tracefile_count b/tests/regression/tools/live/test_ust_tracefile_count
-index 6da368fc6..10504f8c6 100755
---- a/tests/regression/tools/live/test_ust_tracefile_count
-+++ b/tests/regression/tools/live/test_ust_tracefile_count
-@@ -36,6 +36,10 @@ DIR=$(readlink -f $TESTDIR)
- 
- source $TESTDIR/utils/utils.sh
- 
-+if [ ! -x "$TESTAPP_BIN" ]; then
-+	plan_skip_all "No UST events binary detected."
-+fi
-+
- echo "$TEST_DESC"
- 
- function setup_live_tracing()
-diff --git a/tests/regression/tools/mi/test_mi b/tests/regression/tools/mi/test_mi
-index 48dda7da6..2cc30b29a 100755
---- a/tests/regression/tools/mi/test_mi
-+++ b/tests/regression/tools/mi/test_mi
-@@ -61,6 +61,10 @@ NUM_TESTS=228
- 
- source $TESTDIR/utils/utils.sh
- 
-+if [ ! -x "$TESTAPP_BIN" ]; then
-+	plan_skip_all "No UST events binary detected."
-+fi
-+
- #Overwrite the lttng_bin to get mi output
- LTTNG_BIN="lttng --mi xml"
- 
-diff --git a/tests/regression/tools/notification/test_notification_multi_app b/tests/regression/tools/notification/test_notification_multi_app
-index 0a05ea6a0..29b0f62fa 100755
---- a/tests/regression/tools/notification/test_notification_multi_app
-+++ b/tests/regression/tools/notification/test_notification_multi_app
-@@ -52,6 +52,11 @@ plan_tests $NUM_TESTS
- 
- print_test_banner "$TEST_DESC"
- 
-+skip_ust=1
-+if [ ! -x "$TESTAPP_BIN" ]; then
-+	skip_ust=0
-+fi
-+
- app_pids=()
- 
- function kernel_event_generator_toogle_state
-@@ -468,10 +473,15 @@ function test_on_register_evaluation ()
- }
- 
- 
--TESTS=(
--	test_multi_app_ust
--	test_on_register_evaluation_ust
--)
-+TESTS=()
-+if [ $skip_ust -eq "1" ]; then
-+	TESTS+=(
-+		test_multi_app_ust
-+		test_on_register_evaluation_ust
-+	)
-+else
-+	skip 0 "No UST events binary detected." $NUM_TEST_UST
-+fi
- 
- if [ "$(id -u)" == "0" ]; then
- 	TESTS+=(
-diff --git a/tests/regression/tools/notification/test_notification_ust b/tests/regression/tools/notification/test_notification_ust
-index 8941e476d..eb2e15cad 100755
---- a/tests/regression/tools/notification/test_notification_ust
-+++ b/tests/regression/tools/notification/test_notification_ust
-@@ -46,6 +46,10 @@ DIR=$(readlink -f $TESTDIR)
- 
- source $TESTDIR/utils/utils.sh
- 
-+if [ ! -x "$TESTAPP_BIN" ]; then
-+	plan_skip_all "No UST events binary detected."
-+fi
-+
- function ust_event_generator_toogle_state
- {
- 	ust_event_generator_suspended=$((ust_event_generator_suspended==0))
-diff --git a/tests/regression/tools/regen-metadata/test_ust b/tests/regression/tools/regen-metadata/test_ust
-index b7f1af1d8..312c8a40d 100755
---- a/tests/regression/tools/regen-metadata/test_ust
-+++ b/tests/regression/tools/regen-metadata/test_ust
-@@ -34,7 +34,7 @@ NUM_TESTS=33
- source $TESTDIR/utils/utils.sh
- 
- if [ ! -x "$TESTAPP_BIN" ]; then
--	BAIL_OUT "No UST events binary detected."
-+	plan_skip_all "No UST events binary detected."
- fi
- 
- function lttng_create_session_uri
-diff --git a/tests/regression/tools/regen-statedump/test_ust b/tests/regression/tools/regen-statedump/test_ust
-index 486b9a560..8d455b26a 100755
---- a/tests/regression/tools/regen-statedump/test_ust
-+++ b/tests/regression/tools/regen-statedump/test_ust
-@@ -34,7 +34,7 @@ NUM_TESTS=11
- source $TESTDIR/utils/utils.sh
- 
- if [ ! -x "$TESTAPP_BIN" ]; then
--	BAIL_OUT "No UST events binary detected."
-+	plan_skip_all "No UST events binary detected."
- fi
- 
- function test_ust_local ()
-diff --git a/tests/regression/tools/save-load/test_autoload b/tests/regression/tools/save-load/test_autoload
-index 7ee5e9906..ec376cfb3 100755
---- a/tests/regression/tools/save-load/test_autoload
-+++ b/tests/regression/tools/save-load/test_autoload
-@@ -21,6 +21,9 @@ CURDIR=$(dirname $0)/
- CONFIG_DIR="${CURDIR}/configuration"
- TESTDIR=$CURDIR/../../../
- export LTTNG_SESSION_CONFIG_XSD_PATH=$(readlink -m ${TESTDIR}../src/common/config/)
-+TESTAPP_PATH="$TESTDIR/utils/testapp"
-+TESTAPP_NAME="gen-ust-events"
-+TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
- 
- DIR=$(readlink -f $TESTDIR)
- 
-@@ -28,6 +31,10 @@ NUM_TESTS=9
- 
- source $TESTDIR/utils/utils.sh
- 
-+if [ ! -x "$TESTAPP_BIN" ]; then
-+	plan_skip_all "No UST events binary detected."
-+fi
-+
- # MUST set TESTDIR before calling those functions
- plan_tests $NUM_TESTS
- 
-diff --git a/tests/regression/tools/save-load/test_load b/tests/regression/tools/save-load/test_load
-index 5e38b46b6..b6fdd8192 100755
---- a/tests/regression/tools/save-load/test_load
-+++ b/tests/regression/tools/save-load/test_load
-@@ -20,6 +20,10 @@ TEST_DESC="Load session(s)"
- CURDIR=$(dirname $0)/
- CONFIG_DIR="${CURDIR}/configuration"
- TESTDIR=$CURDIR/../../../
-+TESTAPP_PATH="$TESTDIR/utils/testapp"
-+TESTAPP_NAME="gen-ust-events"
-+TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
-+
- export LTTNG_SESSION_CONFIG_XSD_PATH=$(readlink -m ${TESTDIR}../src/common/config/)
- 
- SESSION_NAME="load-42"
-@@ -31,6 +35,10 @@ NUM_TESTS=67
- 
- source $TESTDIR/utils/utils.sh
- 
-+if [ ! -x "$TESTAPP_BIN" ]; then
-+	plan_skip_all "No UST events binary detected."
-+fi
-+
- # MUST set TESTDIR before calling those functions
- plan_tests $NUM_TESTS
- 
-diff --git a/tests/regression/tools/save-load/test_save b/tests/regression/tools/save-load/test_save
-index c5f6b1341..cfaf67b7a 100755
---- a/tests/regression/tools/save-load/test_save
-+++ b/tests/regression/tools/save-load/test_save
-@@ -23,6 +23,9 @@ TESTDIR=$CURDIR/../../../
- SESSION_NAME="save-42"
- CHANNEL_NAME="chan-save"
- EVENT_NAME="tp:tptest"
-+TESTAPP_PATH="$TESTDIR/utils/testapp"
-+TESTAPP_NAME="gen-ust-events"
-+TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
- 
- DIR=$(readlink -f $TESTDIR)
- 
-@@ -30,6 +33,10 @@ NUM_TESTS=41
- 
- source $TESTDIR/utils/utils.sh
- 
-+if [ ! -x "TESTAPP_BIN" ]; then
-+	plan_skip_all "No UST events binary detected."
-+fi
-+
- # MUST set TESTDIR before calling those functions
- plan_tests $NUM_TESTS
- 
-diff --git a/tests/regression/tools/snapshots/test_ust_fast b/tests/regression/tools/snapshots/test_ust_fast
-index edb435c52..5a68ec56d 100755
---- a/tests/regression/tools/snapshots/test_ust_fast
-+++ b/tests/regression/tools/snapshots/test_ust_fast
-@@ -23,7 +23,7 @@ TEST_BIN="ust_test"
- source $TESTDIR/utils/utils.sh
- 
- if [ ! -x "$CURDIR/$TEST_BIN" ]; then
--	BAIL_OUT "No UST test found: $TEST_BIN"
-+	plan_skip_all "No UST test found: $TEST_BIN"
- fi
- 
- ./$CURDIR/$TEST_BIN $NR_SNAPSHOT
-diff --git a/tests/regression/tools/snapshots/test_ust_long b/tests/regression/tools/snapshots/test_ust_long
-index 9e1a0c262..afa019f6a 100755
---- a/tests/regression/tools/snapshots/test_ust_long
-+++ b/tests/regression/tools/snapshots/test_ust_long
-@@ -23,7 +23,7 @@ TEST_BIN="ust_test"
- source $TESTDIR/utils/utils.sh
- 
- if [ ! -x "$CURDIR/$TEST_BIN" ]; then
--	BAIL_OUT "No UST test found: $TEST_BIN"
-+	plan_skip_all "No UST test found: $TEST_BIN"
- fi
- 
- ./$CURDIR/$TEST_BIN $NR_SNAPSHOT
-diff --git a/tests/regression/tools/snapshots/test_ust_streaming b/tests/regression/tools/snapshots/test_ust_streaming
-index 93b0957f3..69291ab4d 100755
---- a/tests/regression/tools/snapshots/test_ust_streaming
-+++ b/tests/regression/tools/snapshots/test_ust_streaming
-@@ -37,7 +37,7 @@ NUM_TESTS=75
- source $TESTDIR/utils/utils.sh
- 
- if [ ! -x "$TESTAPP_BIN" ]; then
--	BAIL_OUT "No UST events binary detected."
-+	plan_skip_all "No UST events binary detected."
- fi
- 
- function snapshot_add_output ()
-diff --git a/tests/regression/tools/snapshots/ust_test b/tests/regression/tools/snapshots/ust_test
-index 755cef9e0..92f9f6cff 100755
---- a/tests/regression/tools/snapshots/ust_test
-+++ b/tests/regression/tools/snapshots/ust_test
-@@ -34,7 +34,7 @@ TRACE_PATH=$(mktemp -d)
- source $TESTDIR/utils/utils.sh
- 
- if [ ! -x "$TESTAPP_BIN" ]; then
--	BAIL_OUT "No UST events binary detected."
-+	plan_skip_all "No UST events binary detected."
- fi
- 
- # Need the number of snapshot to do.
-diff --git a/tests/regression/tools/streaming/test_high_throughput_limits b/tests/regression/tools/streaming/test_high_throughput_limits
-index 32c3f1f2b..f54178923 100755
---- a/tests/regression/tools/streaming/test_high_throughput_limits
-+++ b/tests/regression/tools/streaming/test_high_throughput_limits
-@@ -38,7 +38,7 @@ NUM_TESTS=104
- source $TESTDIR/utils/utils.sh
- 
- if [ ! -x "$TESTAPP_BIN" ]; then
--	BAIL_OUT "No UST events binary detected."
-+	plan_skip_all "No UST events binary detected."
- fi
- 
- function set_bw_limit
-diff --git a/tests/regression/tools/streaming/test_ust b/tests/regression/tools/streaming/test_ust
-index a5d5b5e92..e1dd98ee7 100755
---- a/tests/regression/tools/streaming/test_ust
-+++ b/tests/regression/tools/streaming/test_ust
-@@ -34,7 +34,7 @@ NUM_TESTS=16
- source $TESTDIR/utils/utils.sh
- 
- if [ ! -x "$TESTAPP_BIN" ]; then
--	BAIL_OUT "No UST events binary detected."
-+	plan_skip_all "No UST events binary detected."
- fi
- 
- function lttng_create_session_uri
-diff --git a/tests/regression/tools/tracefile-limits/test_tracefile_count b/tests/regression/tools/tracefile-limits/test_tracefile_count
-index 6ada8580f..7553c7d1f 100755
---- a/tests/regression/tools/tracefile-limits/test_tracefile_count
-+++ b/tests/regression/tools/tracefile-limits/test_tracefile_count
-@@ -33,7 +33,7 @@ PAGE_SIZE=$(getconf PAGE_SIZE)
- source $TESTDIR/utils/utils.sh
- 
- if [ ! -x "$TESTAPP_BIN" ]; then
--	BAIL_OUT "No UST events binary detected."
-+	plan_skip_all "No UST events binary detected."
- fi
- 
- function enable_lttng_channel_count_limit ()
-diff --git a/tests/regression/tools/tracefile-limits/test_tracefile_size b/tests/regression/tools/tracefile-limits/test_tracefile_size
-index 3dddbe613..1089487ff 100755
---- a/tests/regression/tools/tracefile-limits/test_tracefile_size
-+++ b/tests/regression/tools/tracefile-limits/test_tracefile_size
-@@ -33,7 +33,7 @@ NUM_TESTS=66
- source $TESTDIR/utils/utils.sh
- 
- if [ ! -x "$TESTAPP_BIN" ]; then
--	BAIL_OUT "No UST events binary detected."
-+	plan_skip_all "No UST events binary detected."
- fi
- 
- function enable_lttng_channel_size_limit ()
-diff --git a/tests/regression/tools/wildcard/test_event_wildcard b/tests/regression/tools/wildcard/test_event_wildcard
-index 61ea67a72..921a2301d 100755
---- a/tests/regression/tools/wildcard/test_event_wildcard
-+++ b/tests/regression/tools/wildcard/test_event_wildcard
-@@ -97,42 +97,47 @@ print_test_banner "$TEST_DESC"
- 
- start_lttng_sessiond
- 
--diag "Test UST wildcard"
--
- if [ ! -x "$TESTAPP_BIN" ]; then
--	BAIL_OUT "No UST nevents binary detected."
-+	skip_ust=0
-+else
-+	skip_ust=1
- fi
- 
--EVENT_NAME="tp:tptest"
-+skip $skip_ust "No UST nevents binary detected." $NUM_UST_TESTS ||
-+{
-+	diag "Test UST wildcard"
- 
--# non-matching
--test_event_wildcard ust 0 'tp:abc*'
--test_event_wildcard ust 0 '*abc'
--test_event_wildcard ust 0 '*z*'
--test_event_wildcard ust 0 '*\**'
--test_event_wildcard ust 0 '*\*'
--test_event_wildcard ust 0 '\**'
--test_event_wildcard ust 0 '*:*tpte*s'
--test_event_wildcard ust 0 'tp**tpTest'
-+	EVENT_NAME="tp:tptest"
- 
--# matching
--test_event_wildcard ust 1 'tp:tp*'
--test_event_wildcard ust 1 '*'
--test_event_wildcard ust 1 'tp:tptest*'
--test_event_wildcard ust 1 '**'
--test_event_wildcard ust 1 '***'
--test_event_wildcard ust 1 '*tptest'
--test_event_wildcard ust 1 '**tptest'
--test_event_wildcard ust 1 '*tpte*'
--test_event_wildcard ust 1 '*tp*'
--test_event_wildcard ust 1 '*tp**'
--test_event_wildcard ust 1 '*:*tptest'
--test_event_wildcard ust 1 '*:*tpte*t'
--test_event_wildcard ust 1 't*p*:*t*e*s*t'
--test_event_wildcard ust 1 '*t*p*:*t*e*s*t*'
--test_event_wildcard ust 1 'tp*tptest'
--test_event_wildcard ust 1 'tp**tptest'
--test_event_wildcard ust 1 'tp*test'
-+	# non-matching
-+	test_event_wildcard ust 0 'tp:abc*'
-+	test_event_wildcard ust 0 '*abc'
-+	test_event_wildcard ust 0 '*z*'
-+	test_event_wildcard ust 0 '*\**'
-+	test_event_wildcard ust 0 '*\*'
-+	test_event_wildcard ust 0 '\**'
-+	test_event_wildcard ust 0 '*:*tpte*s'
-+	test_event_wildcard ust 0 'tp**tpTest'
-+
-+	# matching
-+	test_event_wildcard ust 1 'tp:tp*'
-+	test_event_wildcard ust 1 '*'
-+	test_event_wildcard ust 1 'tp:tptest*'
-+	test_event_wildcard ust 1 '**'
-+	test_event_wildcard ust 1 '***'
-+	test_event_wildcard ust 1 '*tptest'
-+	test_event_wildcard ust 1 '**tptest'
-+	test_event_wildcard ust 1 '*tpte*'
-+	test_event_wildcard ust 1 '*tp*'
-+	test_event_wildcard ust 1 '*tp**'
-+	test_event_wildcard ust 1 '*:*tptest'
-+	test_event_wildcard ust 1 '*:*tpte*t'
-+	test_event_wildcard ust 1 't*p*:*t*e*s*t'
-+	test_event_wildcard ust 1 '*t*p*:*t*e*s*t*'
-+	test_event_wildcard ust 1 'tp*tptest'
-+	test_event_wildcard ust 1 'tp**tptest'
-+	test_event_wildcard ust 1 'tp*test'
-+}
- 
- if [ "$(id -u)" == "0" ]; then
- 	isroot=1
--- 
-2.17.1
-
meta/recipes-kernel/lttng/lttng-tools/0001-check-for-gettid-API-during-configure.patch deleted +0 -55

55 lines not on this page · raw message

meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch new file +27 -0
new file mode 100644
index 00000000000..2d08b088794
@@ -0,0 +1,27 @@
+From ab238c213fac190972f55e73cf3e0bb1c7846eb8 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Thu, 12 Dec 2019 16:52:07 +0100
+Subject: [PATCH] tests: do not strip a helper library
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ tests/utils/testapp/userspace-probe-elf-binary/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am b/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am
+index 03f5d5a..d12c343 100644
+--- a/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am
++++ b/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am
+@@ -12,7 +12,7 @@ userspace_probe_elf_binary_LDADD = libfoo.la
+ libfoo.strip: libfoo.la
+ 	$(OBJCOPY) --strip-all .libs/libfoo.so
+ 
+-all-local: libfoo.strip
++all-local:
+ 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+ 		for script in $(EXTRA_DIST); do \
+ 			cp -f $(srcdir)/$$script $(builddir); \
+-- 
+2.17.1
+
meta/recipes-kernel/lttng/lttng-tools/0002-Fix-check-for-lttng-modules-presence-before-testing.patch deleted +0 -24
deleted file mode 100644
index 784a07940a4..00000000000
@@ -1,24 +0,0 @@
-From 58e4dcce48b48b68b65bffc0cd51d9e26b44c75d Mon Sep 17 00:00:00 2001
-From: Jonathan Rajotte <[email protected]>
-Date: Wed, 22 May 2019 16:44:54 -0400
-Subject: [PATCH] Fix: check for lttng modules presence before testing
-
-Upstream-Status: Submitted [https://lists.lttng.org/pipermail/lttng-dev/2019-May/028987.html]
-
-Signed-off-by: Jonathan Rajotte <[email protected]>
----
- tests/regression/tools/notification/test_notification_multi_app | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/regression/tools/notification/test_notification_multi_app b/tests/regression/tools/notification/test_notification_multi_app
-index 29b0f62..a6baf65 100755
---- a/tests/regression/tools/notification/test_notification_multi_app
-+++ b/tests/regression/tools/notification/test_notification_multi_app
-@@ -484,6 +484,7 @@ else
- fi
- 
- if [ "$(id -u)" == "0" ]; then
-+	validate_lttng_modules_present
- 	TESTS+=(
- 	test_multi_app_kernel
- 	test_on_register_evaluation_kernel
meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb renamed from meta/recipes-kernel/lttng/lttng-tools_2.10.7.bb +8 -6
similarity index 94%
rename from meta/recipes-kernel/lttng/lttng-tools_2.10.7.bb
rename to meta/recipes-kernel/lttng/lttng-tools_2.11.0.bb
index aa6d19d0fa5..a2797567410 100644
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
 
 DEPENDS = "liburcu popt libxml2 util-linux"
 RDEPENDS_${PN} = "libgcc"
-RDEPENDS_${PN}-ptest += "make perl bash gawk babeltrace procps perl-module-overloading coreutils util-linux kmod lttng-modules sed"
+RDEPENDS_${PN}-ptest += "make perl bash gawk babeltrace procps perl-module-overloading coreutils util-linux kmod lttng-modules sed python3-core"
 RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils"
 RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils"
 # babelstats.pl wants getopt-long
@@ -30,15 +30,13 @@ PACKAGECONFIG_remove_arc = "lttng-ust"
 
 SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
            file://x32.patch \
+           file://0001-tests-do-not-strip-a-helper-library.patch \
            file://run-ptest \
            file://lttng-sessiond.service \
-           file://0001-Skip-when-testapp-is-not-present.patch \
-           file://0002-Fix-check-for-lttng-modules-presence-before-testing.patch \
-           file://0001-check-for-gettid-API-during-configure.patch \
            "
 
-SRC_URI[md5sum] = "e7804d10e4cade381e241601f6047373"
-SRC_URI[sha256sum] = "ed71ebe00c5d985c74f30e97b614e909573cbd9276c85e05d9557a0b817a1312"
+SRC_URI[md5sum] = "e6c23244a36e2a09783d03a362eb63cb"
+SRC_URI[sha256sum] = "dce493c82db673c96049b5fad155a760fa449fab3d92467a69fcb0ddaf3f0fbc"
 
 inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
 
@@ -59,6 +57,8 @@ FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la"
 INSANE_SKIP_${PN} = "libexec dev-so"
 INSANE_SKIP_${PN}-dbg = "libexec"
 
+PRIVATE_LIBS_${PN}-ptest = "libfoo.so"
+
 do_install_append () {
     # install systemd unit file
     install -d ${D}${systemd_unitdir}/system
@@ -111,6 +111,8 @@ do_install_ptest () {
         done
     done
 
+    chrpath --delete ${D}${PTEST_PATH}/tests/utils/testapp/userspace-probe-elf-binary/userspace-probe-elf-binary
+
     #
     # Use the versioned libs of liblttng-ust-dl.
     #
Signature · 1 line
2.17.1
#46 lore raw

PATCH 23/30 cups: update to 2.3.0

In reply to Alexander Kanavin

License-Update: license changed to Apache 2.0

Remove no longer recognized configure options.

Refresh all patches.

---
 meta/recipes-extended/cups/cups.inc           | 14 ++---
 .../cups/cups/0001-cups-Update-to-1.6.1.patch | 27 ++++++++++
 ...don-t-try-to-run-generated-binaries.patch} | 29 ++++++-----
 ...003-cups_1.4.6.bb-Fix-build-on-ppc64.patch | 51 +++++++++++++++++++
 ...fix-multilib-install-file-conflicts.patch} | 12 +++++
 .../cups/cups/cups_serverbin.patch            | 38 --------------
 .../cups/cups/use_echo_only_in_init.patch     | 15 ------
 meta/recipes-extended/cups/cups_2.2.12.bb     |  6 ---
 meta/recipes-extended/cups/cups_2.3.0.bb      |  6 +++
 9 files changed, 117 insertions(+), 81 deletions(-)
 create mode 100644 meta/recipes-extended/cups/cups/0001-cups-Update-to-1.6.1.patch
 rename meta/recipes-extended/cups/cups/{0001-don-t-try-to-run-generated-binaries.patch => 0002-don-t-try-to-run-generated-binaries.patch} (69%)
 create mode 100644 meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch
 rename meta/recipes-extended/cups/cups/{cups-avoid-install-file-conflicts.patch => 0004-cups-fix-multilib-install-file-conflicts.patch} (68%)
 delete mode 100644 meta/recipes-extended/cups/cups/cups_serverbin.patch
 delete mode 100644 meta/recipes-extended/cups/cups/use_echo_only_in_init.patch
 delete mode 100644 meta/recipes-extended/cups/cups_2.2.12.bb
 create mode 100644 meta/recipes-extended/cups/cups_2.3.0.bb
meta/recipes-extended/cups/cups.inc +5 -9
index 2149cbe4cfb..d16eb4c735f 100644
@@ -5,14 +5,14 @@ Protocol (IPP), and has its own filtering driver model for handling various \
 document types."
 HOMEPAGE = "https://www.cups.org/"
 SECTION = "console/utils"
-LICENSE = "GPLv2 & LGPLv2"
+LICENSE = "Apache-2.0"
 DEPENDS = "gnutls libpng jpeg dbus zlib libusb1"
 
 SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.tar.gz \
-           file://use_echo_only_in_init.patch \
-           file://0001-don-t-try-to-run-generated-binaries.patch \
-           file://cups_serverbin.patch \
-           file://cups-avoid-install-file-conflicts.patch \
+           file://0001-cups-Update-to-1.6.1.patch \
+           file://0002-don-t-try-to-run-generated-binaries.patch \
+           file://0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch \
+           file://0004-cups-fix-multilib-install-file-conflicts.patch\
            "
 
 UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases"
@@ -45,10 +45,6 @@ EXTRA_OECONF = " \
                --enable-debug \
                --disable-relro \
                --enable-libusb \
-               --without-php \
-               --without-perl \
-               --without-python \
-               --without-java \
                DSOFLAGS='${LDFLAGS}' \
                "
 
meta/recipes-extended/cups/cups/0001-cups-Update-to-1.6.1.patch new file +27 -0
new file mode 100644
index 00000000000..1cd02e8b324
@@ -0,0 +1,27 @@
+From a3f4d8ba97f4669a95943a7e65eb61aa44ce7999 Mon Sep 17 00:00:00 2001
+From: Saul Wold <[email protected]>
+Date: Thu, 13 Dec 2012 19:03:52 -0800
+Subject: [PATCH 1/4] cups: Update to 1.6.1
+
+Upstream-Status: Inappropriate [embedded specific]
+
+---
+ scheduler/cups.sh.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scheduler/cups.sh.in b/scheduler/cups.sh.in
+index 89ac36d..6618a0f 100644
+--- a/scheduler/cups.sh.in
++++ b/scheduler/cups.sh.in
+@@ -50,7 +50,7 @@ case "`uname`" in
+ 		ECHO_ERROR=:
+ 		;;
+ 
+-	Linux*)
++	DisableLinux*)
+ 		IS_ON=/bin/true
+ 		if test -f /etc/init.d/functions; then
+ 			. /etc/init.d/functions
+-- 
+2.17.1
+
meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch renamed from meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch +16 -13
similarity index 69%
rename from meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch
rename to meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch
index d6a69f28338..ea248e4710a 100644
@@ -1,7 +1,7 @@
-From 1fb07162a9ed187cccf06e34c9bf841d15c6e64e Mon Sep 17 00:00:00 2001
+From 3e9a965dcd65ab2d40b753b6f792a1a4559182aa Mon Sep 17 00:00:00 2001
 From: Koen Kooi <[email protected]>
 Date: Sun, 30 Jan 2011 16:37:27 +0100
-Subject: [PATCH] don't try to run generated binaries
+Subject: [PATCH 2/4] don't try to run generated binaries
 
 Upstream-Status: Inappropriate [embedded specific]
 
@@ -12,13 +12,13 @@ Signed-off-by: Koen Kooi <[email protected]>
  1 file changed, 16 insertions(+), 16 deletions(-)
 
 diff --git a/ppdc/Makefile b/ppdc/Makefile
-index e563988..973dd3f 100644
+index 32e2e0b..f1478d4 100644
 --- a/ppdc/Makefile
 +++ b/ppdc/Makefile
-@@ -189,8 +189,8 @@ genstrings:		genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \
- 	$(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \
- 		libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
- 		$(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+@@ -186,8 +186,8 @@ genstrings:		genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \
+ 	$(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o genstrings genstrings.o \
+ 		libcupsppdc.a $(LINKCUPSSTATIC)
+ 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 -	echo Generating localization strings...
 -	./genstrings >sample.c
 +#	echo Generating localization strings...
@@ -26,9 +26,9 @@ index e563988..973dd3f 100644
  
  
  #
-@@ -209,9 +209,9 @@ ppdc-static:		ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po
- 		../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
- 		$(COMMONLIBS) $(LIBZ)
+@@ -205,9 +205,9 @@ ppdc-static:		ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po
+ 	$(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
+ 		$(LINKCUPSSTATIC)
  	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 -	echo Testing PPD compiler...
 -	./ppdc-static -l en,fr -I ../data foo.drv
@@ -39,9 +39,9 @@ index e563988..973dd3f 100644
  
  
  #
-@@ -240,17 +240,17 @@ ppdi-static:		ppdc-static ppdi.o libcupsppdc.a  ../cups/$(LIBCUPSSTATIC)
- 		../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
- 		$(COMMONLIBS) $(LIBZ)
+@@ -235,17 +235,17 @@ ppdi-static:		ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC)
+ 	$(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \
+ 		$(LINKCUPSSTATIC)
  	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 -	echo Testing PPD importer...
 -	$(RM) -r ppd ppd2 sample-import.drv
@@ -68,3 +68,6 @@ index e563988..973dd3f 100644
  
  
  #
+-- 
+2.17.1
+
meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch new file +51 -0

51 lines not on this page · raw message

meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch renamed from meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch +12 -0
similarity index 68%
rename from meta/recipes-extended/cups/cups/cups-avoid-install-file-conflicts.patch
rename to meta/recipes-extended/cups/cups/0004-cups-fix-multilib-install-file-conflicts.patch
index 68885fa4db0..bc9260307c8 100644
@@ -1,3 +1,8 @@
+From 7dbda1887aa19ab720aff22312f4caff2d575f62 Mon Sep 17 00:00:00 2001
+From: Kai Kang <[email protected]>
+Date: Wed, 3 Oct 2018 00:27:11 +0800
+Subject: [PATCH 4/4] cups: fix multilib install file conflicts
+
 @CUPS_SERVERBIN@ is ${libdir} related that causes multilib install file
 conflict. Remove @CUPS_SERVERBIN@ from the comment line of cups-files.conf to
 avoid the conflict.
@@ -6,6 +11,10 @@ Upstream-Status: Inappropriate [OE specific]
 
 Signed-off-by: Kai Kang <[email protected]>
 
+---
+ conf/cups-files.conf.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
 index 4a78ba6..03c6582 100644
 --- a/conf/cups-files.conf.in
@@ -19,3 +28,6 @@ index 4a78ba6..03c6582 100644
  
  # SSL/TLS keychain for the scheduler...
  #ServerKeychain @CUPS_SERVERKEYCHAIN@
+-- 
+2.17.1
+
meta/recipes-extended/cups/cups/cups_serverbin.patch deleted +0 -38
deleted file mode 100644
index 85c6af10719..00000000000
@@ -1,38 +0,0 @@
-Make CUPS_SERVERBIN relative to libdir otherwise on 64bit arches
-e.g. ppc64 where base libdir is lib64 this does not go well
-
-Signed-off-by: Khem Raj <[email protected]>
-Upstream-Status: Inappropriate [OE config specific]
-
-Update on 20190904:
-Redefine CUPS_SERVERBIN to "$libexecdir/cups" which solves file confliction
-when multilib is enabled.
-
-Signed-off-by: Kai Kang <[email protected]>
-
-Index: cups-1.4.6/config-scripts/cups-directories.m4
-===================================================================
---- cups-1.4.6.orig/config-scripts/cups-directories.m4	2009-04-12 16:04:51.000000000 -0700
-+++ cups-1.4.6/config-scripts/cups-directories.m4	2012-07-21 12:12:05.896405923 -0700
-@@ -397,7 +397,7 @@
- 	*)
- 		# All others
- 		INSTALL_SYSV="install-sysv"
--		CUPS_SERVERBIN="$exec_prefix/lib/cups"
-+		CUPS_SERVERBIN="$libexecdir/cups"
- 		;;
- esac
- 
-Index: cups-1.4.6/configure
-===================================================================
---- cups-1.4.6.orig/configure	2012-07-21 12:13:34.512405950 -0700
-+++ cups-1.4.6/configure	2012-07-21 12:14:05.724406017 -0700
-@@ -11181,7 +11181,7 @@
- 	*)
- 		# All others
- 		INSTALL_SYSV="install-sysv"
--		CUPS_SERVERBIN="$exec_prefix/lib/cups"
-+		CUPS_SERVERBIN="$libexecdir/cups"
- 		;;
- esac
- 
meta/recipes-extended/cups/cups/use_echo_only_in_init.patch deleted +0 -15
deleted file mode 100644
index 696f1374d9c..00000000000
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Index: cups-1.6.1/scheduler/cups.sh.in
-===================================================================
---- cups-1.6.1.orig/scheduler/cups.sh.in
-+++ cups-1.6.1/scheduler/cups.sh.in
-@@ -67,7 +67,7 @@ case "`uname`" in
- 		ECHO_ERROR=:
- 		;;
- 
--	Linux*)
-+	DisableLinux*)
- 		IS_ON=/bin/true
- 		if test -f /etc/init.d/functions; then
- 			. /etc/init.d/functions
meta/recipes-extended/cups/cups_2.2.12.bb deleted +0 -6
deleted file mode 100644
index 8e5534a979e..00000000000
@@ -1,6 +0,0 @@
-require cups.inc
-
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f212b4338db0da8cb892e94bf2949460"
-
-SRC_URI[md5sum] = "e763689f7735d3fe95a2943397189e40"
-SRC_URI[sha256sum] = "0f61ab449e4748a24c6ab355b481ff7691247a140d327b2b7526fce34b7f9aa8"
meta/recipes-extended/cups/cups_2.3.0.bb new file +6 -0
new file mode 100644
index 00000000000..ebe2b18fb49
@@ -0,0 +1,6 @@
+require cups.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+SRC_URI[md5sum] = "644f374573f5433fb8a8af3880db6a98"
+SRC_URI[sha256sum] = "acaf0229cf008ea8f06353ffd1bbd62d71dbe88990dd3330650ef87edb95a1a5"
Signature · 1 line
2.17.1
#47 lore raw

Re: [PATCH 23/30] cups: update to 2.3.0

meta/recipes-extended/cups/cups/0001-cups-Update-to-1.6.1.patch line 4

Quoted 13 lines · Alexander Kanavin
(quoted diff) +0 -0

1.6.1.patch b/meta/recipes-extended/cups/cups/0001-cups-Update-to- 1.6.1.patch
new file mode 100644
index 00000000000..1cd02e8b324

meta/recipes-extended/cups/cups/0001-cups-Update-to-1.6.1.patch new file +1 -0
@@ -0,0 +1,27 @@
+From a3f4d8ba97f4669a95943a7e65eb61aa44ce7999 Mon Sep 17 00:00:00

2001

meta/recipes-extended/cups/cups/0001-cups-Update-to-1.6.1.patch new file +3 -0
+From: Saul Wold <[email protected]>
+Date: Thu, 13 Dec 2012 19:03:52 -0800
+Subject: [PATCH 1/4] cups: Update to 1.6.1

Looks like devtool changed the subject of original patch which was use_echo_only_in_init.patch. Perhaps we should change it back so we know why was the patch needed.

Thanks,

Anuj

#48 lore raw

Re: [PATCH 23/30] cups: update to 2.3.0

Quoted 10 lines · Anuj
Quoted 9 lines · Alexander Kanavin
(quoted diff) +0 -0

1.6.1.patch b/meta/recipes-extended/cups/cups/0001-cups-Update-to- 1.6.1.patch
new file mode 100644
index 00000000000..1cd02e8b324

meta/recipes-extended/cups/cups/0001-cups-Update-to-1.6.1.patch new file +1 -0
@@ -0,0 +1,27 @@
+From a3f4d8ba97f4669a95943a7e65eb61aa44ce7999 Mon Sep 17 00:00:00
Quoted 9 lines

meta/recipes-extended/cups/cups/0001-cups-Update-to-1.6.1.patch line 4

Quoted 4 lines

2001

meta/recipes-extended/cups/cups/0001-cups-Update-to-1.6.1.patch new file +3 -0
+From: Saul Wold <[email protected]>
+Date: Thu, 13 Dec 2012 19:03:52 -0800
+Subject: [PATCH 1/4] cups: Update to 1.6.1

Looks like devtool changed the subject of original patch which was use_echo_only_in_init.patch. Perhaps we should change it back so we know why was the patch needed.

Thanks, I have fixed this.

Alex

#49 lore raw

PATCH 24/30 man-pages: update to 5.04

In reply to Alexander Kanavin
---
 .../man-pages/{man-pages_5.03.bb => man-pages_5.04.bb}        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/man-pages/{man-pages_5.03.bb => man-pages_5.04.bb} (87%)
meta/recipes-extended/man-pages/man-pages_5.04.bb renamed from meta/recipes-extended/man-pages/man-pages_5.03.bb +2 -2
similarity index 87%
rename from meta/recipes-extended/man-pages/man-pages_5.03.bb
rename to meta/recipes-extended/man-pages/man-pages_5.04.bb
index 2381ba4348b..be456759fc4 100644
@@ -7,8 +7,8 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://README;md5=794f701617cc03fe50c53257660d8ec4"
 SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz"
 
-SRC_URI[md5sum] = "d1da6babb99cbd269233a35de9d8718e"
-SRC_URI[sha256sum] = "e8bab0b10c6fb3a6d69615edb488f8a27020f3625c4cf43b8451ba206acbb1b8"
+SRC_URI[md5sum] = "14d33d3fe02577a33aab26eb75df39cb"
+SRC_URI[sha256sum] = "8c6ab56b654a6dd00e3759279954a25fc68b258b8f493a75af55ea7b6401fdb2"
 
 inherit manpages
 
Signature · 1 line
2.17.1
#50 lore raw

PATCH 25/30 man-db: update to 2.9.0

In reply to Alexander Kanavin
---
 .../man-db/{man-db_2.8.7.bb => man-db_2.9.0.bb}               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/man-db/{man-db_2.8.7.bb => man-db_2.9.0.bb} (92%)
meta/recipes-extended/man-db/man-db_2.9.0.bb renamed from meta/recipes-extended/man-db/man-db_2.8.7.bb +2 -2
similarity index 92%
rename from meta/recipes-extended/man-db/man-db_2.8.7.bb
rename to meta/recipes-extended/man-db/man-db_2.9.0.bb
index 083b2374aa2..5b017e80234 100644
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343
 SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \
            file://99_mandb \
            file://man_db.conf-avoid-multilib-install-file-conflict.patch"
-SRC_URI[md5sum] = "ec0b23c8314a1654c4d059b2c18ce43d"
-SRC_URI[sha256sum] = "b9cd5bb996305d08bfe9e1114edc30b4c97be807093b88af8033ed1cf9beb326"
+SRC_URI[md5sum] = "897576a19ecbef376a916485608cd790"
+SRC_URI[sha256sum] = "5d4aacd9e8876d6a3203a889860c3524c293c38f04111a3350deab8a6cd3e261"
 
 DEPENDS = "libpipeline gdbm groff-native base-passwd"
 RDEPENDS_${PN} += "base-passwd"
Signature · 1 line
2.17.1
#51 lore raw

PATCH 26/30 ltp: update to 20190930

In reply to Alexander Kanavin

Drop a big pile of backports.

Add a patch to address absent string formatting error.

---
 ...me-check-for-getdents-getdents64-API.patch |  72 --------
 ...option-to-select-libc-implementation.patch |  27 ++-
 ...-17052-Avoid-unsafe-exits-in-threads.patch |  64 -------
 ...meltdown.c-Fix-kernel-symbol-finding.patch |  81 ---------
 ...y-update-for-mm-fix-false-positive-O.patch |  57 -------
 ...medwait01-Fix-wrong-sigset-length-fo.patch |  46 -----
 ...3-wait-for-defunct-tid-to-get-detach.patch |  75 --------
 ...es-fix-an-absent-format-string-issue.patch |  24 +++
 ...thon3-everywhere-to-run-python-scrip.patch | 161 ------------------
 ...x-EFAULT-in-32bit-compatibility-mode.patch |  36 ----
 ...k-for-RES_USE_INET6-during-configure.patch |  68 --------
 ...BC_PREREQ-is-defined-before-using-it.patch |  27 ++-
 ...se-hardcoded-index-0-for-SHM_STAT-te.patch |  82 ---------
 ...11-direct_io-diotest4-drop-MAP_FIXED.patch |  56 ------
 ...st-a-bit-of-code-to-compatiable-with.patch |  64 -------
 .../ltp/{ltp_20190517.bb => ltp_20190930.bb}  |  15 +-
 16 files changed, 51 insertions(+), 904 deletions(-)
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch
 create mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch
 rename meta/recipes-extended/ltp/{ltp_20190517.bb => ltp_20190930.bb} (84%)
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0 -72
deleted file mode 100644
index bfceadb190d..00000000000
@@ -1,72 +0,0 @@
-From 404dfeb4faef213b0450f173b60cd7080edec349 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Fri, 26 Jul 2019 10:32:29 -0700
-Subject: [PATCH 1/2] Add configure time check for getdents/getdents64 APIs
-
-glibc 2.30 has added wrapper for getdents64 this will help in detecting
-right condition to use fallback
-
-Check for getdents API as well while here
-
-Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2019-July/012954.html]
-Signed-off-by: Khem Raj <[email protected]>
----
- configure.ac                                  | 2 ++
- testcases/kernel/syscalls/getdents/getdents.h | 8 ++++++--
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -65,6 +65,8 @@ AC_CHECK_FUNCS([ \
-     fallocate \
-     fchownat \
-     fstatat \
-+    getdents \
-+    getdents64 \
-     kcmp \
-     mkdirat \
-     mknodat \
---- a/testcases/kernel/syscalls/getdents/getdents.h
-+++ b/testcases/kernel/syscalls/getdents/getdents.h
-@@ -23,7 +23,7 @@
- #include <stdint.h>
- #include "test.h"
- #include "lapi/syscalls.h"
--
-+#include "config.h"
- /*
-  * See fs/compat.c struct compat_linux_dirent
-  */
-@@ -34,12 +34,17 @@ struct linux_dirent {
- 	char            d_name[];
- };
- 
-+#if HAVE_GETDENTS
-+#include <unistd.h>
-+#else
- static inline int
- getdents(unsigned int fd, struct linux_dirent *dirp, unsigned int size)
- {
- 	return ltp_syscall(__NR_getdents, fd, dirp, size);
- }
- 
-+#endif /* HAVE_GETDENTS */
-+
- struct linux_dirent64 {
- 	uint64_t	d_ino;
- 	int64_t		d_off;
-@@ -48,10 +53,13 @@ struct linux_dirent64 {
- 	char		d_name[];
- };
- 
-+#if HAVE_GETDENTS64
-+#include <unistd.h>
-+#else
- static inline int
- getdents64(unsigned int fd, struct linux_dirent64 *dirp64, unsigned int size)
- {
- 	return ltp_syscall(__NR_getdents64, fd, dirp64, size);
- }
--
-+#endif /* HAVE_GETDENTS64 */
- #endif /* GETDENTS_H */
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +13 -14
index b5c25c56a57..1705abcf196 100644
@@ -1,4 +1,4 @@
-From ec282980e6eee96f5b74aba464141f86049263e6 Mon Sep 17 00:00:00 2001
+From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Thu, 7 Jan 2016 18:19:03 +0000
 Subject: [PATCH] build: Add option to select libc implementation
@@ -12,6 +12,7 @@ Disable tests specifically not building _yet_ on musl based systems
 Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <[email protected]>
+
 ---
  Makefile                                    | 5 +++++
  testcases/kernel/Makefile                   | 5 ++++-
@@ -24,7 +25,7 @@ Signed-off-by: Khem Raj <[email protected]>
  8 files changed, 35 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 768ca46..e9d679a 100644
+index 768ca4606..e9d679a71 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -41,6 +41,11 @@ vpath %.mk		$(top_srcdir)/mk:$(top_srcdir)/mk/include
@@ -40,18 +41,19 @@ index 768ca46..e9d679a 100644
  # 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/Makefile b/testcases/kernel/Makefile
-index 39d79c7..24a57d9 100644
+index 3319b3163..94ea362c8 100644
 --- a/testcases/kernel/Makefile
 +++ b/testcases/kernel/Makefile
-@@ -49,12 +49,15 @@ SUBDIRS			+= connectors \
+@@ -49,13 +49,16 @@ SUBDIRS			+= connectors \
  			   logging \
  			   mem \
  			   numa \
 -			   pty \
  			   sched \
  			   security \
- 			   timers \
+ 			   sound \
  			   tracing \
+ 			   uevents \
  
 +ifneq ($(LIBC),musl)
 +SUBDIRS			+= pty
@@ -61,7 +63,7 @@ index 39d79c7..24a57d9 100644
  SUBDIRS			+= power_management
  endif
 diff --git a/testcases/kernel/sched/Makefile b/testcases/kernel/sched/Makefile
-index 6a57d79..74bb933 100644
+index 6a57d79ee..74bb93370 100644
 --- a/testcases/kernel/sched/Makefile
 +++ b/testcases/kernel/sched/Makefile
 @@ -23,5 +23,7 @@
@@ -74,7 +76,7 @@ index 6a57d79..74bb933 100644
 +endif
  include $(top_srcdir)/include/mk/generic_trunk_target.mk
 diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile
-index 45a00cf..d1becd0 100644
+index 45a00cf7d..d1becd054 100644
 --- a/testcases/kernel/syscalls/Makefile
 +++ b/testcases/kernel/syscalls/Makefile
 @@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1)
@@ -90,7 +92,7 @@ index 45a00cf..d1becd0 100644
  ifeq ($(UCLIBC),1)
  FILTER_OUT_DIRS	+= profil
 diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile
-index 8c55a6b..f7cda62 100644
+index 8c55a6bbd..f7cda621d 100644
 --- a/testcases/network/nfsv4/acl/Makefile
 +++ b/testcases/network/nfsv4/acl/Makefile
 @@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk
@@ -103,7 +105,7 @@ index 8c55a6b..f7cda62 100644
 +
  include $(top_srcdir)/include/mk/generic_leaf_target.mk
 diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile
-index 66e9d56..ea8eb8a 100644
+index 66e9d5675..ea8eb8a98 100644
 --- a/testcases/network/rpc/basic_tests/Makefile
 +++ b/testcases/network/rpc/basic_tests/Makefile
 @@ -23,4 +23,9 @@
@@ -117,7 +119,7 @@ index 66e9d56..ea8eb8a 100644
 +
  include $(top_srcdir)/include/mk/generic_trunk_target.mk
 diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile
-index 68616a7..748754b 100644
+index 68616a711..748754bb4 100644
 --- a/testcases/realtime/func/pi-tests/Makefile
 +++ b/testcases/realtime/func/pi-tests/Makefile
 @@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk
@@ -131,7 +133,7 @@ index 68616a7..748754b 100644
  
  include $(top_srcdir)/include/mk/generic_leaf_target.mk
 diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile
-index 1881f75..266e0b8 100644
+index 1881f7565..266e0b815 100644
 --- a/testcases/realtime/stress/pi-tests/Makefile
 +++ b/testcases/realtime/stress/pi-tests/Makefile
 @@ -24,4 +24,9 @@ top_srcdir		?= ../../../..
@@ -144,6 +146,3 @@ index 1881f75..266e0b8 100644
 +endif
 +
  include $(top_srcdir)/include/mk/generic_leaf_target.mk
--- 
-2.7.4
-
meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch deleted +0 -64

64 lines not on this page · raw message

meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0 -81

81 lines not on this page · raw message

meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch deleted +0 -57

57 lines not on this page · raw message

meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0 -46

46 lines not on this page · raw message

meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0 -75

75 lines not on this page · raw message

meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch new file +24 -0
new file mode 100644
index 00000000000..93308445098
@@ -0,0 +1,24 @@
+From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Thu, 12 Dec 2019 17:56:02 +0100
+Subject: [PATCH] testcases: fix an absent format string issue
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c     | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c
+index 27dbc6626..19d943d06 100644
+--- a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c
++++ b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c
+@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void)
+ 
+ 		/* Manipulate PID for next process */
+ 		sprintf(pid_str, "%d", pid - 1);
+-		SAFE_FILE_PRINTF(last_pid_file, pid_str);
++		SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str);
+ 
+ 		new_pid = SAFE_FORK();
+ 		if (new_pid == 0) {
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0 -161

161 lines not on this page · raw message

meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch deleted +0 -36
deleted file mode 100644
index c936b788fe1..00000000000
@@ -1,36 +0,0 @@
-From 156776a3e29491b363fdc9811912e1298655d060 Mon Sep 17 00:00:00 2001
-From: Steven Price <[email protected]>
-Date: Fri, 19 Jul 2019 13:48:17 +0100
-Subject: [PATCH] ustat02: Fix EFAULT in 32bit compatibility mode
-
-The size of dev_t is larger than 32 bits which causes the dev argument
-to be passed incorrectly. On Arm this means that the EFAULT test case
-actually returns EINVAL because the device number isn't recognised.
-
-Signed-off-by: Steven Price <[email protected]>
-Acked-by: Li Wang <[email protected]>
-
-Upstream-Status: Backport
-[https://github.com/linux-test-project/ltp/commit/156776a3e29491b363fdc9811912e1298655d060]
-
-Signed-off-by: He Zhe <[email protected]>
----
- testcases/kernel/syscalls/ustat/ustat02.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testcases/kernel/syscalls/ustat/ustat02.c b/testcases/kernel/syscalls/ustat/ustat02.c
-index 9bbe4f3..1a0e9e0 100644
---- a/testcases/kernel/syscalls/ustat/ustat02.c
-+++ b/testcases/kernel/syscalls/ustat/ustat02.c
-@@ -36,7 +36,7 @@ int TST_TOTAL = ARRAY_SIZE(tc);
- 
- void run(unsigned int test)
- {
--	TEST(tst_syscall(__NR_ustat, *tc[test].dev, tc[test].buf));
-+	TEST(tst_syscall(__NR_ustat, (unsigned int)*tc[test].dev, tc[test].buf));
- 
- 	if ((TST_RET == -1) && (TST_ERR == tc[test].exp_errno))
- 		tst_res(TPASS | TTERRNO, "ustat(2) expected failure");
--- 
-2.7.4
-
meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch deleted +0 -68

68 lines not on this page · raw message

meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +12 -15
index c0f69ecf5fc..df3e8831f54 100644
@@ -1,4 +1,4 @@
-From 29ce9fdab3bd34e69d73b5b890795559c06553f7 Mon Sep 17 00:00:00 2001
+From 1ce47a6ed811fd78ed04ea2f82e6321c6bca57b6 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Thu, 7 Jan 2016 19:40:08 +0000
 Subject: [PATCH] Check if __GLIBC_PREREQ is defined before using it
@@ -10,16 +10,17 @@ Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <[email protected]>
 Signed-off-by: Yi Zhao <[email protected]>
+
 ---
  testcases/kernel/syscalls/accept4/accept4_01.c | 7 +++++++
  1 file changed, 7 insertions(+)
 
 diff --git a/testcases/kernel/syscalls/accept4/accept4_01.c b/testcases/kernel/syscalls/accept4/accept4_01.c
-index dd289cf..76aa969 100644
+index 29e18f27d..07444a46f 100644
 --- a/testcases/kernel/syscalls/accept4/accept4_01.c
 +++ b/testcases/kernel/syscalls/accept4/accept4_01.c
 @@ -38,6 +38,7 @@
- static struct sockaddr_in conn_addr;
+ static struct sockaddr_in *conn_addr, *accept_addr;
  static int listening_fd;
  
 +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
@@ -34,25 +35,21 @@ index dd289cf..76aa969 100644
  
  static int create_listening_socket(void)
  {
-@@ -115,6 +117,7 @@ static void verify_accept4(unsigned int nr)
- 	SAFE_CONNECT(connfd, (struct sockaddr *)&conn_addr, sizeof(conn_addr));
- 	addrlen = sizeof(claddr);
+@@ -114,12 +116,17 @@ static void verify_accept4(unsigned int nr)
+ 	SAFE_CONNECT(connfd, (struct sockaddr *)conn_addr, sizeof(*conn_addr));
+ 	addrlen = sizeof(*accept_addr);
  
 +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
  #if !(__GLIBC_PREREQ(2, 10))
- 	TEST(accept4_01(listening_fd, (struct sockaddr *)&claddr, &addrlen,
+ 	TEST(accept4_01(listening_fd, (struct sockaddr *)accept_addr, &addrlen,
  				tcase->cloexec | tcase->nonblock));
-@@ -122,6 +125,10 @@ static void verify_accept4(unsigned int nr)
- 	TEST(accept4(listening_fd, (struct sockaddr *)&claddr, &addrlen,
+ #else
+ 	TEST(accept4(listening_fd, (struct sockaddr *)accept_addr, &addrlen,
  				tcase->cloexec | tcase->nonblock));
- #endif
++#endif
 +#else
 +	TEST(accept4(listening_fd, (struct sockaddr *)&claddr, &addrlen,
 +				tcase->cloexec | tcase->nonblock));
-+#endif
+ #endif
  	if (TST_RET == -1) {
  		if (TST_ERR == ENOSYS)
- 			tst_brk(TCONF, "syscall __NR_accept4 not supported");
--- 
-2.7.4
-
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0 -82

82 lines not on this page · raw message

meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch deleted +0 -56

56 lines not on this page · raw message

meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch deleted +0 -64

64 lines not on this page · raw message

meta/recipes-extended/ltp/ltp_20190930.bb renamed from meta/recipes-extended/ltp/ltp_20190517.bb +2 -13
similarity index 84%
rename from meta/recipes-extended/ltp/ltp_20190517.bb
rename to meta/recipes-extended/ltp/ltp_20190930.bb
index 60f749b4c01..9a436a52303 100644
@@ -27,7 +27,7 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer"
 
 CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
 CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
-SRCREV = "ac33ef87f0b9dc56533026435be3ea8c67ce86d2"
+SRCREV = "c9707b465a08397569920b676345474f44327200"
 
 SRC_URI = "git://github.com/linux-test-project/ltp.git \
            file://0001-build-Add-option-to-select-libc-implementation.patch \
@@ -38,19 +38,8 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
            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://0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch \
-           file://0011-direct_io-diotest4-drop-MAP_FIXED.patch \
-           file://0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch \
-           file://0001-Add-configure-time-check-for-getdents-getdents64-API.patch \
-           file://0002-check-for-RES_USE_INET6-during-configure.patch \
-           file://0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch \
-           file://0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch \
-           file://0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch \
-           file://0001-testcases-use-python3-everywhere-to-run-python-scrip.patch \
-           file://0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch \
-           file://0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch \
-           file://0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch \
            file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \
+           file://0001-testcases-fix-an-absent-format-string-issue.patch \
            "
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.17.1
#52 lore raw

Re: [PATCH 26/30] ltp: update to 20190930

musl build fails on aarch64

https://errors.yoctoproject.org/Errors/Details/297288/

Quoted 1,223 lines · Alexander Kanavin

Drop a big pile of backports.

Add a patch to address absent string formatting error.

---
 ...me-check-for-getdents-getdents64-API.patch |  72 --------
 ...option-to-select-libc-implementation.patch |  27 ++-
 ...-17052-Avoid-unsafe-exits-in-threads.patch |  64 -------
 ...meltdown.c-Fix-kernel-symbol-finding.patch |  81 ---------
 ...y-update-for-mm-fix-false-positive-O.patch |  57 -------
 ...medwait01-Fix-wrong-sigset-length-fo.patch |  46 -----
 ...3-wait-for-defunct-tid-to-get-detach.patch |  75 --------
 ...es-fix-an-absent-format-string-issue.patch |  24 +++
 ...thon3-everywhere-to-run-python-scrip.patch | 161 ------------------
 ...x-EFAULT-in-32bit-compatibility-mode.patch |  36 ----
 ...k-for-RES_USE_INET6-during-configure.patch |  68 --------
 ...BC_PREREQ-is-defined-before-using-it.patch |  27 ++-
 ...se-hardcoded-index-0-for-SHM_STAT-te.patch |  82 ---------
 ...11-direct_io-diotest4-drop-MAP_FIXED.patch |  56 ------
 ...st-a-bit-of-code-to-compatiable-with.patch |  64 -------
 .../ltp/{ltp_20190517.bb => ltp_20190930.bb}  |  15 +-
 16 files changed, 51 insertions(+), 904 deletions(-)
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch
 create mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch
 rename meta/recipes-extended/ltp/{ltp_20190517.bb => ltp_20190930.bb} (84%)
meta/recipes-extended/ltp/ltp/0001-Add-configure-time-check-for-getdents-getdents64-API.patch deleted +0 -72
deleted file mode 100644
index bfceadb190d..00000000000
@@ -1,72 +0,0 @@
-From 404dfeb4faef213b0450f173b60cd7080edec349 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Fri, 26 Jul 2019 10:32:29 -0700
-Subject: [PATCH 1/2] Add configure time check for getdents/getdents64 APIs
-
-glibc 2.30 has added wrapper for getdents64 this will help in detecting
-right condition to use fallback
-
-Check for getdents API as well while here
-
-Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2019-July/012954.html]
-Signed-off-by: Khem Raj <[email protected]>
----
- configure.ac                                  | 2 ++
- testcases/kernel/syscalls/getdents/getdents.h | 8 ++++++--
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -65,6 +65,8 @@ AC_CHECK_FUNCS([ \
-     fallocate \
-     fchownat \
-     fstatat \
-+    getdents \
-+    getdents64 \
-     kcmp \
-     mkdirat \
-     mknodat \
---- a/testcases/kernel/syscalls/getdents/getdents.h
-+++ b/testcases/kernel/syscalls/getdents/getdents.h
-@@ -23,7 +23,7 @@
- #include <stdint.h>
- #include "test.h"
- #include "lapi/syscalls.h"
--
-+#include "config.h"
- /*
-  * See fs/compat.c struct compat_linux_dirent
-  */
-@@ -34,12 +34,17 @@ struct linux_dirent {
-       char            d_name[];
- };
-
-+#if HAVE_GETDENTS
-+#include <unistd.h>
-+#else
- static inline int
- getdents(unsigned int fd, struct linux_dirent *dirp, unsigned int size)
- {
-       return ltp_syscall(__NR_getdents, fd, dirp, size);
- }
-
-+#endif /* HAVE_GETDENTS */
-+
- struct linux_dirent64 {
-       uint64_t        d_ino;
-       int64_t         d_off;
-@@ -48,10 +53,13 @@ struct linux_dirent64 {
-       char            d_name[];
- };
-
-+#if HAVE_GETDENTS64
-+#include <unistd.h>
-+#else
- static inline int
- getdents64(unsigned int fd, struct linux_dirent64 *dirp64, unsigned int size)
- {
-       return ltp_syscall(__NR_getdents64, fd, dirp64, size);
- }
--
-+#endif /* HAVE_GETDENTS64 */
- #endif /* GETDENTS_H */
meta/recipes-extended/ltp/ltp/0001-build-Add-option-to-select-libc-implementation.patch +13 -14
index b5c25c56a57..1705abcf196 100644
@@ -1,4 +1,4 @@
-From ec282980e6eee96f5b74aba464141f86049263e6 Mon Sep 17 00:00:00 2001
+From 62c3481c73a2414d7a5f0a70808bfc9a06195bd9 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Thu, 7 Jan 2016 18:19:03 +0000
 Subject: [PATCH] build: Add option to select libc implementation
@@ -12,6 +12,7 @@ Disable tests specifically not building _yet_ on musl based systems
 Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <[email protected]>
+
 ---
  Makefile                                    | 5 +++++
  testcases/kernel/Makefile                   | 5 ++++-
@@ -24,7 +25,7 @@ Signed-off-by: Khem Raj <[email protected]>
  8 files changed, 35 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 768ca46..e9d679a 100644
+index 768ca4606..e9d679a71 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -41,6 +41,11 @@ vpath %.mk          $(top_srcdir)/mk:$(top_srcdir)/mk/include
@@ -40,18 +41,19 @@ index 768ca46..e9d679a 100644
  # 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/Makefile b/testcases/kernel/Makefile
-index 39d79c7..24a57d9 100644
+index 3319b3163..94ea362c8 100644
 --- a/testcases/kernel/Makefile
 +++ b/testcases/kernel/Makefile
-@@ -49,12 +49,15 @@ SUBDIRS                    += connectors \
+@@ -49,13 +49,16 @@ SUBDIRS                    += connectors \
                           logging \
                           mem \
                           numa \
 -                         pty \
                           sched \
                           security \
-                          timers \
+                          sound \
                           tracing \
+                          uevents \
 
 +ifneq ($(LIBC),musl)
 +SUBDIRS                       += pty
@@ -61,7 +63,7 @@ index 39d79c7..24a57d9 100644
  SUBDIRS                       += power_management
  endif
 diff --git a/testcases/kernel/sched/Makefile b/testcases/kernel/sched/Makefile
-index 6a57d79..74bb933 100644
+index 6a57d79ee..74bb93370 100644
 --- a/testcases/kernel/sched/Makefile
 +++ b/testcases/kernel/sched/Makefile
 @@ -23,5 +23,7 @@
@@ -74,7 +76,7 @@ index 6a57d79..74bb933 100644
 +endif
  include $(top_srcdir)/include/mk/generic_trunk_target.mk
 diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile
-index 45a00cf..d1becd0 100644
+index 45a00cf7d..d1becd054 100644
 --- a/testcases/kernel/syscalls/Makefile
 +++ b/testcases/kernel/syscalls/Makefile
 @@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1)
@@ -90,7 +92,7 @@ index 45a00cf..d1becd0 100644
  ifeq ($(UCLIBC),1)
  FILTER_OUT_DIRS       += profil
 diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile
-index 8c55a6b..f7cda62 100644
+index 8c55a6bbd..f7cda621d 100644
 --- a/testcases/network/nfsv4/acl/Makefile
 +++ b/testcases/network/nfsv4/acl/Makefile
 @@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk
@@ -103,7 +105,7 @@ index 8c55a6b..f7cda62 100644
 +
  include $(top_srcdir)/include/mk/generic_leaf_target.mk
 diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile
-index 66e9d56..ea8eb8a 100644
+index 66e9d5675..ea8eb8a98 100644
 --- a/testcases/network/rpc/basic_tests/Makefile
 +++ b/testcases/network/rpc/basic_tests/Makefile
 @@ -23,4 +23,9 @@
@@ -117,7 +119,7 @@ index 66e9d56..ea8eb8a 100644
 +
  include $(top_srcdir)/include/mk/generic_trunk_target.mk
 diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile
-index 68616a7..748754b 100644
+index 68616a711..748754bb4 100644
 --- a/testcases/realtime/func/pi-tests/Makefile
 +++ b/testcases/realtime/func/pi-tests/Makefile
 @@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk
@@ -131,7 +133,7 @@ index 68616a7..748754b 100644
 
  include $(top_srcdir)/include/mk/generic_leaf_target.mk
 diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile
-index 1881f75..266e0b8 100644
+index 1881f7565..266e0b815 100644
 --- a/testcases/realtime/stress/pi-tests/Makefile
 +++ b/testcases/realtime/stress/pi-tests/Makefile
 @@ -24,4 +24,9 @@ top_srcdir           ?= ../../../..
@@ -144,6 +146,3 @@ index 1881f75..266e0b8 100644
 +endif
 +
  include $(top_srcdir)/include/mk/generic_leaf_target.mk
---
-2.7.4
-
meta/recipes-extended/ltp/ltp/0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch deleted +0 -64
deleted file mode 100644
index cc40081300c..00000000000
@@ -1,64 +0,0 @@
-From e3a8502d0a4f8a44ddd02ca4b2efc097133fb9f7 Mon Sep 17 00:00:00 2001
-From: Mathias Fiedler <[email protected]>
-Date: Fri, 23 Aug 2019 12:46:48 +0200
-Subject: [PATCH] cve-2017-17052: Avoid unsafe exits in threads
-
-According to manpage exit(3) calling exit is not thread-safe.
-And with glibc 2.28 (and probably also with glibc >=2.27) sometimes
-child processes created in fork_thread can get stuck on process exit in
-glibc's __run_exit_handlers trying to acquire some lock which was in
-locked state while the fork was created. This can happen when exit is
-called in mmap_thread concurrently to the fork.
-While the main process will still return with PASSED some of its
-children are left behind.
-
-Comparing the source code with the original program as described in the
-commit 2b7e8665b4ff51c034c55df3cff76518d1a9ee3a of linux kernel >=4.13
-the exits in mmap_thread and fork_thread should not be necessary to
-trigger the original bug.
-
-Therefore those exit calls are removed. The mmap_thread and fork_thread
-should still exit when their corresponding main thread in do_test_fork
-calls exit_group. The remaining exit in do_test_fork will be called in
-the main thread without any concurrent thread in the same process.
-
-Signed-off-by: Mathias Fiedler <[email protected]>
-Acked-by: Cyril Hrubis <[email protected]>
-Acked-by: Jan Stancek <[email protected]>
-
-Upstream-Status: Backport
-[https://github.com/linux-test-project/ltp/commit/9f0b452c1af4bcb54da35711eb3fa77334a350b4]
-
-CVE: CVE-2017-17052
-
-Signed-off-by: He Zhe <[email protected]>
----
- testcases/cve/cve-2017-17052.c | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/testcases/cve/cve-2017-17052.c b/testcases/cve/cve-2017-17052.c
-index d7da7e919..18cd2a6d7 100644
---- a/testcases/cve/cve-2017-17052.c
-+++ b/testcases/cve/cve-2017-17052.c
-@@ -58,8 +58,6 @@ static void *mmap_thread(void *arg)
-       for (;;) {
-               SAFE_MMAP(NULL, 0x1000000, PROT_READ,
-                               MAP_POPULATE|MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
--              if (*do_exit)
--                      exit(0);
-       }
-
-       return arg;
-@@ -67,9 +65,6 @@ static void *mmap_thread(void *arg)
-
- static void *fork_thread(void *arg)
- {
--      if (*do_exit)
--              exit(0);
--
-       usleep(rand() % 10000);
-       SAFE_FORK();
-
---
-2.17.1
-
meta/recipes-extended/ltp/ltp/0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch deleted +0 -81
deleted file mode 100644
index 94f6f5a15a6..00000000000
@@ -1,81 +0,0 @@
-From fbeda82f440a0098be42dd668cbc47212a86ab48 Mon Sep 17 00:00:00 2001
-From: He Zhe <[email protected]>
-Date: Wed, 21 Aug 2019 16:27:24 +0800
-Subject: [PATCH] cve/meltdown.c: Fix kernel symbol finding
-
-meltdown case fails as below.
-safe_file_ops.c:219: BROK: Expected 3 conversions got 2 at meltdown.c:272
-
-find_kernel_symbol is defined to try twice with each of /proc/kallsyms and
-/boot/System.map-%s. Currently if the symbol is not found in /proc/kallsyms,
-when kernel option CONFIG_KALLSYMS_ALL is disabled, it would stop the case
-immediately due to SAFE_FILE_LINES_SCANF.
-
-This patch turns to use FILE_LINES_SCANF to give find_kernel_symbol second
-chance.
-
-[jstancek] Fix also condition introduced in 7709d2ae92ea, even if
-           /proc/kallsyms is disabled, we still want to try System.map.
-
-Signed-off-by: He Zhe <[email protected]>
-Signed-off-by: Jan Stancek <[email protected]>
-
-Upstream-Status: Backport
-[https://github.com/linux-test-project/ltp/commit/c2049b5c874bc071f8185bffb5fd7dcb042d9ec8]
-
-Remove the hunk for upstream 7709d2ae92ea ("cve/meltdown.c: abort the test if kallsyms was not enabled")
-that has been covered by this patch.
-
-Signed-off-by: He Zhe <[email protected]>
----
- testcases/cve/meltdown.c | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/testcases/cve/meltdown.c b/testcases/cve/meltdown.c
-index a53ea9b..22651a6 100644
---- a/testcases/cve/meltdown.c
-+++ b/testcases/cve/meltdown.c
-@@ -267,9 +267,15 @@ find_symbol_in_file(const char *filename, const char *symname)
-       int ret, read;
-       char fmt[strlen(symname) + 64];
-
-+      tst_res(TINFO, "Looking for %s in %s", symname, filename);
-+      if (access(filename, F_OK) == -1) {
-+              tst_res(TINFO, "%s not available", filename);
-+              return 0;
-+      }
-+
-       sprintf(fmt, "%%lx %%c %s%%c", symname);
-
--      ret = SAFE_FILE_LINES_SCANF(filename, fmt, &addr, &type, &read);
-+      ret = FILE_LINES_SCANF(filename, fmt, &addr, &type, &read);
-       if (ret)
-               return 0;
-
-@@ -287,13 +293,11 @@ find_kernel_symbol(const char *name)
-       if (addr)
-               return addr;
-
--      tst_res(TINFO, "not found '%s' in /proc/kallsyms", name);
-       if (uname(&utsname) < 0)
-               tst_brk(TBROK | TERRNO, "uname");
-
-       sprintf(systemmap, "/boot/System.map-%s", utsname.release);
-
--      tst_res(TINFO, "looking in '%s'\n", systemmap);
-       addr = find_symbol_in_file(systemmap, name);
-       return addr;
- }
-@@ -308,6 +312,9 @@ static void setup(void)
-       saved_cmdline_addr = find_kernel_symbol("saved_command_line");
-       tst_res(TINFO, "&saved_command_line == 0x%lx", saved_cmdline_addr);
-
-+      if (!saved_cmdline_addr)
-+              tst_brk(TCONF, "saved_command_line not found");
-+
-       spec_fd = SAFE_OPEN("/proc/cmdline", O_RDONLY);
-
-       memset(target_array, 1, sizeof(target_array));
---
-2.7.4
-
meta/recipes-extended/ltp/ltp/0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch deleted +0 -57
deleted file mode 100644
index bed84712a15..00000000000
@@ -1,57 +0,0 @@
-From d656a447893dccc310c975a239f482278550c3e0 Mon Sep 17 00:00:00 2001
-From: Jan Stancek <[email protected]>
-Date: Tue, 21 May 2019 10:10:44 +0200
-Subject: [PATCH] overcommit_memory: update for "mm: fix false-positive
- OVERCOMMIT_GUESS failures"
-
-commit 8c7829b04c52 ("mm: fix false-positive OVERCOMMIT_GUESS failures")
-changes logic of __vm_enough_memory(), simplifying it to:
-    When in GUESS mode, catch wild allocations by comparing their request
-    size to total amount of ram and swap in the system.
-
-Testcase currently allocates mem_total + swap_total, which doesn't trigger
-new condition. Make it more extreme, but assuming free_total / 2 will PASS,
-and 2*sum_total will FAIL.
-
-Signed-off-by: Jan Stancek <[email protected]>
-Acked-by: Cyril Hrubis <[email protected]>
-
-Upstream-Status: Backport [https://github.com/linux-test-project/ltp/commit/d656a447893dccc310c975a239f482278550c3e0]
-Signed-off-by: He Zhe <[email protected]>
----
- testcases/kernel/mem/tunable/overcommit_memory.c | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/testcases/kernel/mem/tunable/overcommit_memory.c b/testcases/kernel/mem/tunable/overcommit_memory.c
-index 555298f..345764d 100644
---- a/testcases/kernel/mem/tunable/overcommit_memory.c
-+++ b/testcases/kernel/mem/tunable/overcommit_memory.c
-@@ -36,11 +36,10 @@
-  *
-  * The program is designed to test the two tunables:
-  *
-- * When overcommit_memory = 0, allocatable memory can't overextends
-- * the amount of free memory. I choose the three cases:
-+ * When overcommit_memory = 0, allocatable memory can't overextend
-+ * the amount of total memory:
-  * a. less than free_total:    free_total / 2, alloc should pass.
-- * b. greater than free_total: free_total * 2, alloc should fail.
-- * c. equal to sum_total:      sum_tatal,      alloc should fail
-+ * b. greater than sum_total:   sum_total * 2, alloc should fail.
-  *
-  * When overcommit_memory = 1, it can alloc enough much memory, I
-  * choose the three cases:
-@@ -164,9 +163,7 @@ static void overcommit_memory_test(void)
-
-       update_mem();
-       alloc_and_check(free_total / 2, EXPECT_PASS);
--      update_mem();
--      alloc_and_check(free_total * 2, EXPECT_FAIL);
--      alloc_and_check(sum_total, EXPECT_FAIL);
-+      alloc_and_check(sum_total * 2, EXPECT_FAIL);
-
-       /* start to test overcommit_memory=1 */
-       set_sys_tune("overcommit_memory", 1, 1);
---
-2.7.4
-
meta/recipes-extended/ltp/ltp/0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch deleted +0 -46
deleted file mode 100644
index 0e56c08255e..00000000000
@@ -1,46 +0,0 @@
-From a5046625eaeed2d3fba456c3ba84c6c141c2ad7c Mon Sep 17 00:00:00 2001
-From: He Zhe <[email protected]>
-Date: Thu, 29 Aug 2019 21:09:46 +0800
-Subject: [PATCH] syscall/rt_sigtimedwait01: Fix wrong sigset length for MIPS
-
-rt_sigtimedwait01 fails as follow on MIPS arches
-rt_sigtimedwait01    1  TFAIL  :  .../sigwaitinfo01.c:58: test_empty_set
-(.../sigwaitinfo01.c: 148): Unexpected failure:
-TEST_ERRNO=EINVAL(22): Invalid argument
-
-As this case purposely bypasses glibc, it should align with the size of kernel
-definition of sigset_t which is different from other arches.
-https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/mips/include/uapi/asm/signal.h#n15
-
-This patch turns to use _NSIG which is always right for all arches.
-
-Upstream-Status: Backport [a5046625eaeed2d3fba456c3ba84c6c141c2ad7c]
-
-Suggested-by: Jan Stancek <[email protected]>
-Acked-by: Jan Stancek <[email protected]>
-Acked-by: Cyril Hrubis <[email protected]>
-Signed-off-by: He Zhe <[email protected]>
-Signed-off-by: Petr Vorel <[email protected]>
----
- testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c
-index 5a32ce1..6a30c27 100644
---- a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c
-+++ b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c
-@@ -128,9 +128,8 @@ static int my_sigtimedwait(const sigset_t * set, siginfo_t * info,
- static int my_rt_sigtimedwait(const sigset_t * set, siginfo_t * info,
-                             struct timespec *timeout)
- {
--
--      /* The last argument is (number_of_signals)/(bits_per_byte), which are 64 and 8, resp. */
--      return ltp_syscall(__NR_rt_sigtimedwait, set, info, timeout, 8);
-+      /* _NSIG is always the right number of bits of signal map for all arches */
-+      return ltp_syscall(__NR_rt_sigtimedwait, set, info, timeout, _NSIG/8);
- }
- #endif
-
---
-2.7.4
-
meta/recipes-extended/ltp/ltp/0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch deleted +0 -75
deleted file mode 100644
index 6ea26150fbf..00000000000
@@ -1,75 +0,0 @@
-From e747d0456adc080a1d31fb653bda9dc491795c80 Mon Sep 17 00:00:00 2001
-From: Jan Stancek <[email protected]>
-Date: Sun, 16 Jun 2019 11:14:16 +0200
-Subject: [PATCH] syscalls/tgkill03: wait for defunct tid to get detached
-
-Case where defunct tid is used has been observed to sporadically fail:
-  tgkill03.c:96: FAIL: Defunct tid should have failed with ESRCH: SUCCESS
-
-glibc __pthread_timedjoin_ex() waits for CLONE_CHILD_CLEARTID to clear tid,
-and then resumes. Kernel clears it (glibc pd->tid) at:
-  do_exit
-    exit_mm
-      mm_release
-        put_user(0, tsk->clear_child_tid);
-
-but kernel tid is still valid, presumably until:
-  release_task
-    __exit_signal
-      __unhash_process
-        detach_pid
-
-To avoid race wait until /proc/<pid>/task/<tid> disappears.
-
-Signed-off-by: Jan Stancek <[email protected]>
-Reviewed-by: Li Wang <[email protected]>
-Acked-by: Sumit Garg <[email protected]>
-
-Upstream-Status: Backport
-[https://github.com/linux-test-project/ltp/commit/e747d0456adc080a1d31fb653bda9dc491795c80]
-
-Signed-off-by: He Zhe <[email protected]>
----
- testcases/kernel/syscalls/tgkill/tgkill03.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/testcases/kernel/syscalls/tgkill/tgkill03.c b/testcases/kernel/syscalls/tgkill/tgkill03.c
-index f5bbdc5..593a217 100644
---- a/testcases/kernel/syscalls/tgkill/tgkill03.c
-+++ b/testcases/kernel/syscalls/tgkill/tgkill03.c
-@@ -7,6 +7,7 @@
-
- #include <pthread.h>
- #include <pwd.h>
-+#include <stdio.h>
- #include <sys/types.h>
-
- #include "tst_safe_pthread.h"
-@@ -42,6 +43,7 @@ static void setup(void)
- {
-       sigset_t sigusr1;
-       pthread_t defunct_thread;
-+      char defunct_tid_path[PATH_MAX];
-
-       sigemptyset(&sigusr1);
-       sigaddset(&sigusr1, SIGUSR1);
-@@ -55,8 +57,9 @@ static void setup(void)
-       TST_CHECKPOINT_WAIT(0);
-
-       SAFE_PTHREAD_CREATE(&defunct_thread, NULL, defunct_thread_func, NULL);
--
-       SAFE_PTHREAD_JOIN(defunct_thread, NULL);
-+      sprintf(defunct_tid_path, "/proc/%d/task/%d", getpid(), defunct_tid);
-+      TST_RETRY_FN_EXP_BACKOFF(access(defunct_tid_path, R_OK), -1, 15);
- }
-
- static void cleanup(void)
-@@ -108,4 +111,5 @@ static struct tst_test test = {
-       .setup = setup,
-       .cleanup = cleanup,
-       .test = run,
-+      .timeout = 20,
- };
---
-2.7.4
-
meta/recipes-extended/ltp/ltp/0001-testcases-fix-an-absent-format-string-issue.patch new file +24 -0
new file mode 100644
index 00000000000..93308445098
@@ -0,0 +1,24 @@
+From 476ce907fa18042cdde0a244ba9a46cd895ce76c Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Thu, 12 Dec 2019 17:56:02 +0100
+Subject: [PATCH] testcases: fix an absent format string issue
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ .../kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c     | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c
+index 27dbc6626..19d943d06 100644
+--- a/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c
++++ b/testcases/kernel/syscalls/pidfd_send_signal/pidfd_send_signal03.c
+@@ -59,7 +59,7 @@ static void verify_pidfd_send_signal(void)
+
+               /* Manipulate PID for next process */
+               sprintf(pid_str, "%d", pid - 1);
+-              SAFE_FILE_PRINTF(last_pid_file, pid_str);
++              SAFE_FILE_PRINTF(last_pid_file, "%s", pid_str);
+
+               new_pid = SAFE_FORK();
+               if (new_pid == 0) {
meta/recipes-extended/ltp/ltp/0001-testcases-use-python3-everywhere-to-run-python-scrip.patch deleted +0 -161
deleted file mode 100644
index f4f87f38ab7..00000000000
@@ -1,161 +0,0 @@
-From 0463d793566772a606255957915f99d166d5740c Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Wed, 28 Aug 2019 18:30:23 +0200
-Subject: [PATCH] testcases: use python3 everywhere to run python scripts
-
-The scripts themselves have #!/usr/bin/python3 in them,
-so I trust they are already py3-compatible.
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- testcases/kernel/power_management/runpwtests05.sh  |  2 +-
- .../power_management/runpwtests_exclusive01.sh     |  2 +-
- .../power_management/runpwtests_exclusive02.sh     |  2 +-
- .../power_management/runpwtests_exclusive03.sh     |  2 +-
- .../power_management/runpwtests_exclusive04.sh     |  2 +-
- .../power_management/runpwtests_exclusive05.sh     |  2 +-
- testcases/network/nfsv4/acl/runtest                | 14 +++++++-------
- testcases/realtime/func/pi-tests/run_auto.sh       |  6 +++---
- 8 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/testcases/kernel/power_management/runpwtests05.sh b/testcases/kernel/power_management/runpwtests05.sh
-index 8a7d0f6e0..43e234d01 100755
---- a/testcases/kernel/power_management/runpwtests05.sh
-+++ b/testcases/kernel/power_management/runpwtests05.sh
-@@ -35,7 +35,7 @@ else
-       max_sched_smt=1
- fi
-
--tst_test_cmds python
-+tst_test_cmds python3
-
- if ! grep sched_debug -qw /proc/cmdline ; then
-       tst_brkm TCONF "Kernel cmdline parameter 'sched_debug' needed," \
-diff --git a/testcases/kernel/power_management/runpwtests_exclusive01.sh b/testcases/kernel/power_management/runpwtests_exclusive01.sh
-index ec78319e2..9fefcbf6e 100755
---- a/testcases/kernel/power_management/runpwtests_exclusive01.sh
-+++ b/testcases/kernel/power_management/runpwtests_exclusive01.sh
-@@ -35,7 +35,7 @@ else
-       max_sched_smt=1
- fi
-
--tst_test_cmds python
-+tst_test_cmds python3
-
- hyper_threaded=$(is_hyper_threaded)
- multi_socket=$(is_multi_socket)
-diff --git a/testcases/kernel/power_management/runpwtests_exclusive02.sh b/testcases/kernel/power_management/runpwtests_exclusive02.sh
-index e107fce35..2cd0ecb05 100755
---- a/testcases/kernel/power_management/runpwtests_exclusive02.sh
-+++ b/testcases/kernel/power_management/runpwtests_exclusive02.sh
-@@ -33,7 +33,7 @@ else
-       max_sched_smt=1
- fi
-
--tst_test_cmds python
-+tst_test_cmds python3
-
- hyper_threaded=$(is_hyper_threaded)
- multi_socket=$(is_multi_socket)
-diff --git a/testcases/kernel/power_management/runpwtests_exclusive03.sh b/testcases/kernel/power_management/runpwtests_exclusive03.sh
-index 490344bb3..ab3a5d11d 100755
---- a/testcases/kernel/power_management/runpwtests_exclusive03.sh
-+++ b/testcases/kernel/power_management/runpwtests_exclusive03.sh
-@@ -35,7 +35,7 @@ else
-       max_sched_smt=1
- fi
-
--tst_test_cmds python
-+tst_test_cmds python3
-
- hyper_threaded=$(is_hyper_threaded)
- multi_socket=$(is_multi_socket)
-diff --git a/testcases/kernel/power_management/runpwtests_exclusive04.sh b/testcases/kernel/power_management/runpwtests_exclusive04.sh
-index 978ca02ae..438ef603f 100755
---- a/testcases/kernel/power_management/runpwtests_exclusive04.sh
-+++ b/testcases/kernel/power_management/runpwtests_exclusive04.sh
-@@ -27,7 +27,7 @@ export TST_TOTAL=2
- # Checking test environment
- check_kervel_arch
-
--tst_test_cmds python
-+tst_test_cmds python3
-
- hyper_threaded=$(is_hyper_threaded)
- multi_socket=$(is_multi_socket)
-diff --git a/testcases/kernel/power_management/runpwtests_exclusive05.sh b/testcases/kernel/power_management/runpwtests_exclusive05.sh
-index a0dad5834..3a9afdbf2 100755
---- a/testcases/kernel/power_management/runpwtests_exclusive05.sh
-+++ b/testcases/kernel/power_management/runpwtests_exclusive05.sh
-@@ -35,7 +35,7 @@ else
-       max_sched_smt=1
- fi
-
--tst_test_cmds python
-+tst_test_cmds python3
-
- hyper_threaded=$(is_hyper_threaded)
- multi_socket=$(is_multi_socket)
-diff --git a/testcases/network/nfsv4/acl/runtest b/testcases/network/nfsv4/acl/runtest
-index d2e1b4c49..a859e85bc 100755
---- a/testcases/network/nfsv4/acl/runtest
-+++ b/testcases/network/nfsv4/acl/runtest
-@@ -22,7 +22,7 @@ do
- done
-
- #  creation of users on the remote machine (removed only at the end of the tests)
--rsh -n $REMOTEHOST python $PWD/create_users.py -u 50 -g 50
-+rsh -n $REMOTEHOST python3 $PWD/create_users.py -u 50 -g 50
-
- echo "Starting ACL testing"
-
-@@ -51,19 +51,19 @@ echo "Basic tests finished"
-
- echo "LONG ACL TEST"
- echo "creating necessary users and groups"
--python create_users.py -u 50 -g 50
-+python3 create_users.py -u 50 -g 50
- echo "creating necessary users and groups on the remote host"
- mkdir $NFSMNTDIR/lacl-testdir
--python test_long_acl.py -l $MAXLENGTH -p $NFSMNTDIR/lacl-testdir
-+python3 test_long_acl.py -l $MAXLENGTH -p $NFSMNTDIR/lacl-testdir
- rm -rf $NFSMNTDIR/lacl-testdir
- echo "Long ACL test OK with $MAXLENGTH entries"
- echo "ACL STRESSING TEST"
--python setacl_stress.py -n 100 -u $USER_NB -g $GRP_NB -f $FILE_NB -p $NFSMNTDIR
-+python3 setacl_stress.py -n 100 -u $USER_NB -g $GRP_NB -f $FILE_NB -p $NFSMNTDIR
-
- # remove local an remote users
--python cleanusers.py
--python cleangroups.py
--rsh -n $REMOTEHOST python $PWD/cleanusers.py
-+python3 cleanusers.py
-+python3 cleangroups.py
-+rsh -n $REMOTEHOST python3 $PWD/cleanusers.py
-
- echo "Test OK"
-
-diff --git a/testcases/realtime/func/pi-tests/run_auto.sh b/testcases/realtime/func/pi-tests/run_auto.sh
-index d13026049..277988568 100755
---- a/testcases/realtime/func/pi-tests/run_auto.sh
-+++ b/testcases/realtime/func/pi-tests/run_auto.sh
-@@ -15,15 +15,15 @@ $SCRIPTS_DIR/run_c_files.sh $profile testpi-0
-
- export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-1.log"
- $SCRIPTS_DIR/run_c_files.sh $profile testpi-1
--PYTHONPATH=../../  python parse-testpi1.py $LOG_FILE 2>&1 | tee -a $LOG_FILE
-+PYTHONPATH=../../  python3 parse-testpi1.py $LOG_FILE 2>&1 | tee -a $LOG_FILE
-
- export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-2.log"
- $SCRIPTS_DIR/run_c_files.sh $profile testpi-2
--PYTHONPATH=../../  python parse-testpi2.py $LOG_FILE 2>&1 | tee -a $LOG_FILE
-+PYTHONPATH=../../  python3 parse-testpi2.py $LOG_FILE 2>&1 | tee -a $LOG_FILE
-
- export LOG_FILE="$LOG_DIR/$LOG_FORMAT-testpi-4.log"
- $SCRIPTS_DIR/run_c_files.sh $profile testpi-4
--PYTHONPATH=../../  python parse-testpi1.py $LOG_FILE 2>&1 | tee -a $LOG_FILE
-+PYTHONPATH=../../  python3 parse-testpi1.py $LOG_FILE 2>&1 | tee -a $LOG_FILE
-
-
- export LOG_FILE=""
meta/recipes-extended/ltp/ltp/0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch deleted +0 -36
deleted file mode 100644
index c936b788fe1..00000000000
@@ -1,36 +0,0 @@
-From 156776a3e29491b363fdc9811912e1298655d060 Mon Sep 17 00:00:00 2001
-From: Steven Price <[email protected]>
-Date: Fri, 19 Jul 2019 13:48:17 +0100
-Subject: [PATCH] ustat02: Fix EFAULT in 32bit compatibility mode
-
-The size of dev_t is larger than 32 bits which causes the dev argument
-to be passed incorrectly. On Arm this means that the EFAULT test case
-actually returns EINVAL because the device number isn't recognised.
-
-Signed-off-by: Steven Price <[email protected]>
-Acked-by: Li Wang <[email protected]>
-
-Upstream-Status: Backport
-[https://github.com/linux-test-project/ltp/commit/156776a3e29491b363fdc9811912e1298655d060]
-
-Signed-off-by: He Zhe <[email protected]>
----
- testcases/kernel/syscalls/ustat/ustat02.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testcases/kernel/syscalls/ustat/ustat02.c b/testcases/kernel/syscalls/ustat/ustat02.c
-index 9bbe4f3..1a0e9e0 100644
---- a/testcases/kernel/syscalls/ustat/ustat02.c
-+++ b/testcases/kernel/syscalls/ustat/ustat02.c
-@@ -36,7 +36,7 @@ int TST_TOTAL = ARRAY_SIZE(tc);
-
- void run(unsigned int test)
- {
--      TEST(tst_syscall(__NR_ustat, *tc[test].dev, tc[test].buf));
-+      TEST(tst_syscall(__NR_ustat, (unsigned int)*tc[test].dev, tc[test].buf));
-
-       if ((TST_RET == -1) && (TST_ERR == tc[test].exp_errno))
-               tst_res(TPASS | TTERRNO, "ustat(2) expected failure");
---
-2.7.4
-
meta/recipes-extended/ltp/ltp/0002-check-for-RES_USE_INET6-during-configure.patch deleted +0 -68
deleted file mode 100644
index 12e47eb2b61..00000000000
@@ -1,68 +0,0 @@
-From 7bc134545b7beb09717a60541530c20a1a5740d3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Fri, 26 Jul 2019 10:55:28 -0700
-Subject: [PATCH 2/2] check for RES_USE_INET6 during configure
-
-glibc 2.30 has remove RES_USE_INET6 define which has been on its way out
-since 2.26 release, this check ensures that we detect it before using it
-
-Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2019-July/012955.html]
-Signed-off-by: Khem Raj <[email protected]>
----
- configure.ac                                        | 13 +++++++++++++
- testcases/network/multicast/mc_gethost/mc_gethost.c |  6 ++++++
- 2 files changed, 19 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 2255b5c181..ed7acccb01 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -91,6 +91,19 @@ AC_CHECK_FUNCS([ \
-     vmsplice \
- ])
-
-+#check defines
-+AC_MSG_CHECKING([for RES_USE_INET6])
-+AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <resolv.h>]],
-+  [[char dummy[RES_USE_INET6];]])],
-+  [
-+    AC_MSG_RESULT([yes])
-+    AC_DEFINE_UNQUOTED([HAVE_RES_USE_INET6], 1, [Define to 1 if you have the RES_USE_INET6 macro.])
-+  ],
-+  [
-+    AC_MSG_RESULT([no])
-+    AC_DEFINE_UNQUOTED([HAVE_RES_USE_INET6], 0, [Define to 1 if you have the RES_USE_INET6 macro.])
-+  ]
-+)
- # Tools knobs
-
- # Expect
-diff --git a/testcases/network/multicast/mc_gethost/mc_gethost.c b/testcases/network/multicast/mc_gethost/mc_gethost.c
-index 9cc15d086b..d1cae5441a 100644
---- a/testcases/network/multicast/mc_gethost/mc_gethost.c
-+++ b/testcases/network/multicast/mc_gethost/mc_gethost.c
-@@ -17,6 +17,8 @@
- #include <string.h>
- #include <stdlib.h>
-
-+#include "config.h"
-+
- #ifndef LOG_PERROR
- #define LOG_PERROR 0
- #endif
-@@ -50,8 +52,12 @@ usage:
-               argv++, argc--;
-       }
-       if (argc >= 1 && !strcmp(*argv, "-6")) {
-+#if HAVE_RES_USE_INET6
-               af = AF_INET6, size = IN6ADDRSZ;
-               _res.options |= RES_USE_INET6;
-+#else
-+              af = AF_INET, size = INADDRSZ;
-+#endif
-               argv++, argc--;
-       }
-       if (argc >= 1 && !strcmp(*argv, "-f")) {
---
-2.22.0
-
meta/recipes-extended/ltp/ltp/0003-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch +12 -15
index c0f69ecf5fc..df3e8831f54 100644
@@ -1,4 +1,4 @@
-From 29ce9fdab3bd34e69d73b5b890795559c06553f7 Mon Sep 17 00:00:00 2001
+From 1ce47a6ed811fd78ed04ea2f82e6321c6bca57b6 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Thu, 7 Jan 2016 19:40:08 +0000
 Subject: [PATCH] Check if __GLIBC_PREREQ is defined before using it
@@ -10,16 +10,17 @@ Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <[email protected]>
 Signed-off-by: Yi Zhao <[email protected]>
+
 ---
  testcases/kernel/syscalls/accept4/accept4_01.c | 7 +++++++
  1 file changed, 7 insertions(+)
 
 diff --git a/testcases/kernel/syscalls/accept4/accept4_01.c b/testcases/kernel/syscalls/accept4/accept4_01.c
-index dd289cf..76aa969 100644
+index 29e18f27d..07444a46f 100644
 --- a/testcases/kernel/syscalls/accept4/accept4_01.c
 +++ b/testcases/kernel/syscalls/accept4/accept4_01.c
 @@ -38,6 +38,7 @@
- static struct sockaddr_in conn_addr;
+ static struct sockaddr_in *conn_addr, *accept_addr;
  static int listening_fd;
 
 +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
@@ -34,25 +35,21 @@ index dd289cf..76aa969 100644
 
  static int create_listening_socket(void)
  {
-@@ -115,6 +117,7 @@ static void verify_accept4(unsigned int nr)
-       SAFE_CONNECT(connfd, (struct sockaddr *)&conn_addr, sizeof(conn_addr));
-       addrlen = sizeof(claddr);
+@@ -114,12 +116,17 @@ static void verify_accept4(unsigned int nr)
+       SAFE_CONNECT(connfd, (struct sockaddr *)conn_addr, sizeof(*conn_addr));
+       addrlen = sizeof(*accept_addr);
 
 +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
  #if !(__GLIBC_PREREQ(2, 10))
-       TEST(accept4_01(listening_fd, (struct sockaddr *)&claddr, &addrlen,
+       TEST(accept4_01(listening_fd, (struct sockaddr *)accept_addr, &addrlen,
                                tcase->cloexec | tcase->nonblock));
-@@ -122,6 +125,10 @@ static void verify_accept4(unsigned int nr)
-       TEST(accept4(listening_fd, (struct sockaddr *)&claddr, &addrlen,
+ #else
+       TEST(accept4(listening_fd, (struct sockaddr *)accept_addr, &addrlen,
                                tcase->cloexec | tcase->nonblock));
- #endif
++#endif
 +#else
 +      TEST(accept4(listening_fd, (struct sockaddr *)&claddr, &addrlen,
 +                              tcase->cloexec | tcase->nonblock));
-+#endif
+ #endif
        if (TST_RET == -1) {
                if (TST_ERR == ENOSYS)
-                       tst_brk(TCONF, "syscall __NR_accept4 not supported");
---
-2.7.4
-
meta/recipes-extended/ltp/ltp/0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch deleted +0 -82
deleted file mode 100644
index 8704e5ffe8a..00000000000
@@ -1,82 +0,0 @@
-From 794933b38354a2612cf2c471f11798b306f35315 Mon Sep 17 00:00:00 2001
-From: Jan Stancek <[email protected]>
-Date: Mon, 20 May 2019 20:47:20 +0200
-Subject: [PATCH] shmctl01: don't use hardcoded index == 0 for SHM_STAT test
-
-Test fails on SHM_STAT testcase:
-   shmctl01    5  TFAIL  :  shmctl01.c:173: shmctl01 call failed
-                            errno = 22 : Invalid argument
-   shmctl(0, SHM_STAT, 0x601060)           = -EINVAL
-
-since following commit:
-   commit 99db46ea292780cd978d56932d9445b1e8bdafe8
-   Author: Manfred Spraul <[email protected]>
-   Date:   Tue May 14 15:46:36 2019 -0700
-     ipc: do cyclic id allocation for the ipc object.
-
-Don't rely on index 0 being always available, but instead
-use (maximum) index returned by SHM_INFO.
-
-Signed-off-by: Jan Stancek <[email protected]>
-Reviewed-by: Petr Vorel <[email protected]>
-Acked-by: Cyril Hrubis <[email protected]>
-
-Upstream-Status: Backport
-[https://github.com/linux-test-project/ltp/commit/db0a43d9388be2c347a8306751bbe6bec086d062]
-
-Signed-off-by: Hongzhi Song <[email protected]>
-Signed-off-by: Yi Zhao <[email protected]>
----
- testcases/kernel/syscalls/ipc/shmctl/shmctl01.c | 21 ++++++++++++++++++---
- 1 file changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c b/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c
-index 1b46977..52bf23a 100644
---- a/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c
-+++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c
-@@ -79,6 +79,7 @@ static void func_info(int ret);
-
- /* Check routine for SHM_STAT */
- static void func_sstat(int ret);
-+static void func_sstat_setup(void);
-
- /* Check routine for SHM_LOCK */
- static void func_lock(int ret);
-@@ -110,7 +111,7 @@ static struct test_case_t {
- #endif
-       {&shm_id_1, IPC_SET, &buf, func_set, set_setup},
-       {&shm_id_1, IPC_INFO, (struct shmid_ds *) &info, func_info, NULL},
--      {&shm_index, SHM_STAT, &buf, func_sstat, NULL},
-+      {&shm_index, SHM_STAT, &buf, func_sstat, func_sstat_setup},
-       {&shm_id_1, SHM_LOCK, NULL, func_lock, NULL},
-       {&shm_id_1, SHM_UNLOCK, NULL, func_unlock, NULL},
-       {&shm_id_1, IPC_RMID, NULL, func_rmid, NULL},
-@@ -407,9 +408,23 @@ static void func_info(int ret)
- static void func_sstat(int ret)
- {
-       if (ret >= 0)
--              tst_resm(TPASS, "get correct shared memory id");
-+              tst_resm(TPASS, "get correct shared memory id for index: %d",
-+                      shm_index);
-       else
--              tst_resm(TFAIL, "shared memory id is incorrect");
-+              tst_resm(TFAIL, "shared memory id is incorrect, index: %d",
-+                      shm_index);
-+}
-+
-+static void func_sstat_setup(void)
-+{
-+      struct shm_info tmp;
-+      int ret;
-+
-+      ret = shmctl(shm_id_1, SHM_INFO, (void *)&tmp);
-+      if (ret < 0)
-+              tst_resm(TFAIL|TERRNO, "shmctl(SHM_INFO)");
-+      else
-+              shm_index = ret;
- }
-
- static void func_lock(int ret)
---
-2.7.4
-
meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch deleted +0 -56
deleted file mode 100644
index 9cd188f6567..00000000000
@@ -1,56 +0,0 @@
-From f210d7e19b721041f31b7f258a169f89dc850303 Mon Sep 17 00:00:00 2001
-From: Jan Stancek <[email protected]>
-Date: Thu, 4 Jul 2019 16:45:23 +0200
-Subject: [PATCH] direct_io/diotest4: drop MAP_FIXED
-
-Hongzhi reports that this test is failing on mips64 with 5.1+:
-  diotest4 10 TBROK : diotest4.c:368: can't mmap file: Invalid argument
-  diotest4 11 TBROK : diotest4.c:368: Remaining cases broken
-I could reproduce it on emulated 5kc-malta, running 5.2.0-rc7.
-
-Test is trying to map into area immediately following heap as MAP_SHARED,
-but it used wrong alignment (fixed by 'lapi/mmap.h: include config.h').
-
-Usage of MAP_FIXED seems unnecessary, so drop that too and let the kernel
-pick an address.
-
-Reported-by: Hongzhi.Song <[email protected]>
-Signed-off-by: Jan Stancek <[email protected]>
-Acked-by: Cyril Hrubis <[email protected]>
-
-Upstream-Status: Backport
-[https://github.com/linux-test-project/ltp/commit/f5444eeeabf252b8884b9465d277b6af853819e3]
-
-Signed-off-by: Yi Zhao <[email protected]>
----
- testcases/kernel/io/direct_io/diotest4.c | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/testcases/kernel/io/direct_io/diotest4.c b/testcases/kernel/io/direct_io/diotest4.c
-index e4616e4..bf200cd 100644
---- a/testcases/kernel/io/direct_io/diotest4.c
-+++ b/testcases/kernel/io/direct_io/diotest4.c
-@@ -352,18 +352,14 @@ int main(int argc, char *argv[])
-       total++;
-
-       /* Test-10: read, write to a mmaped file */
--      shm_base = (char *)(((long)sbrk(0) + (shmsz - 1)) & ~(shmsz - 1));
--      if (shm_base == NULL) {
--              tst_brkm(TBROK, cleanup, "sbrk failed: %s", strerror(errno));
--      }
-       offset = 4096;
-       count = bufsize;
-       if ((fd = open(filename, O_DIRECT | O_RDWR)) < 0) {
-               tst_brkm(TBROK, cleanup, "can't open %s: %s",
-                        filename, strerror(errno));
-       }
--      shm_base = mmap(shm_base, 0x100000, PROT_READ | PROT_WRITE,
--                      MAP_SHARED | MAP_FIXED, fd, 0);
-+      shm_base = mmap(0, 0x100000, PROT_READ | PROT_WRITE,
-+                      MAP_SHARED, fd, 0);
-       if (shm_base == (caddr_t) - 1) {
-               tst_brkm(TBROK, cleanup, "can't mmap file: %s",
-                        strerror(errno));
---
-2.7.4
-
meta/recipes-extended/ltp/ltp/0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch deleted +0 -64
deleted file mode 100644
index aecbc80e9b5..00000000000
@@ -1,64 +0,0 @@
-From 4ac747c1f7ff8e2ec2567d6672822e95a9b56e55 Mon Sep 17 00:00:00 2001
-From: "Hongzhi.Song" <[email protected]>
-Date: Mon, 15 Jul 2019 03:39:06 -0400
-Subject: [PATCH] getrlimit03: adjust a bit of code to compatiable with mips32
-
-Error info:
-getrlimit03.c:104: FAIL: __NR_prlimit64(0) had rlim_cur =
-ffffffffffffffff but __NR_getrlimit(0) had rlim_cur = 7fffffff
-
-According to kernel code: [arch/mips/include/uapi/asm/resource.h]
-RLIM_INFINITY is set to 0x7fffffffUL instead of ULONG_MAX on mips32.
-
- /*
- * SuS says limits have to be unsigned.
- * Which makes a ton more sense anyway,
- * but we keep the old value on MIPS32,
- * for compatibility:
- */
- #ifndef __mips64
- # define RLIM_INFINITY      0x7fffffffUL
- #endif
-
-Adding conditional statement about mips to fix this.
-
-Signed-off-by: Jan Stancek <[email protected]>
-Signed-off-by: Hongzhi.Song <[email protected]>
-
-Upstream-Status: Backport
-[https://github.com/linux-test-project/ltp/commit/7a3bca63cd7f059d490b6274f0fdf3247be93fde]
-
-Signed-off-by: Hongzhi.Song <[email protected]>
----
- testcases/kernel/syscalls/getrlimit/getrlimit03.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/testcases/kernel/syscalls/getrlimit/getrlimit03.c b/testcases/kernel/syscalls/getrlimit/getrlimit03.c
-index e4d56c4..319bc49 100644
---- a/testcases/kernel/syscalls/getrlimit/getrlimit03.c
-+++ b/testcases/kernel/syscalls/getrlimit/getrlimit03.c
-@@ -26,6 +26,7 @@
-
- #include "tst_test.h"
- #include "lapi/syscalls.h"
-+#include "lapi/abisize.h"
-
- /**
-  * Linux provides an "old" getrlimit syscall handler that uses signed long,
-@@ -61,7 +62,12 @@ struct rlimit_ulong {
-       unsigned long rlim_cur;
-       unsigned long rlim_max;
- };
--const unsigned long RLIM_INFINITY_UL = ULONG_MAX;
-+
-+#if defined(__mips__) && defined(TST_ABI32)
-+      const unsigned long RLIM_INFINITY_UL = 0x7fffffffUL;
-+#else
-+      const unsigned long RLIM_INFINITY_UL = ULONG_MAX;
-+#endif
-
- static int getrlimit_ulong(int resource, struct rlimit_ulong *rlim)
- {
---
-2.7.4
-
meta/recipes-extended/ltp/ltp_20190930.bb renamed from meta/recipes-extended/ltp/ltp_20190517.bb +2 -14
similarity index 84%
rename from meta/recipes-extended/ltp/ltp_20190517.bb
rename to meta/recipes-extended/ltp/ltp_20190930.bb
index 60f749b4c01..9a436a52303 100644
@@ -27,7 +27,7 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer"
 
 CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
 CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
-SRCREV = "ac33ef87f0b9dc56533026435be3ea8c67ce86d2"
+SRCREV = "c9707b465a08397569920b676345474f44327200"
 
 SRC_URI = "git://github.com/linux-test-project/ltp.git \
            file://0001-build-Add-option-to-select-libc-implementation.patch \
@@ -38,19 +38,8 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
            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://0010-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch \
-           file://0011-direct_io-diotest4-drop-MAP_FIXED.patch \
-           file://0012-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch \
-           file://0001-Add-configure-time-check-for-getdents-getdents64-API.patch \
-           file://0002-check-for-RES_USE_INET6-during-configure.patch \
-           file://0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch \
-           file://0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch \
-           file://0001-cve-meltdown.c-Fix-kernel-symbol-finding.patch \
-           file://0001-testcases-use-python3-everywhere-to-run-python-scrip.patch \
-           file://0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch \
-           file://0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch \
-           file://0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch \
            file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \
+           file://0001-testcases-fix-an-absent-format-string-issue.patch \
            "
 
 S = "${WORKDIR}/git"
--

2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core