* [PATCH 00/11] Packages upgrade
@ 2016-06-12 8:25 Robert Yang
2016-06-12 8:25 ` [PATCH 01/11] autogen-native: 5.18.6 -> 5.18.10 Robert Yang
` (10 more replies)
0 siblings, 11 replies; 14+ messages in thread
From: Robert Yang @ 2016-06-12 8:25 UTC (permalink / raw)
To: openembedded-core
The following changes since commit 207dba5b6eb04c1ae2081bac06724b3b6a198cb3:
oe-pkgdata-util: fix AttributeError (2016-06-07 21:36:09 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/pu
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/pu
Robert Yang (11):
autogen-native: 5.18.6 -> 5.18.10
file: 5.25 -> 5.27
mklibs-native: 0.1.40 -> 0.1.41
git: 2.8.2 -> 2.8.4
make: 4.1 -> 4.2
e2fsprogs: 1.42.99+1.43+git -> 1.43
gnu-efi: 3.0.3 -> 3.0.4
libbsd: 0.8.2 -> 0.8.3
libcap: 2.24 -> 2.25
tcl: 8.6.4 -> 8.6.5
strace: 4.11 -> 4.12
.../gnu-efi-Make-setjmp.S-portable-to-ARM.patch | 50 ----
.../gnu-efi/{gnu-efi_3.0.3.bb => gnu-efi_3.0.4.bb} | 17 +-
...-native_5.18.6.bb => autogen-native_5.18.10.bb} | 5 +-
.../autogen/autogen/redirect-output-dir.patch | 28 --
meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 2 +-
...fs-enable-the-metadata_csum-and-64bit-fea.patch | 34 ---
.../e2fsprogs/e2fsprogs/xattr_ordering.patch | 219 ---------------
.../{e2fsprogs_git.bb => e2fsprogs_1.43..bb} | 5 +-
.../file/{file_5.25.bb => file_5.27.bb} | 2 +-
meta/recipes-devtools/git/git_2.8.2.bb | 11 -
meta/recipes-devtools/git/git_2.8.4.bb | 11 +
...-SV-43434-Handle-NULL-returns-from-ttynam.patch | 0
.../make/{make_4.1.bb => make_4.2.bb} | 6 +-
...bs-native_0.1.40.bb => mklibs-native_0.1.41.bb} | 4 +-
...01-Move-gcc-compat-macros-to-gcc_compat.h.patch | 176 ------------
.../0001-arc-metag-nios2-or1k-tile-fix-build.patch | 117 --------
...1-scm_rights-fd.test-rewrite-without-fork.patch | 198 -------------
.../strace/0001-tests-introduce-libtests.patch | 306 ---------------------
.../0001-tests-scm_rights.c-use-libtests.patch | 54 ----
.../strace/strace/update-gawk-paths.patch | 114 ++++----
.../strace/{strace_4.11.bb => strace_4.12.bb} | 9 +-
.../tcltk/{tcl_8.6.4.bb => tcl_8.6.5.bb} | 4 +-
.../libbsd/{libbsd_0.8.2.bb => libbsd_0.8.3.bb} | 6 +-
.../libcap/{libcap_2.24.bb => libcap_2.25.bb} | 6 +-
24 files changed, 98 insertions(+), 1286 deletions(-)
delete mode 100644 meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-Make-setjmp.S-portable-to-ARM.patch
rename meta/recipes-bsp/gnu-efi/{gnu-efi_3.0.3.bb => gnu-efi_3.0.4.bb} (60%)
rename meta/recipes-devtools/autogen/{autogen-native_5.18.6.bb => autogen-native_5.18.10.bb} (87%)
delete mode 100644 meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch
delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch
delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/xattr_ordering.patch
rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_git.bb => e2fsprogs_1.43..bb} (94%)
rename meta/recipes-devtools/file/{file_5.25.bb => file_5.27.bb} (96%)
delete mode 100644 meta/recipes-devtools/git/git_2.8.2.bb
create mode 100644 meta/recipes-devtools/git/git_2.8.4.bb
rename meta/recipes-devtools/make/{make-4.1 => make-4.2}/0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch (100%)
rename meta/recipes-devtools/make/{make_4.1.bb => make_4.2.bb} (60%)
rename meta/recipes-devtools/mklibs/{mklibs-native_0.1.40.bb => mklibs-native_0.1.41.bb} (84%)
delete mode 100644 meta/recipes-devtools/strace/strace/0001-Move-gcc-compat-macros-to-gcc_compat.h.patch
delete mode 100644 meta/recipes-devtools/strace/strace/0001-arc-metag-nios2-or1k-tile-fix-build.patch
delete mode 100644 meta/recipes-devtools/strace/strace/0001-scm_rights-fd.test-rewrite-without-fork.patch
delete mode 100644 meta/recipes-devtools/strace/strace/0001-tests-introduce-libtests.patch
delete mode 100644 meta/recipes-devtools/strace/strace/0001-tests-scm_rights.c-use-libtests.patch
rename meta/recipes-devtools/strace/{strace_4.11.bb => strace_4.12.bb} (75%)
rename meta/recipes-devtools/tcltk/{tcl_8.6.4.bb => tcl_8.6.5.bb} (95%)
rename meta/recipes-support/libbsd/{libbsd_0.8.2.bb => libbsd_0.8.3.bb} (86%)
rename meta/recipes-support/libcap/{libcap_2.24.bb => libcap_2.25.bb} (92%)
--
2.8.0
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 01/11] autogen-native: 5.18.6 -> 5.18.10
2016-06-12 8:25 [PATCH 00/11] Packages upgrade Robert Yang
@ 2016-06-12 8:25 ` Robert Yang
2016-06-12 8:25 ` [PATCH 02/11] file: 5.25 -> 5.27 Robert Yang
` (9 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2016-06-12 8:25 UTC (permalink / raw)
To: openembedded-core
Removed redirect-output-dir.patch, there is no /tmp/mklibsrc-log.tx, so
the patch is not needed any more.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
...-native_5.18.6.bb => autogen-native_5.18.10.bb} | 5 ++--
.../autogen/autogen/redirect-output-dir.patch | 28 ----------------------
2 files changed, 2 insertions(+), 31 deletions(-)
rename meta/recipes-devtools/autogen/{autogen-native_5.18.6.bb => autogen-native_5.18.10.bb} (87%)
delete mode 100644 meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch
diff --git a/meta/recipes-devtools/autogen/autogen-native_5.18.6.bb b/meta/recipes-devtools/autogen/autogen-native_5.18.10.bb
similarity index 87%
rename from meta/recipes-devtools/autogen/autogen-native_5.18.6.bb
rename to meta/recipes-devtools/autogen/autogen-native_5.18.10.bb
index d77b827..fd52c83 100644
--- a/meta/recipes-devtools/autogen/autogen-native_5.18.6.bb
+++ b/meta/recipes-devtools/autogen/autogen-native_5.18.10.bb
@@ -11,11 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \
file://increase-timeout-limit.patch \
file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch \
- file://redirect-output-dir.patch \
"
-SRC_URI[md5sum] = "fdee403e524c0af3ded6b3becb365671"
-SRC_URI[sha256sum] = "2fc7f12a5ecb3b1e8bd4364aa906b837cff01f80edb7d2fb38ed8b9dfbcd3271"
+SRC_URI[md5sum] = "2d1b5226e1929d0680011df631289571"
+SRC_URI[sha256sum] = "0b8681d9724c481d3b726b5a9e81d3d09dc7f307d1a801c76d0a30d8f843d20a"
UPSTREAM_CHECK_URI = "http://ftp.gnu.org/gnu/autogen/"
UPSTREAM_CHECK_REGEX = "rel(?P<pver>\d+(\.\d+)+)/"
diff --git a/meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch b/meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch
deleted file mode 100644
index fc5a71b..0000000
--- a/meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-[PATCH] redirect the dir of mklibsrc-log.tx
-
-Upstream-Status: Pending
-
-redirect mklibsrc-log.tx to builddir, not /tmp; otherwise mklibsrc-log.tx
-maybe unable to be written if other users is building autogen at the same time.
-
-Signed-off-by: Roy Li <rongqing.li@windriver.com>
----
- pkg/libopts/mklibsrc.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pkg/libopts/mklibsrc.sh b/pkg/libopts/mklibsrc.sh
-index 416b402..d612fbc 100644
---- a/pkg/libopts/mklibsrc.sh
-+++ b/pkg/libopts/mklibsrc.sh
-@@ -19,7 +19,7 @@
- ## with this program. If not, see <http://www.gnu.org/licenses/>.
-
- set -ex
--exec 2> /tmp/mklibsrc-log.tx
-+exec 2> $top_builddir/mklibsrc-log.tx
-
- top_builddir=`cd $top_builddir ; pwd`
- top_srcdir=`cd $top_srcdir ; pwd`
---
-1.9.1
-
--
2.8.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 02/11] file: 5.25 -> 5.27
2016-06-12 8:25 [PATCH 00/11] Packages upgrade Robert Yang
2016-06-12 8:25 ` [PATCH 01/11] autogen-native: 5.18.6 -> 5.18.10 Robert Yang
@ 2016-06-12 8:25 ` Robert Yang
2016-06-12 8:25 ` [PATCH 03/11] mklibs-native: 0.1.40 -> 0.1.41 Robert Yang
` (8 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2016-06-12 8:25 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-devtools/file/{file_5.25.bb => file_5.27.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/file/{file_5.25.bb => file_5.27.bb} (96%)
diff --git a/meta/recipes-devtools/file/file_5.25.bb b/meta/recipes-devtools/file/file_5.27.bb
similarity index 96%
rename from meta/recipes-devtools/file/file_5.25.bb
rename to meta/recipes-devtools/file/file_5.27.bb
index 68bad69..d1bbf6b 100644
--- a/meta/recipes-devtools/file/file_5.25.bb
+++ b/meta/recipes-devtools/file/file_5.27.bb
@@ -20,7 +20,7 @@ SRC_URI = "git://github.com/file/file.git \
file://host-file.patch \
"
-SRCREV = "f45db89ddc91692b662fffbabbdafc7bc4c00f5e"
+SRCREV = "72da5ae78ed7b5ecbbe84c36ddb493f7907099bc"
S = "${WORKDIR}/git"
inherit autotools
--
2.8.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 03/11] mklibs-native: 0.1.40 -> 0.1.41
2016-06-12 8:25 [PATCH 00/11] Packages upgrade Robert Yang
2016-06-12 8:25 ` [PATCH 01/11] autogen-native: 5.18.6 -> 5.18.10 Robert Yang
2016-06-12 8:25 ` [PATCH 02/11] file: 5.25 -> 5.27 Robert Yang
@ 2016-06-12 8:25 ` Robert Yang
2016-06-12 8:25 ` [PATCH 04/11] git: 2.8.2 -> 2.8.4 Robert Yang
` (7 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2016-06-12 8:25 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../mklibs/{mklibs-native_0.1.40.bb => mklibs-native_0.1.41.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/mklibs/{mklibs-native_0.1.40.bb => mklibs-native_0.1.41.bb} (84%)
diff --git a/meta/recipes-devtools/mklibs/mklibs-native_0.1.40.bb b/meta/recipes-devtools/mklibs/mklibs-native_0.1.41.bb
similarity index 84%
rename from meta/recipes-devtools/mklibs/mklibs-native_0.1.40.bb
rename to meta/recipes-devtools/mklibs/mklibs-native_0.1.41.bb
index 59fec29..a5da936 100644
--- a/meta/recipes-devtools/mklibs/mklibs-native_0.1.40.bb
+++ b/meta/recipes-devtools/mklibs/mklibs-native_0.1.41.bb
@@ -15,7 +15,7 @@ SRC_URI = "http://ftp.de.debian.org/debian/pool/main/m/mklibs/${BPN}_${PV}.tar.x
file://fix_cross_compile.patch \
"
-SRC_URI[md5sum] = "e1dafe5f962caa9dc5f2651c0723812a"
-SRC_URI[sha256sum] = "1db24ae779d21ccfed49f22e49a2b7ee43ec0e9197bc206d81cd02f96e91e125"
+SRC_URI[md5sum] = "6b2979876a611717df3d49e7f9cf291d"
+SRC_URI[sha256sum] = "058c7349f8ec8a03b529c546a95cd6426741bd819f1e1211f499273eb4bf5d89"
inherit autotools gettext native pythonnative
--
2.8.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 04/11] git: 2.8.2 -> 2.8.4
2016-06-12 8:25 [PATCH 00/11] Packages upgrade Robert Yang
` (2 preceding siblings ...)
2016-06-12 8:25 ` [PATCH 03/11] mklibs-native: 0.1.40 -> 0.1.41 Robert Yang
@ 2016-06-12 8:25 ` Robert Yang
2016-06-12 8:25 ` [PATCH 05/11] make: 4.1 -> 4.2 Robert Yang
` (6 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2016-06-12 8:25 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-devtools/git/git_2.8.2.bb | 11 -----------
meta/recipes-devtools/git/git_2.8.4.bb | 11 +++++++++++
2 files changed, 11 insertions(+), 11 deletions(-)
delete mode 100644 meta/recipes-devtools/git/git_2.8.2.bb
create mode 100644 meta/recipes-devtools/git/git_2.8.4.bb
diff --git a/meta/recipes-devtools/git/git_2.8.2.bb b/meta/recipes-devtools/git/git_2.8.2.bb
deleted file mode 100644
index b3ce4f8..0000000
--- a/meta/recipes-devtools/git/git_2.8.2.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require git.inc
-
-EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
- ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
- "
-EXTRA_OEMAKE += "NO_GETTEXT=1"
-
-SRC_URI[tarball.md5sum] = "3022d8ebf64b35b9704d5adf54b256f9"
-SRC_URI[tarball.sha256sum] = "a029c37ee2e0bb1efea5c4af827ff5afdb3356ec42fc19c1d40216d99e97e148"
-SRC_URI[manpages.md5sum] = "8c9da11aeb45b4a286ba766e25aaf3ab"
-SRC_URI[manpages.sha256sum] = "82d322211aade626d1eb3bcf3b76730bfdd2fcc9c189950fb0a8bdd69c383e2f"
diff --git a/meta/recipes-devtools/git/git_2.8.4.bb b/meta/recipes-devtools/git/git_2.8.4.bb
new file mode 100644
index 0000000..7f3a89b
--- /dev/null
+++ b/meta/recipes-devtools/git/git_2.8.4.bb
@@ -0,0 +1,11 @@
+require git.inc
+
+EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
+ ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
+ "
+EXTRA_OEMAKE += "NO_GETTEXT=1"
+
+SRC_URI[tarball.md5sum] = "51e5a6b8b7f834b27d91d2268ae10a9c"
+SRC_URI[tarball.sha256sum] = "626e319f8a24fc0866167ea5f6bf3e2f38f69d6cb2e59e150f13709ca3ebf301"
+SRC_URI[manpages.md5sum] = "c4d17feb686ff9be3d6f8762a89cdafe"
+SRC_URI[manpages.sha256sum] = "953a8eadaf4ae96dbad2c3ec12384c677416843917ef83d94b98367ffd55afc0"
--
2.8.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 05/11] make: 4.1 -> 4.2
2016-06-12 8:25 [PATCH 00/11] Packages upgrade Robert Yang
` (3 preceding siblings ...)
2016-06-12 8:25 ` [PATCH 04/11] git: 2.8.2 -> 2.8.4 Robert Yang
@ 2016-06-12 8:25 ` Robert Yang
2016-06-12 8:25 ` [PATCH 06/11] e2fsprogs: 1.42.99+1.43+git -> 1.43 Robert Yang
` (5 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2016-06-12 8:25 UTC (permalink / raw)
To: openembedded-core
Remove backport patch 0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch | 0
meta/recipes-devtools/make/{make_4.1.bb => make_4.2.bb} | 6 ++----
2 files changed, 2 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/make/{make-4.1 => make-4.2}/0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch (100%)
rename meta/recipes-devtools/make/{make_4.1.bb => make_4.2.bb} (60%)
diff --git a/meta/recipes-devtools/make/make-4.1/0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch b/meta/recipes-devtools/make/make-4.2/0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch
similarity index 100%
rename from meta/recipes-devtools/make/make-4.1/0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch
rename to meta/recipes-devtools/make/make-4.2/0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch
diff --git a/meta/recipes-devtools/make/make_4.1.bb b/meta/recipes-devtools/make/make_4.2.bb
similarity index 60%
rename from meta/recipes-devtools/make/make_4.1.bb
rename to meta/recipes-devtools/make/make_4.2.bb
index 78fe0b5..6327d6c 100644
--- a/meta/recipes-devtools/make/make_4.1.bb
+++ b/meta/recipes-devtools/make/make_4.2.bb
@@ -4,11 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4"
require make.inc
-SRC_URI += "file://0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch"
-
EXTRA_OECONF += "--without-guile"
-SRC_URI[md5sum] = "57a7a224a822f94789a587ccbcedff69"
-SRC_URI[sha256sum] = "0bc7613389650ee6a24554b52572a272f7356164fd2c4132b0bcf13123e4fca5"
+SRC_URI[md5sum] = "85ad14d08766201ffe71efa866f4fb91"
+SRC_URI[sha256sum] = "4e5ce3b62fe5d75ff8db92b7f6df91e476d10c3aceebf1639796dc5bfece655f"
BBCLASSEXTEND = "native nativesdk"
--
2.8.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 06/11] e2fsprogs: 1.42.99+1.43+git -> 1.43
2016-06-12 8:25 [PATCH 00/11] Packages upgrade Robert Yang
` (4 preceding siblings ...)
2016-06-12 8:25 ` [PATCH 05/11] make: 4.1 -> 4.2 Robert Yang
@ 2016-06-12 8:25 ` Robert Yang
2016-06-12 8:25 ` [PATCH 07/11] gnu-efi: 3.0.3 -> 3.0.4 Robert Yang
` (4 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2016-06-12 8:25 UTC (permalink / raw)
To: openembedded-core
* Removed patches already in the source:
- Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch
- xattr_ordering.patch
* COPYING -> NOTICE, the md5sum is the same.
* e2fsprogs_git.bb -> e2fsprogs_1.43..bb
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 2 +-
...fs-enable-the-metadata_csum-and-64bit-fea.patch | 34 ----
.../e2fsprogs/e2fsprogs/xattr_ordering.patch | 219 ---------------------
.../{e2fsprogs_git.bb => e2fsprogs_1.43..bb} | 5 +-
4 files changed, 2 insertions(+), 258 deletions(-)
delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch
delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/xattr_ordering.patch
rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_git.bb => e2fsprogs_1.43..bb} (94%)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
index 09e4ea5..74e92f6 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
@@ -9,7 +9,7 @@ LICENSE_e2fsprogs-mke2fs = "GPLv2"
LICENSE_e2fsprogs-fsck = "GPLv2"
LICENSE_e2fsprogs-tune2fs = "GPLv2"
LICENSE_e2fsprogs-badblocks = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b48f21d765b875bd10400975d12c1ca2 \
+LIC_FILES_CHKSUM = "file://NOTICE;md5=b48f21d765b875bd10400975d12c1ca2 \
file://lib/ext2fs/ext2fs.h;beginline=1;endline=9;md5=596a8dedcb4e731c6b21c7a46fba6bef \
file://lib/e2p/e2p.h;beginline=1;endline=7;md5=8a74ade8f9d65095d70ef2d4bf48e36a \
file://lib/uuid/uuid.h.in;beginline=1;endline=32;md5=dbb8079e114a5f841934b99e59c8820a \
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch
deleted file mode 100644
index 656fb6e..0000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0a392baf1874964651115d9f77b0daa6851d1daa Mon Sep 17 00:00:00 2001
-From: Jonathan Liu <net147@gmail.com>
-Date: Tue, 1 Mar 2016 14:28:01 +1100
-Subject: [PATCH] Revert "mke2fs: enable the metadata_csum and 64bit features
- by default"
-
-This reverts commit cd27af3ecb83e8fd1e3eaa14994284a1818c7c15 as we
-don't want to enable features by default that are not supported by
-the latest stable e2fsprogs release.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Jonathan Liu <net147@gmail.com>
----
- misc/mke2fs.conf.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in
-index a049d61..106ee80 100644
---- a/misc/mke2fs.conf.in
-+++ b/misc/mke2fs.conf.in
-@@ -11,7 +11,8 @@
- features = has_journal
- }
- ext4 = {
-- features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize
-+ features = has_journal,extent,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
-+ auto_64-bit_support = 1
- inode_size = 256
- }
- ext4dev = {
---
-2.7.2
-
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/xattr_ordering.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/xattr_ordering.patch
deleted file mode 100644
index 782a7b1..0000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/xattr_ordering.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-From: "Darrick J. Wong" <darrick.wong@oracle.com>
-To: tytso@mit.edu, darrick.wong@oracle.com
-Cc: linux-ext4@vger.kernel.org, Darren Hart <dvhart@linux.intel.com>,
- Richard Purdie <richard.purdie@linuxfoundation.org>
-Date: Sat, 13 Feb 2016 14:38:24 -0800
-Message-ID: <20160213223824.25381.8002.stgit@birch.djwong.org>
-In-Reply-To: <20160213223725.25381.20929.stgit@birch.djwong.org>
-References: <20160213223725.25381.20929.stgit@birch.djwong.org>
-User-Agent: StGit/0.17.1-dirty
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-X-Source-IP: aserv0022.oracle.com [141.146.126.234]
-X-Evolution-Source: 1358860361.4566.33@ted
-Content-Transfer-Encoding: 8bit
-
-Richard Purdie reports that libext2fs doesn't sort attribute keys in
-the xattr block correctly, causing the kernel to return -ENODATA when
-querying attributes that should be there. Therefore, sort attributes
-so that whatever ends up in the xattr block is sorted according to
-what the kernel expects.
-
-Cc: Darren Hart <dvhart@linux.intel.com>
-Reported-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
----
- lib/ext2fs/ext_attr.c | 24 +++++++++++-
- tests/d_xattr_sorting/expect | 29 ++++++++++++++
- tests/d_xattr_sorting/name | 1
- tests/d_xattr_sorting/script | 86 ++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 139 insertions(+), 1 deletion(-)
- create mode 100644 tests/d_xattr_sorting/expect
- create mode 100644 tests/d_xattr_sorting/name
- create mode 100644 tests/d_xattr_sorting/script
-
-Upstream-Status: Submitted
-
-
-diff --git a/lib/ext2fs/ext_attr.c b/lib/ext2fs/ext_attr.c
-index 0a4f8c0..b121837 100644
---- a/lib/ext2fs/ext_attr.c
-+++ b/lib/ext2fs/ext_attr.c
-@@ -254,10 +254,15 @@ static struct ea_name_index ea_names[] = {
- {0, NULL},
- };
-
-+static int find_ea_index(char *fullname, char **name, int *index);
-+
- /* Push empty attributes to the end and inlinedata to the front. */
- static int attr_compare(const void *a, const void *b)
- {
- const struct ext2_xattr *xa = a, *xb = b;
-+ char *xa_suffix, *xb_suffix;
-+ int xa_idx, xb_idx;
-+ int cmp;
-
- if (xa->name == NULL)
- return +1;
-@@ -267,7 +272,24 @@ static int attr_compare(const void *a, const void *b)
- return -1;
- else if (!strcmp(xb->name, "system.data"))
- return +1;
-- return 0;
-+
-+ /*
-+ * Duplicate the kernel's sorting algorithm because xattr blocks
-+ * require sorted keys.
-+ */
-+ xa_suffix = xa->name;
-+ xb_suffix = xb->name;
-+ xa_idx = xb_idx = 0;
-+ find_ea_index(xa->name, &xa_suffix, &xa_idx);
-+ find_ea_index(xb->name, &xb_suffix, &xb_idx);
-+ cmp = xa_idx - xb_idx;
-+ if (cmp)
-+ return cmp;
-+ cmp = strlen(xa_suffix) - strlen(xb_suffix);
-+ if (cmp)
-+ return cmp;
-+ cmp = strcmp(xa_suffix, xb_suffix);
-+ return cmp;
- }
-
- static const char *find_ea_prefix(int index)
-diff --git a/tests/d_xattr_sorting/expect b/tests/d_xattr_sorting/expect
-new file mode 100644
-index 0000000..17da663
---- /dev/null
-+++ b/tests/d_xattr_sorting/expect
-@@ -0,0 +1,29 @@
-+debugfs sort extended attributes
-+mke2fs -Fq -b 1024 test.img 512
-+Exit status is 0
-+ea_set / security.SMEG64 -f /tmp/b
-+Exit status is 0
-+ea_set / security.imb -f /tmp/b
-+Exit status is 0
-+ea_set / user.moo cow
-+Exit status is 0
-+ea_list /
-+Extended attributes:
-+ user.moo = "cow" (3)
-+ security.imb = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" (256)
-+ security.SMEG64 = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" (256)
-+Exit status is 0
-+ea_get / security.imb
-+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-+Exit status is 0
-+ea_get / nosuchea
-+ea_get: Extended attribute key not found while getting extended attribute
-+Exit status is 0
-+e2fsck -yf -N test_filesys
-+Pass 1: Checking inodes, blocks, and sizes
-+Pass 2: Checking directory structure
-+Pass 3: Checking directory connectivity
-+Pass 4: Checking reference counts
-+Pass 5: Checking group summary information
-+test_filesys: 11/64 files (0.0% non-contiguous), 29/512 blocks
-+Exit status is 0
-diff --git a/tests/d_xattr_sorting/name b/tests/d_xattr_sorting/name
-new file mode 100644
-index 0000000..dde8926
---- /dev/null
-+++ b/tests/d_xattr_sorting/name
-@@ -0,0 +1 @@
-+sort extended attributes in debugfs
-diff --git a/tests/d_xattr_sorting/script b/tests/d_xattr_sorting/script
-new file mode 100644
-index 0000000..30c189a
---- /dev/null
-+++ b/tests/d_xattr_sorting/script
-@@ -0,0 +1,86 @@
-+if test -x $DEBUGFS_EXE; then
-+
-+OUT=$test_name.log
-+EXP=$test_dir/expect
-+VERIFY_FSCK_OPT=-yf
-+
-+TEST_DATA=$test_name.tmp
-+VERIFY_DATA=$test_name.ver.tmp
-+
-+echo "debugfs sort extended attributes" > $OUT
-+
-+dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
-+
-+echo "mke2fs -Fq -b 1024 test.img 512" >> $OUT
-+
-+$MKE2FS -Fq $TMPFILE 512 > /dev/null 2>&1
-+status=$?
-+echo Exit status is $status >> $OUT
-+
-+perl -e 'print "x" x 256;' > /tmp/b
-+
-+echo "ea_set / security.SMEG64 -f /tmp/b" > $OUT.new
-+$DEBUGFS -w -R "ea_set / security.SMEG64 -f /tmp/b" $TMPFILE >> $OUT.new 2>&1
-+status=$?
-+echo Exit status is $status >> $OUT.new
-+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-+
-+echo "ea_set / security.imb -f /tmp/b" > $OUT.new
-+$DEBUGFS -w -R "ea_set / security.imb -f /tmp/b" $TMPFILE >> $OUT.new 2>&1
-+status=$?
-+echo Exit status is $status >> $OUT.new
-+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-+
-+echo "ea_set / user.moo cow" > $OUT.new
-+$DEBUGFS -w -R "ea_set / user.moo cow" $TMPFILE >> $OUT.new 2>&1
-+status=$?
-+echo Exit status is $status >> $OUT.new
-+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-+
-+rm -rf /tmp/b
-+
-+echo "ea_list /" > $OUT.new
-+$DEBUGFS -w -R "ea_list /" $TMPFILE >> $OUT.new 2>&1
-+status=$?
-+echo Exit status is $status >> $OUT.new
-+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-+
-+echo "ea_get / security.imb" > $OUT.new
-+$DEBUGFS -w -R "ea_get / security.imb" $TMPFILE >> $OUT.new 2>&1
-+status=$?
-+echo Exit status is $status >> $OUT.new
-+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-+
-+echo "ea_get / nosuchea" > $OUT.new
-+$DEBUGFS -w -R "ea_get / nosuchea" $TMPFILE >> $OUT.new 2>&1
-+status=$?
-+echo Exit status is $status >> $OUT.new
-+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-+
-+echo e2fsck $VERIFY_FSCK_OPT -N test_filesys > $OUT.new
-+$FSCK $VERIFY_FSCK_OPT -N test_filesys $TMPFILE >> $OUT.new 2>&1
-+status=$?
-+echo Exit status is $status >> $OUT.new
-+sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
-+
-+#
-+# Do the verification
-+#
-+
-+rm -f $TMPFILE $OUT.new
-+cmp -s $OUT $EXP
-+status=$?
-+
-+if [ "$status" = 0 ] ; then
-+ echo "$test_name: $test_description: ok"
-+ touch $test_name.ok
-+else
-+ echo "$test_name: $test_description: failed"
-+ diff $DIFF_OPTS $EXP $OUT > $test_name.failed
-+fi
-+
-+unset VERIFY_FSCK_OPT NATIVE_FSCK_OPT OUT EXP TEST_DATA VERIFY_DATA
-+
-+else #if test -x $DEBUGFS_EXE; then
-+ echo "$test_name: $test_description: skipped"
-+fi
-
-
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43..bb
similarity index 94%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43..bb
index 9cde8e4..e4695fb 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43..bb
@@ -6,12 +6,9 @@ SRC_URI += "file://acinclude.m4 \
file://run-ptest \
file://ptest.patch \
file://mkdir.patch \
- file://xattr_ordering.patch \
- file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \
"
-SRCREV = "0f26747167cc9d82df849b0aad387bf824f04544"
-PV = "1.42.99+1.43+git${SRCPV}"
+SRCREV = "d6adf070b0e85f209c0d7f310188b134b5cb7180"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
--
2.8.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 07/11] gnu-efi: 3.0.3 -> 3.0.4
2016-06-12 8:25 [PATCH 00/11] Packages upgrade Robert Yang
` (5 preceding siblings ...)
2016-06-12 8:25 ` [PATCH 06/11] e2fsprogs: 1.42.99+1.43+git -> 1.43 Robert Yang
@ 2016-06-12 8:25 ` Robert Yang
2016-06-14 4:50 ` Maxin B. John
2016-06-12 8:25 ` [PATCH 08/11] libbsd: 0.8.2 -> 0.8.3 Robert Yang
` (3 subsequent siblings)
10 siblings, 1 reply; 14+ messages in thread
From: Robert Yang @ 2016-06-12 8:25 UTC (permalink / raw)
To: openembedded-core
* Remove gnu-efi-Make-setjmp.S-portable-to-ARM.patch since it is already
in the source.
* Updated LIC_FILES_CHKSUM
- The following files are gone:
lib/arm/div64.S
lib/arm/lib1funcs.S
- Updated md5sum for other files, they add the following words, which are
still GPLv2+:
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice and this list of conditions, without modification.
2. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
Alternatively, this software may be distributed 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.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../gnu-efi-Make-setjmp.S-portable-to-ARM.patch | 50 ----------------------
.../gnu-efi/{gnu-efi_3.0.3.bb => gnu-efi_3.0.4.bb} | 17 +++-----
2 files changed, 7 insertions(+), 60 deletions(-)
delete mode 100644 meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-Make-setjmp.S-portable-to-ARM.patch
rename meta/recipes-bsp/gnu-efi/{gnu-efi_3.0.3.bb => gnu-efi_3.0.4.bb} (60%)
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-Make-setjmp.S-portable-to-ARM.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-Make-setjmp.S-portable-to-ARM.patch
deleted file mode 100644
index ced128a..0000000
--- a/meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-Make-setjmp.S-portable-to-ARM.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 8a356d4b6a242ce63b73920d3ed33f88f9e12fe3 Mon Sep 17 00:00:00 2001
-From: Wenzong Fan <wenzong.fan@windriver.com>
-Date: Sun, 6 Sep 2015 05:20:43 -0400
-Subject: [PATCH] gnu-efi: Make setjmp.S portable to ARM
-
-This patch fixes the following error:
-
- .../lib/arm/setjmp.S:18: Error: unrecognized symbol type ""
- .../lib/arm/setjmp.S:26: Error: unrecognized symbol type ""
-
-The problem is the assembly syntax that is used is not portable to ARM,
-where the '@' symbol is a comment:
-
- > Note on targets where the @ character is the start of a comment
- > (eg ARM) then another character is used instead. For example the
- > ARM port uses the % character.
-
-(From https://sourceware.org/binutils/docs-2.25/as/Section.html#Section)
-
-Upstream-Status: Pending
-
-Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
----
- lib/arm/setjmp.S | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/arm/setjmp.S b/lib/arm/setjmp.S
-index 6e3fbf0..85c8705 100644
---- a/lib/arm/setjmp.S
-+++ b/lib/arm/setjmp.S
-@@ -15,7 +15,7 @@ BASIS,
- .text
- .arm
- .globl setjmp
-- .type setjmp, @function
-+ .type setjmp, %function
- setjmp:
- mov r3, r13
- stmia r0, {r3-r12,r14}
-@@ -23,6 +23,6 @@ setjmp:
- bx lr
-
- .globl longjmp
-- .type longjmp, @function
-+ .type longjmp, %function
- longjmp:
- ldmia r0, {r3-r12,r14}
---
-1.9.1
-
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb
similarity index 60%
rename from meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb
rename to meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb
index 6b130a2..6a4acfb 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb
@@ -2,27 +2,24 @@ SUMMARY = "Libraries for producing EFI binaries"
HOMEPAGE = "http://sourceforge.net/projects/gnu-efi/"
SECTION = "devel"
LICENSE = "GPLv2+ | BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://gnuefi/crt0-efi-arm.S;beginline=4;endline=9;md5=2240d7bbdf0928294c2f4a68b14d6591 \
+LIC_FILES_CHKSUM = "file://gnuefi/crt0-efi-arm.S;beginline=4;endline=16;md5=e582764a4776e60c95bf9ab617343d36 \
file://gnuefi/crt0-efi-aarch64.S;beginline=4;endline=16;md5=e582764a4776e60c95bf9ab617343d36 \
file://inc/efishellintf.h;beginline=13;endline=20;md5=202766b79d708eff3cc70fce15fb80c7 \
file://inc/efishellparm.h;beginline=4;endline=11;md5=468b1231b05bbc84bae3a0d5774e3bb5 \
- file://lib/arm/div64.S;beginline=6;endline=12;md5=a96c84f5ad12b4f011f98b5d039242f2 \
- file://lib/arm/math.c;beginline=4;endline=10;md5=64dd1987cee1dcf59d11aa572cfa644e \
- file://lib/arm/initplat.c;beginline=4;endline=10;md5=64dd1987cee1dcf59d11aa572cfa644e \
- file://lib/arm/lib1funcs.S;beginline=9;endline=33;md5=f56d5ebbc87136bc66cfe24db82bcf01 \
- file://lib/aarch64/math.c;beginline=9;endline=33;md5=cfade4c560e033a7bb02dab282872c7d \
- file://lib/aarch64/initplat.c;beginline=9;endline=33;md5=900cb1ffbe3e1ded344102be921830f1 \
+ file://lib/arm/math.c;beginline=2;endline=15;md5=8ed772501da77b2b3345aa6df8744c9e \
+ file://lib/arm/initplat.c;beginline=2;endline=15;md5=8ed772501da77b2b3345aa6df8744c9e \
+ file://lib/aarch64/math.c;beginline=2;endline=15;md5=8ed772501da77b2b3345aa6df8744c9e \
+ file://lib/aarch64/initplat.c;beginline=2;endline=15;md5=8ed772501da77b2b3345aa6df8744c9e \
"
SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
file://parallel-make-archives.patch \
file://lib-Makefile-fix-parallel-issue.patch \
- file://gnu-efi-Make-setjmp.S-portable-to-ARM.patch \
file://gcc46-compatibility.patch \
"
-SRC_URI[md5sum] = "15a4bcbc18a9a5e8110ed955970622e6"
-SRC_URI[sha256sum] = "c530f21a15fd9c214dd92d29a6caa20fac989289267512020b6da1f5e6f5b4cb"
+SRC_URI[md5sum] = "612e0f327f31c4b8468ef55f4eeb9649"
+SRC_URI[sha256sum] = "51a00428c3ccb96db24089ed8394843c4f83cf8f42c6a4dfddb4b7c23f2bf8af"
COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
COMPATIBLE_HOST_armv4 = 'null'
--
2.8.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 08/11] libbsd: 0.8.2 -> 0.8.3
2016-06-12 8:25 [PATCH 00/11] Packages upgrade Robert Yang
` (6 preceding siblings ...)
2016-06-12 8:25 ` [PATCH 07/11] gnu-efi: 3.0.3 -> 3.0.4 Robert Yang
@ 2016-06-12 8:25 ` Robert Yang
2016-06-12 8:25 ` [PATCH 09/11] libcap: 2.24 -> 2.25 Robert Yang
` (2 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2016-06-12 8:25 UTC (permalink / raw)
To: openembedded-core
The LIC_FILES_CHKSUM changed because a word changes: http -> https.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-support/libbsd/{libbsd_0.8.2.bb => libbsd_0.8.3.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-support/libbsd/{libbsd_0.8.2.bb => libbsd_0.8.3.bb} (86%)
diff --git a/meta/recipes-support/libbsd/libbsd_0.8.2.bb b/meta/recipes-support/libbsd/libbsd_0.8.3.bb
similarity index 86%
rename from meta/recipes-support/libbsd/libbsd_0.8.2.bb
rename to meta/recipes-support/libbsd/libbsd_0.8.3.bb
index 3335386..92121ef 100644
--- a/meta/recipes-support/libbsd/libbsd_0.8.2.bb
+++ b/meta/recipes-support/libbsd/libbsd_0.8.3.bb
@@ -30,14 +30,14 @@ HOMEPAGE = "http://libbsd.freedesktop.org/wiki/"
# License: public-domain
# License: public-domain-Colin-Plumb
LICENSE = "BSD-4-Clause & ISC & PD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=145ec05a217d8f879f29cfc5f83084be"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0b9c89d861915b86655b96e5e32fa2aa"
SECTION = "libs"
SRC_URI = " \
http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
"
-SRC_URI[md5sum] = "cdee252ccff978b50ad2336278c506c9"
-SRC_URI[sha256sum] = "b2f644cae94a6e2fe109449c20ad79a0f6ee4faec2205b07eefa0020565e250a"
+SRC_URI[md5sum] = "e935c1bb6cc98a4a43cb1da22795493a"
+SRC_URI[sha256sum] = "934b634f4dfd865b6482650b8f522c70ae65c463529de8be907b53c89c3a34a8"
inherit autotools pkgconfig
--
2.8.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 09/11] libcap: 2.24 -> 2.25
2016-06-12 8:25 [PATCH 00/11] Packages upgrade Robert Yang
` (7 preceding siblings ...)
2016-06-12 8:25 ` [PATCH 08/11] libbsd: 0.8.2 -> 0.8.3 Robert Yang
@ 2016-06-12 8:25 ` Robert Yang
2016-06-12 8:25 ` [PATCH 10/11] tcl: 8.6.4 -> 8.6.5 Robert Yang
2016-06-12 8:25 ` [PATCH 11/11] strace: 4.11 -> 4.12 Robert Yang
10 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2016-06-12 8:25 UTC (permalink / raw)
To: openembedded-core
And fixed do_install:
SBINDIR="${D}${sbindir}" -> SBINDIR="${sbindir}"
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-support/libcap/{libcap_2.24.bb => libcap_2.25.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-support/libcap/{libcap_2.24.bb => libcap_2.25.bb} (92%)
diff --git a/meta/recipes-support/libcap/libcap_2.24.bb b/meta/recipes-support/libcap/libcap_2.25.bb
similarity index 92%
rename from meta/recipes-support/libcap/libcap_2.24.bb
rename to meta/recipes-support/libcap/libcap_2.25.bb
index a701019..865ebb8 100644
--- a/meta/recipes-support/libcap/libcap_2.24.bb
+++ b/meta/recipes-support/libcap/libcap_2.25.bb
@@ -9,8 +9,8 @@ DEPENDS = "hostperl-runtime-native"
SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "d43ab9f680435a7fff35b4ace8d45b80"
-SRC_URI[sha256sum] = "cee4568f78dc851d726fc93f25f4ed91cc223b1fe8259daa4a77158d174e6c65"
+SRC_URI[md5sum] = "6666b839e5d46c2ad33fc8aa2ceb5f77"
+SRC_URI[sha256sum] = "693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162"
inherit lib_package
@@ -54,7 +54,7 @@ do_install() {
${EXTRA_OECONF} \
DESTDIR="${D}" \
prefix="${prefix}" \
- SBINDIR="${D}${sbindir}"
+ SBINDIR="${sbindir}"
}
do_install_append() {
--
2.8.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 10/11] tcl: 8.6.4 -> 8.6.5
2016-06-12 8:25 [PATCH 00/11] Packages upgrade Robert Yang
` (8 preceding siblings ...)
2016-06-12 8:25 ` [PATCH 09/11] libcap: 2.24 -> 2.25 Robert Yang
@ 2016-06-12 8:25 ` Robert Yang
2016-06-12 8:25 ` [PATCH 11/11] strace: 4.11 -> 4.12 Robert Yang
10 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2016-06-12 8:25 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-devtools/tcltk/{tcl_8.6.4.bb => tcl_8.6.5.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/tcltk/{tcl_8.6.4.bb => tcl_8.6.5.bb} (95%)
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.4.bb b/meta/recipes-devtools/tcltk/tcl_8.6.5.bb
similarity index 95%
rename from meta/recipes-devtools/tcltk/tcl_8.6.4.bb
rename to meta/recipes-devtools/tcltk/tcl_8.6.5.bb
index 61be81d..46fc8a7 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.4.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.5.bb
@@ -24,8 +24,8 @@ SRC_URI = "${BASE_SRC_URI} \
file://alter-includedir.patch \
file://run-ptest \
"
-SRC_URI[md5sum] = "d7cbb91f1ded1919370a30edd1534304"
-SRC_URI[sha256sum] = "9e6ed94c981c1d0c5f5fefb8112d06c6bf4d050a7327e95e71d417c416519c8d"
+SRC_URI[md5sum] = "0e6426a4ca9401825fbc6ecf3d89a326"
+SRC_URI[sha256sum] = "ce26d5b9c7504fc25d2f10ef0b82b14cf117315445b5afa9e673ed331830fb53"
SRC_URI_class-native = "${BASE_SRC_URI}"
--
2.8.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 11/11] strace: 4.11 -> 4.12
2016-06-12 8:25 [PATCH 00/11] Packages upgrade Robert Yang
` (9 preceding siblings ...)
2016-06-12 8:25 ` [PATCH 10/11] tcl: 8.6.4 -> 8.6.5 Robert Yang
@ 2016-06-12 8:25 ` Robert Yang
10 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2016-06-12 8:25 UTC (permalink / raw)
To: openembedded-core
* Remove backported patches:
0001-Move-gcc-compat-macros-to-gcc_compat.h.patch
0001-arc-metag-nios2-or1k-tile-fix-build.patch
0001-scm_rights-fd.test-rewrite-without-fork.patch
0001-tests-introduce-libtests.patch
0001-tests-scm_rights.c-use-libtests.patch
* Update update-gawk-paths.patch
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
...01-Move-gcc-compat-macros-to-gcc_compat.h.patch | 176 ------------
.../0001-arc-metag-nios2-or1k-tile-fix-build.patch | 117 --------
...1-scm_rights-fd.test-rewrite-without-fork.patch | 198 -------------
.../strace/0001-tests-introduce-libtests.patch | 306 ---------------------
.../0001-tests-scm_rights.c-use-libtests.patch | 54 ----
.../strace/strace/update-gawk-paths.patch | 114 ++++----
.../strace/{strace_4.11.bb => strace_4.12.bb} | 9 +-
7 files changed, 63 insertions(+), 911 deletions(-)
delete mode 100644 meta/recipes-devtools/strace/strace/0001-Move-gcc-compat-macros-to-gcc_compat.h.patch
delete mode 100644 meta/recipes-devtools/strace/strace/0001-arc-metag-nios2-or1k-tile-fix-build.patch
delete mode 100644 meta/recipes-devtools/strace/strace/0001-scm_rights-fd.test-rewrite-without-fork.patch
delete mode 100644 meta/recipes-devtools/strace/strace/0001-tests-introduce-libtests.patch
delete mode 100644 meta/recipes-devtools/strace/strace/0001-tests-scm_rights.c-use-libtests.patch
rename meta/recipes-devtools/strace/{strace_4.11.bb => strace_4.12.bb} (75%)
diff --git a/meta/recipes-devtools/strace/strace/0001-Move-gcc-compat-macros-to-gcc_compat.h.patch b/meta/recipes-devtools/strace/strace/0001-Move-gcc-compat-macros-to-gcc_compat.h.patch
deleted file mode 100644
index aa61e15..0000000
--- a/meta/recipes-devtools/strace/strace/0001-Move-gcc-compat-macros-to-gcc_compat.h.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From f32126ba790dd4e61d43a2140b24f02426297bb6 Mon Sep 17 00:00:00 2001
-From: "Dmitry V. Levin" <ldv@altlinux.org>
-Date: Thu, 31 Dec 2015 14:19:41 +0000
-Subject: [PATCH] Move gcc compat macros to gcc_compat.h
-
-* defs.h: Include "gcc_compat.h".
-(GNUC_PREREQ, ATTRIBUTE_NORETURN, ATTRIBUTE_FORMAT,
-ATTRIBUTE_ALIGNED, ATTRIBUTE_PACKED, ATTRIBUTE_MALLOC,
-ATTRIBUTE_NOINLINE, ATTRIBUTE_ALLOC_SIZE): Move ...
-* gcc_compat.h: ... here.
-* Makefile.am (strace_SOURCES): Add gcc_compat.h.
----
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Backport
-
- Makefile.am | 1 +
- defs.h | 43 +----------------------------------
- gcc_compat.h | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 75 insertions(+), 42 deletions(-)
- create mode 100644 gcc_compat.h
-
-diff --git a/Makefile.am b/Makefile.am
-index ab52778..d43608d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -97,6 +97,7 @@ strace_SOURCES = \
- flock.c \
- flock.h \
- futex.c \
-+ gcc_compat.h \
- get_robust_list.c \
- getcpu.c \
- getcwd.c \
-diff --git a/defs.h b/defs.h
-index 283ab1f..bae212c 100644
---- a/defs.h
-+++ b/defs.h
-@@ -55,6 +55,7 @@
- #include <sys/syscall.h>
-
- #include "mpers_type.h"
-+#include "gcc_compat.h"
-
- #ifndef HAVE_STRERROR
- const char *strerror(int);
-@@ -68,48 +69,6 @@ const char *strerror(int);
- extern char *stpcpy(char *dst, const char *src);
- #endif
-
--#if defined __GNUC__ && defined __GNUC_MINOR__
--# define GNUC_PREREQ(maj, min) \
-- ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
--#else
--# define __attribute__(x) /* empty */
--# define GNUC_PREREQ(maj, min) 0
--#endif
--
--#if GNUC_PREREQ(2, 5)
--# define ATTRIBUTE_NORETURN __attribute__((__noreturn__))
--#else
--# define ATTRIBUTE_NORETURN /* empty */
--#endif
--
--#if GNUC_PREREQ(2, 7)
--# define ATTRIBUTE_FORMAT(args) __attribute__((__format__ args))
--# define ATTRIBUTE_ALIGNED(arg) __attribute__((__aligned__(arg)))
--# define ATTRIBUTE_PACKED __attribute__((__packed__))
--#else
--# define ATTRIBUTE_FORMAT(args) /* empty */
--# define ATTRIBUTE_ALIGNED(arg) /* empty */
--# define ATTRIBUTE_PACKED /* empty */
--#endif
--
--#if GNUC_PREREQ(3, 0)
--# define ATTRIBUTE_MALLOC __attribute__((__malloc__))
--#else
--# define ATTRIBUTE_MALLOC /* empty */
--#endif
--
--#if GNUC_PREREQ(3, 1)
--# define ATTRIBUTE_NOINLINE __attribute__((__noinline__))
--#else
--# define ATTRIBUTE_NOINLINE /* empty */
--#endif
--
--#if GNUC_PREREQ(4, 3)
--# define ATTRIBUTE_ALLOC_SIZE(args) __attribute__((__alloc_size__ args))
--#else
--# define ATTRIBUTE_ALLOC_SIZE(args) /* empty */
--#endif
--
- #ifndef offsetof
- # define offsetof(type, member) \
- (((char *) &(((type *) NULL)->member)) - ((char *) (type *) NULL))
-diff --git a/gcc_compat.h b/gcc_compat.h
-new file mode 100644
-index 0000000..1f2c835
---- /dev/null
-+++ b/gcc_compat.h
-@@ -0,0 +1,73 @@
-+/*
-+ * Copyright (c) 2015 Dmitry V. Levin <ldv@altlinux.org>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#ifndef GCC_COMPAT_H_
-+#define GCC_COMPAT_H_
-+
-+#if defined __GNUC__ && defined __GNUC_MINOR__
-+# define GNUC_PREREQ(maj, min) \
-+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-+#else
-+# define __attribute__(x) /* empty */
-+# define GNUC_PREREQ(maj, min) 0
-+#endif
-+
-+#if GNUC_PREREQ(2, 5)
-+# define ATTRIBUTE_NORETURN __attribute__((__noreturn__))
-+#else
-+# define ATTRIBUTE_NORETURN /* empty */
-+#endif
-+
-+#if GNUC_PREREQ(2, 7)
-+# define ATTRIBUTE_FORMAT(args) __attribute__((__format__ args))
-+# define ATTRIBUTE_ALIGNED(arg) __attribute__((__aligned__(arg)))
-+# define ATTRIBUTE_PACKED __attribute__((__packed__))
-+#else
-+# define ATTRIBUTE_FORMAT(args) /* empty */
-+# define ATTRIBUTE_ALIGNED(arg) /* empty */
-+# define ATTRIBUTE_PACKED /* empty */
-+#endif
-+
-+#if GNUC_PREREQ(3, 0)
-+# define ATTRIBUTE_MALLOC __attribute__((__malloc__))
-+#else
-+# define ATTRIBUTE_MALLOC /* empty */
-+#endif
-+
-+#if GNUC_PREREQ(3, 1)
-+# define ATTRIBUTE_NOINLINE __attribute__((__noinline__))
-+#else
-+# define ATTRIBUTE_NOINLINE /* empty */
-+#endif
-+
-+#if GNUC_PREREQ(4, 3)
-+# define ATTRIBUTE_ALLOC_SIZE(args) __attribute__((__alloc_size__ args))
-+#else
-+# define ATTRIBUTE_ALLOC_SIZE(args) /* empty */
-+#endif
-+
-+#endif
---
-1.9.1
-
diff --git a/meta/recipes-devtools/strace/strace/0001-arc-metag-nios2-or1k-tile-fix-build.patch b/meta/recipes-devtools/strace/strace/0001-arc-metag-nios2-or1k-tile-fix-build.patch
deleted file mode 100644
index a9d3203..0000000
--- a/meta/recipes-devtools/strace/strace/0001-arc-metag-nios2-or1k-tile-fix-build.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From dd1a80c8d213eed95fe55b7ebcb07ee165dd8e4b Mon Sep 17 00:00:00 2001
-From: "Dmitry V. Levin" <ldv@altlinux.org>
-Date: Thu, 24 Dec 2015 15:40:55 +0000
-Subject: [PATCH] arc, metag, nios2, or1k, tile: fix build
-
-Fix build regression introduced by commit
-34683e3926d8c2daa368afb805da422ee7043396.
-
-* linux/32/syscallent.h: Add sys_ prefix to ARCH_mmap and mmap.
-* linux/arc/syscallent.h: Add sys_ prefix to ARCH_mmap and mmap_pgoff.
-* linux/nios2/syscallent.h: Likewise.
-* linux/or1k/syscallent.h: Likewise.
-* linux/tile/syscallent1.h: Add sys_ prefix to ARCH_mmap and sys_mmap_4koff.
-* pathtrace.c (pathtrace_match): Handle SEN_ARCH_mmap.
-* NEWS: Mention this build fix.
-
-Reported-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
-Signed-off-by: Marek Vasut <marex@denx.de>
-Upstream-Status: Backport
----
- NEWS | 3 +++
- linux/32/syscallent.h | 6 +++---
- linux/arc/syscallent.h | 2 +-
- linux/nios2/syscallent.h | 2 +-
- linux/or1k/syscallent.h | 2 +-
- linux/tile/syscallent1.h | 2 +-
- pathtrace.c | 1 +
- 7 files changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index fe40ca4..09263eb 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,3 +1,9 @@
-+Noteworthy changes in release ?.?? (????-??-??)
-+===============================================
-+
-+* Bug fixes
-+ * Fixed build on arc, metag, nios2, or1k, and tile architectures.
-+
- Noteworthy changes in release 4.11 (2015-12-21)
- ===============================================
-
-diff --git a/linux/32/syscallent.h b/linux/32/syscallent.h
-index 5f997e7..e6f895c 100644
---- a/linux/32/syscallent.h
-+++ b/linux/32/syscallent.h
-@@ -1,5 +1,5 @@
--#ifndef ARCH_mmap
--# define ARCH_mmap mmap
-+#ifndef sys_ARCH_mmap
-+# define sys_ARCH_mmap sys_mmap
- #endif
- [ 0] = { 2, 0, SEN(io_setup), "io_setup" },
- [ 1] = { 1, 0, SEN(io_destroy), "io_destroy" },
-@@ -276,5 +276,5 @@
- [283] = { 2, 0, SEN(membarrier), "membarrier", },
- [284] = { 3, TM, SEN(mlock2), "mlock2" },
-
--#undef ARCH_mmap
-+#undef sys_ARCH_mmap
- #undef ARCH_WANT_SYNC_FILE_RANGE2
-diff --git a/linux/arc/syscallent.h b/linux/arc/syscallent.h
-index 5847dc4..1100008 100644
---- a/linux/arc/syscallent.h
-+++ b/linux/arc/syscallent.h
-@@ -1,4 +1,4 @@
--#define ARCH_mmap mmap_pgoff
-+#define sys_ARCH_mmap sys_mmap_pgoff
- #include "32/syscallent.h"
- [244] = { 3, 0, SEN(printargs), "arc_cacheflush"},
- [245] = { 1, 0, SEN(printargs), "arc_settls" },
-diff --git a/linux/nios2/syscallent.h b/linux/nios2/syscallent.h
-index 8a4b70e..01efe3a 100644
---- a/linux/nios2/syscallent.h
-+++ b/linux/nios2/syscallent.h
-@@ -1,4 +1,4 @@
--#define ARCH_mmap mmap_pgoff
-+#define sys_ARCH_mmap sys_mmap_pgoff
- #include "32/syscallent.h"
- [244] = {4, 0, SEN(cacheflush), "cacheflush"},
- [245 ... 259] = { },
-diff --git a/linux/or1k/syscallent.h b/linux/or1k/syscallent.h
-index ed84b3b..351fe25 100644
---- a/linux/or1k/syscallent.h
-+++ b/linux/or1k/syscallent.h
-@@ -1,4 +1,4 @@
--#define ARCH_mmap mmap_pgoff
-+#define sys_ARCH_mmap sys_mmap_pgoff
- #include "32/syscallent.h"
- [244] = { 3, NF, SEN(or1k_atomic), "or1k_atomic" },
- [245 ... 259] = { },
-diff --git a/linux/tile/syscallent1.h b/linux/tile/syscallent1.h
-index c86f059..28dbab4 100644
---- a/linux/tile/syscallent1.h
-+++ b/linux/tile/syscallent1.h
-@@ -1,4 +1,4 @@
--#define ARCH_mmap mmap_4koff
-+#define sys_ARCH_mmap sys_mmap_4koff
- #define ARCH_WANT_SYNC_FILE_RANGE2 1
- #include "32/syscallent.h"
- [244] = { 1, 0, SEN(printargs), "cmpxchg_badaddr" },
-diff --git a/pathtrace.c b/pathtrace.c
-index d530ec2..e72cdf7 100644
---- a/pathtrace.c
-+++ b/pathtrace.c
-@@ -216,6 +216,7 @@ pathtrace_match(struct tcb *tcp)
- case SEN_mmap:
- case SEN_mmap_4koff:
- case SEN_mmap_pgoff:
-+ case SEN_ARCH_mmap:
- /* x, x, x, x, fd */
- return fdmatch(tcp, tcp->u_arg[4]);
-
---
-2.6.4
-
diff --git a/meta/recipes-devtools/strace/strace/0001-scm_rights-fd.test-rewrite-without-fork.patch b/meta/recipes-devtools/strace/strace/0001-scm_rights-fd.test-rewrite-without-fork.patch
deleted file mode 100644
index c4e645b..0000000
--- a/meta/recipes-devtools/strace/strace/0001-scm_rights-fd.test-rewrite-without-fork.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-From 3fdcdd47c6a67585123a0a0c8fffabcc9f79a3a2 Mon Sep 17 00:00:00 2001
-From: "Dmitry V. Levin" <ldv@altlinux.org>
-Date: Tue, 12 Jan 2016 14:47:12 +0000
-Subject: [PATCH] scm_rights-fd.test: rewrite without fork
-
-* tests/scm_rights.c (main): Rewrite without fork.
-Place all objects passed to sendmsg and recvmsg at the end
-of memory pages followed by inaccessible pages.
-* tests/scm_rights-fd.test: Update.
----
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Backport
-
- tests/scm_rights-fd.test | 12 ++---
- tests/scm_rights.c | 122 ++++++++++++++++++++++-------------------------
- 2 files changed, 63 insertions(+), 71 deletions(-)
-
-diff --git a/tests/scm_rights-fd.test b/tests/scm_rights-fd.test
-index a32ef36..48c5028 100755
---- a/tests/scm_rights-fd.test
-+++ b/tests/scm_rights-fd.test
-@@ -49,18 +49,18 @@ touch -- "$file" ||
- framework_skip_ 'failed to create a file'
-
- run_prog ./scm_rights /dev/zero
--run_strace_merge -y -x -enetwork $args "$file"
-+run_strace -y -x -enetwork $args "$file"
-
-+sample='\\xf1\\xf2\\xf3\\xf4\\xf5\\xf6\\xf7\\xf8\\xf9\\xfa\\xfb\\xfc\\xfd\\xfe\\xff'
- n='[1-9][0-9]*'
--msg='\{msg_name\(0\)=NULL, msg_iov\(1\)=\[\{"\\x00\\x00\\x00\\x00[^"]*", '"$n"'\}\], msg_controllen='"$n"
--rights='\{cmsg_len='"$n"', cmsg_level=SOL_SOCKET, cmsg_type=SCM_RIGHTS, \[3</dev/null>, 4</dev/zero>, 5</[^}>]*/(A\\n){127}Z>\]\}'
-+msg='\{msg_name\(0\)=NULL, msg_iov\(1\)=\[\{"'"$sample"'", 15\}\], msg_controllen='"$n"
-+rights='\{cmsg_len='"$n"', cmsg_level=SOL_SOCKET, cmsg_type=SCM_RIGHTS, \[4</dev/null>, 5</dev/zero>, 6</[^}>]*/(A\\n){127}Z>\]\}'
- creds='\{cmsg_len='"$n"', cmsg_level=SOL_SOCKET, cmsg_type=SCM_CREDENTIALS, \{pid='"$n"', uid=[0-9]+, gid=[0-9]+\}\}'
--prefix='[1-9][0-9]* +[0-9]+:[0-9]+:[0-9]+\.[0-9]+ +'
- EXPECTED="$LOG.expected"
-
- cat > "$EXPECTED" << __EOF__
--${prefix}sendmsg\\(1<socket:\\[[0-9]+\\]>, $msg, \\[$rights\\], msg_flags=0\\}, 0\\) += $n
--${prefix}recvmsg\\(0<socket:\\[[0-9]+\\]>, $msg, \\[$creds, $rights\\], msg_flags=0\\}, 0\\) += $n
-+sendmsg\\(3<socket:\\[[0-9]+\\]>, $msg, \\[$rights\\], msg_flags=0\\}, 0\\) = 15
-+recvmsg\\(0<socket:\\[[0-9]+\\]>, $msg, \\[$creds, $rights\\], msg_flags=0\\}, 0\\) = 15
- __EOF__
-
- match_grep "$LOG" "$EXPECTED"
-diff --git a/tests/scm_rights.c b/tests/scm_rights.c
-index 1e5e850..00af4d5 100644
---- a/tests/scm_rights.c
-+++ b/tests/scm_rights.c
-@@ -27,26 +27,39 @@
-
- #include "tests.h"
- #include <assert.h>
--#include <string.h>
--#include <stdlib.h>
--#include <unistd.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
- #include <sys/socket.h>
--#include <sys/wait.h>
-
- int main(int ac, const char **av)
- {
-- int i;
-- int data = 0;
-- struct iovec iov = {
-- .iov_base = &data,
-- .iov_len = sizeof(iov)
-- };
-+ assert(ac > 0);
-+ int fds[ac];
-+
-+ static const char sample[] =
-+ "\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff";
-+ const unsigned int data_size = sizeof(sample) - 1;
-+ void *data = tail_alloc(data_size);
-+ memcpy(data, sample, data_size);
-+
-+ struct iovec *iov = tail_alloc(sizeof(struct iovec));
-+ iov->iov_base = data;
-+ iov->iov_len = data_size;
-
-- while ((i = open("/dev/null", O_RDWR)) < 3)
-+ struct msghdr *mh = tail_alloc(sizeof(struct msghdr));
-+ memset(mh, 0, sizeof(*mh));
-+ mh->msg_iov = iov;
-+ mh->msg_iovlen = 1;
-+
-+ int i;
-+ while ((i = open("/dev/null", O_RDWR)) <= ac + 2)
- assert(i >= 0);
-- (void) close(3);
-+ while (i > 2)
-+ assert(close(i--) == 0);
-+ assert(close(0) == 0);
-
- int sv[2];
- if (socketpair(AF_UNIX, SOCK_STREAM, 0, sv))
-@@ -55,60 +68,39 @@ int main(int ac, const char **av)
- if (setsockopt(sv[0], SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)))
- perror_msg_and_skip("setsockopt");
-
-- pid_t pid = fork();
-- if (pid < 0)
-- perror_msg_and_fail("fork");
--
-- if (pid) {
-- assert(close(sv[0]) == 0);
-- assert(dup2(sv[1], 1) == 1);
-- assert(close(sv[1]) == 0);
--
-- int fds[ac];
-- assert((fds[0] = open("/dev/null", O_RDWR)) == 3);
-- for (i = 1; i < ac; ++i)
-- assert((fds[i] = open(av[i], O_RDONLY)) == i + 3);
--
-- union {
-- struct cmsghdr cmsg;
-- char buf[CMSG_LEN(sizeof(fds))];
-- } control;
--
-- control.cmsg.cmsg_level = SOL_SOCKET;
-- control.cmsg.cmsg_type = SCM_RIGHTS;
-- control.cmsg.cmsg_len = CMSG_LEN(sizeof(fds));
-- memcpy(CMSG_DATA(&control.cmsg), fds, sizeof(fds));
--
-- struct msghdr mh = {
-- .msg_iov = &iov,
-- .msg_iovlen = 1,
-- .msg_control = &control,
-- .msg_controllen = sizeof(control)
-- };
--
-- assert(sendmsg(1, &mh, 0) == sizeof(iov));
-- assert(close(1) == 0);
--
-- int status;
-- assert(waitpid(pid, &status, 0) == pid);
-- assert(status == 0);
-- } else {
-- assert(close(sv[1]) == 0);
-- assert(dup2(sv[0], 0) == 0);
-- assert(close(sv[0]) == 0);
--
-- struct cmsghdr control[4 + ac * sizeof(int) / sizeof(struct cmsghdr)];
--
-- struct msghdr mh = {
-- .msg_iov = &iov,
-- .msg_iovlen = 1,
-- .msg_control = control,
-- .msg_controllen = sizeof(control)
-- };
--
-- assert(recvmsg(0, &mh, 0) == sizeof(iov));
-- assert(close(0) == 0);
-+ assert((fds[0] = open("/dev/null", O_RDWR)) == 4);
-+ for (i = 1; i < ac; ++i)
-+ assert((fds[i] = open(av[i], O_RDONLY)) == i + 4);
-+
-+ unsigned int cmsg_size = CMSG_SPACE(sizeof(fds));
-+ struct cmsghdr *cmsg = tail_alloc(cmsg_size);
-+ memset(cmsg, 0, cmsg_size);
-+ cmsg->cmsg_level = SOL_SOCKET;
-+ cmsg->cmsg_type = SCM_RIGHTS;
-+ cmsg->cmsg_len = CMSG_LEN(sizeof(fds));
-+ memcpy(CMSG_DATA(cmsg), fds, sizeof(fds));
-+
-+ mh->msg_control = cmsg;
-+ mh->msg_controllen = cmsg_size;
-+
-+ assert(sendmsg(sv[1], mh, 0) == (int) data_size);
-+
-+ assert(close(sv[1]) == 0);
-+ assert(open("/dev/null", O_RDWR) == sv[1]);
-+
-+ for (i = 0; i < ac; ++i) {
-+ assert(close(fds[i]) == 0);
-+ fds[i] = 0;
- }
-
-+ cmsg_size += CMSG_SPACE(sizeof(struct ucred));
-+ cmsg = tail_alloc(cmsg_size);
-+ memset(cmsg, 0, cmsg_size);
-+ mh->msg_control = cmsg;
-+ mh->msg_controllen = cmsg_size;
-+
-+ assert(recvmsg(0, mh, 0) == (int) data_size);
-+ assert(close(0) == 0);
-+
- return 0;
- }
---
-1.9.1
-
diff --git a/meta/recipes-devtools/strace/strace/0001-tests-introduce-libtests.patch b/meta/recipes-devtools/strace/strace/0001-tests-introduce-libtests.patch
deleted file mode 100644
index 1575ecd..0000000
--- a/meta/recipes-devtools/strace/strace/0001-tests-introduce-libtests.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-From 87e6b230fff800eb768b68b2e5173ebbe83fd3ef Mon Sep 17 00:00:00 2001
-From: "Dmitry V. Levin" <ldv@altlinux.org>
-Date: Sat, 2 Jan 2016 12:05:14 +0000
-Subject: [PATCH] tests: introduce libtests
-
-Introduce tests/libtests.a with common functions for use in tests.
-
-* tests/tests.h: New file.
-* tests/error_msg.c: Likewise.
-* tests/tail_alloc.c: Likewise.
-* tests/get_page_size.c: Likewise.
-* tests/Makefile.am (libtests_a_SOURCES, libtests_a_CPPFLAGS,
-check_LIBRARIES, LDADD): New variables.
-(clock_xettime_LDADD, filter_unavailable_LDADD, mq_LDADD,
-pc_LDADD, times_LDADD): Add $(LDADD).
-* tests/.gitignore: Add libtests.a.
----
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Backport
-
- tests/.gitignore | 1 +
- tests/Makefile.am | 20 ++++++++++----
- tests/error_msg.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++
- tests/get_page_size.c | 13 +++++++++
- tests/tail_alloc.c | 52 ++++++++++++++++++++++++++++++++++++
- tests/tests.h | 62 ++++++++++++++++++++++++++++++++++++++++++
- 6 files changed, 217 insertions(+), 5 deletions(-)
- create mode 100644 tests/error_msg.c
- create mode 100644 tests/get_page_size.c
- create mode 100644 tests/tail_alloc.c
- create mode 100644 tests/tests.h
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 386a2c2..62d0e56 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -40,6 +40,16 @@ AM_CPPFLAGS = $(ARCH_MFLAGS) \
- -I$(top_srcdir)
- AM_LDFLAGS = $(ARCH_MFLAGS)
-
-+libtests_a_SOURCES = \
-+ get_page_size.c \
-+ error_msg.c \
-+ tail_alloc.c \
-+ tests.h \
-+ # end of libtests_a_SOURCES
-+libtests_a_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
-+check_LIBRARIES = libtests.a
-+LDADD = libtests.a
-+
- check_PROGRAMS = \
- _newselect \
- adjtimex \
-@@ -146,19 +156,19 @@ check_PROGRAMS = \
- xettimeofday \
- # end of check_PROGRAMS
-
--clock_xettime_LDADD = -lrt
--filter_unavailable_LDADD = -lpthread
-+clock_xettime_LDADD = -lrt $(LDADD)
-+filter_unavailable_LDADD = -lpthread $(LDADD)
- fstat64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
- fstatat64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
- ftruncate64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
- lstat64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
- mmap64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
--mq_LDADD = -lrt
-+mq_LDADD = -lrt $(LDADD)
- newfstatat_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
--pc_LDADD = $(dl_LIBS)
-+pc_LDADD = $(dl_LIBS) $(LDADD)
- stat64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
- statfs_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
--times_LDADD = -lrt
-+times_LDADD = -lrt $(LDADD)
- truncate64_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
- uio_CPPFLAGS = $(AM_CPPFLAGS) -D_FILE_OFFSET_BITS=64
- stack_fcall_SOURCES = stack-fcall.c \
-diff --git a/tests/error_msg.c b/tests/error_msg.c
-new file mode 100644
-index 0000000..3fd3411
---- /dev/null
-+++ b/tests/error_msg.c
-@@ -0,0 +1,74 @@
-+/*
-+ * Copyright (c) 2016 Dmitry V. Levin <ldv@altlinux.org>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include "tests.h"
-+#include <errno.h>
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+void
-+perror_msg_and_fail(const char *fmt, ...)
-+{
-+ int err_no = errno;
-+ va_list p;
-+
-+ va_start(p, fmt);
-+ vfprintf(stderr, fmt, p);
-+ if (err_no)
-+ fprintf(stderr, ": %s\n", strerror(err_no));
-+ else
-+ putc('\n', stderr);
-+ exit(1);
-+}
-+
-+void
-+error_msg_and_skip(const char *fmt, ...)
-+{
-+ va_list p;
-+
-+ va_start(p, fmt);
-+ vfprintf(stderr, fmt, p);
-+ putc('\n', stderr);
-+ exit(77);
-+}
-+
-+void
-+perror_msg_and_skip(const char *fmt, ...)
-+{
-+ int err_no = errno;
-+ va_list p;
-+
-+ va_start(p, fmt);
-+ vfprintf(stderr, fmt, p);
-+ if (err_no)
-+ fprintf(stderr, ": %s\n", strerror(err_no));
-+ else
-+ putc('\n', stderr);
-+ exit(77);
-+}
-diff --git a/tests/get_page_size.c b/tests/get_page_size.c
-new file mode 100644
-index 0000000..aeea861
---- /dev/null
-+++ b/tests/get_page_size.c
-@@ -0,0 +1,13 @@
-+#include "tests.h"
-+#include <unistd.h>
-+
-+size_t
-+get_page_size(void)
-+{
-+ static size_t page_size;
-+
-+ if (!page_size)
-+ page_size = sysconf(_SC_PAGESIZE);
-+
-+ return page_size;
-+}
-diff --git a/tests/tail_alloc.c b/tests/tail_alloc.c
-new file mode 100644
-index 0000000..2b8b14e
---- /dev/null
-+++ b/tests/tail_alloc.c
-@@ -0,0 +1,52 @@
-+/*
-+ * Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include "tests.h"
-+#include <string.h>
-+#include <sys/mman.h>
-+
-+void *
-+tail_alloc(const size_t size)
-+{
-+ const size_t page_size = get_page_size();
-+ const size_t len = (size + page_size - 1) & -page_size;
-+ const size_t alloc_size = len + 2 * page_size;
-+
-+ void *p = mmap(NULL, alloc_size, PROT_READ | PROT_WRITE,
-+ MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-+ if (MAP_FAILED == p)
-+ perror_msg_and_fail("mmap(%zu)", alloc_size);
-+
-+ void *start_work = p + page_size;
-+ void *tail_guard = start_work + len;
-+
-+ if (munmap(p, page_size) || munmap(tail_guard, page_size))
-+ perror_msg_and_fail("munmap");
-+
-+ memset(start_work, 0xff, len);
-+ return tail_guard - size;
-+}
-diff --git a/tests/tests.h b/tests/tests.h
-new file mode 100644
-index 0000000..91fa24e
---- /dev/null
-+++ b/tests/tests.h
-@@ -0,0 +1,62 @@
-+/*
-+ * Copyright (c) 2016 Dmitry V. Levin <ldv@altlinux.org>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#ifndef TESTS_H_
-+# define TESTS_H_
-+
-+# ifdef HAVE_CONFIG_H
-+# include "config.h"
-+# endif
-+
-+# include <sys/types.h>
-+# include "gcc_compat.h"
-+
-+/* Cached sysconf(_SC_PAGESIZE). */
-+size_t get_page_size(void);
-+
-+/* Print message and strerror(errno) to stderr, then exit(1). */
-+void perror_msg_and_fail(const char *, ...)
-+ ATTRIBUTE_FORMAT((printf, 1, 2)) ATTRIBUTE_NORETURN;
-+/* Print message to stderr, then exit(77). */
-+void error_msg_and_skip(const char *, ...)
-+ ATTRIBUTE_FORMAT((printf, 1, 2)) ATTRIBUTE_NORETURN;
-+/* Print message and strerror(errno) to stderr, then exit(77). */
-+void perror_msg_and_skip(const char *, ...)
-+ ATTRIBUTE_FORMAT((printf, 1, 2)) ATTRIBUTE_NORETURN;
-+
-+/*
-+ * Allocate memory that ends on the page boundary.
-+ * Pages allocated by this call are preceeded by an unmapped page
-+ * and followed also by an unmapped page.
-+ */
-+void *tail_alloc(const size_t)
-+ ATTRIBUTE_MALLOC ATTRIBUTE_ALLOC_SIZE((1));
-+
-+# define SKIP_MAIN_UNDEFINED(arg) \
-+ int main(void) { error_msg_and_skip("undefined: %s", arg); }
-+
-+#endif
---
-1.9.1
-
diff --git a/meta/recipes-devtools/strace/strace/0001-tests-scm_rights.c-use-libtests.patch b/meta/recipes-devtools/strace/strace/0001-tests-scm_rights.c-use-libtests.patch
deleted file mode 100644
index 3fbab8b..0000000
--- a/meta/recipes-devtools/strace/strace/0001-tests-scm_rights.c-use-libtests.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 339a15b619b479c63cafba21d5fc359e613d9ee8 Mon Sep 17 00:00:00 2001
-From: "Dmitry V. Levin" <ldv@altlinux.org>
-Date: Mon, 4 Jan 2016 23:53:31 +0000
-Subject: [PATCH] tests/scm_rights.c: use libtests
-
-* tests/scm_rights.c (main): Use perror_msg_and_fail and perror_msg_and_skip.
----
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Backport
-
- tests/scm_rights.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/tests/scm_rights.c b/tests/scm_rights.c
-index c41444f..1e5e850 100644
---- a/tests/scm_rights.c
-+++ b/tests/scm_rights.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
-+ * Copyright (c) 2014-2016 Dmitry V. Levin <ldv@altlinux.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
-@@ -25,6 +25,7 @@
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#include "tests.h"
- #include <assert.h>
- #include <string.h>
- #include <stdlib.h>
-@@ -48,12 +49,15 @@ int main(int ac, const char **av)
- (void) close(3);
-
- int sv[2];
-- assert(socketpair(AF_UNIX, SOCK_STREAM, 0, sv) == 0);
-+ if (socketpair(AF_UNIX, SOCK_STREAM, 0, sv))
-+ perror_msg_and_skip("socketpair");
- int one = 1;
-- assert(setsockopt(sv[0], SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)) == 0);
-+ if (setsockopt(sv[0], SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)))
-+ perror_msg_and_skip("setsockopt");
-
- pid_t pid = fork();
-- assert(pid >= 0);
-+ if (pid < 0)
-+ perror_msg_and_fail("fork");
-
- if (pid) {
- assert(close(sv[0]) == 0);
---
-1.9.1
-
diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch
index bfc7f34..94ee53c 100644
--- a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch
+++ b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch
@@ -12,19 +12,20 @@ Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
- mpers.awk | 2 +-
- tests/caps.awk | 2 +-
- tests/match.awk | 2 +-
- tests/net-yy-accept.awk | 2 +-
- tests/net-yy-connect.awk | 2 +-
- tests/sigaction.awk | 2 +-
- tests/uid.awk | 2 +-
- tests/unix-yy-accept.awk | 2 +-
- tests/unix-yy-connect.awk | 2 +-
- 9 files changed, 9 insertions(+), 9 deletions(-)
+ mpers.awk | 2 +-
+ tests-m32/caps.awk | 2 +-
+ tests-m32/match.awk | 2 +-
+ tests-m32/sigaction.awk | 2 +-
+ tests-mx32/caps.awk | 2 +-
+ tests-mx32/match.awk | 2 +-
+ tests-mx32/sigaction.awk | 2 +-
+ tests/caps.awk | 2 +-
+ tests/match.awk | 2 +-
+ tests/sigaction.awk | 2 +-
+ 10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/mpers.awk b/mpers.awk
-index 73bf0b0..50e6c16 100644
+index 99248c5..ff10520 100644
--- a/mpers.awk
+++ b/mpers.awk
@@ -1,4 +1,4 @@
@@ -32,87 +33,94 @@ index 73bf0b0..50e6c16 100644
+#!/usr/bin/gawk
#
# Copyright (c) 2015 Elvira Khabirova <lineprinter0@gmail.com>
- # Copyright (c) 2015 Dmitry V. Levin <ldv@altlinux.org>
-diff --git a/tests/caps.awk b/tests/caps.awk
-index bad8b0f..845f37c 100644
---- a/tests/caps.awk
-+++ b/tests/caps.awk
+ # Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org>
+diff --git a/tests-m32/caps.awk b/tests-m32/caps.awk
+index 67003ac..a66f1f0 100644
+--- a/tests-m32/caps.awk
++++ b/tests-m32/caps.awk
@@ -1,4 +1,4 @@
-#!/bin/gawk
+#!/usr/bin/gawk
#
- # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
- # All rights reserved.
-diff --git a/tests/match.awk b/tests/match.awk
+ # This file is part of caps strace test.
+ #
+diff --git a/tests-m32/match.awk b/tests-m32/match.awk
index abfbae9..f2740bf 100644
---- a/tests/match.awk
-+++ b/tests/match.awk
+--- a/tests-m32/match.awk
++++ b/tests-m32/match.awk
@@ -1,4 +1,4 @@
-#!/bin/gawk
+#!/usr/bin/gawk
#
# Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
# All rights reserved.
-diff --git a/tests/net-yy-accept.awk b/tests/net-yy-accept.awk
-index fed3e30..e916ab0 100644
---- a/tests/net-yy-accept.awk
-+++ b/tests/net-yy-accept.awk
+diff --git a/tests-m32/sigaction.awk b/tests-m32/sigaction.awk
+index 5c6b6d0..3e14464 100644
+--- a/tests-m32/sigaction.awk
++++ b/tests-m32/sigaction.awk
@@ -1,4 +1,4 @@
-#!/bin/gawk
+#!/usr/bin/gawk
#
- # Copyright (c) 2014 Masatake YAMATO <yamato@redhat.com>
# Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
-diff --git a/tests/net-yy-connect.awk b/tests/net-yy-connect.awk
-index f4dcf91..b3cec8c 100644
---- a/tests/net-yy-connect.awk
-+++ b/tests/net-yy-connect.awk
+ # All rights reserved.
+diff --git a/tests-mx32/caps.awk b/tests-mx32/caps.awk
+index 67003ac..a66f1f0 100644
+--- a/tests-mx32/caps.awk
++++ b/tests-mx32/caps.awk
@@ -1,4 +1,4 @@
-#!/bin/gawk
+#!/usr/bin/gawk
#
- # Copyright (c) 2014 Masatake YAMATO <yamato@redhat.com>
- # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
-diff --git a/tests/sigaction.awk b/tests/sigaction.awk
-index 5c6b6d0..3e14464 100644
---- a/tests/sigaction.awk
-+++ b/tests/sigaction.awk
+ # This file is part of caps strace test.
+ #
+diff --git a/tests-mx32/match.awk b/tests-mx32/match.awk
+index abfbae9..f2740bf 100644
+--- a/tests-mx32/match.awk
++++ b/tests-mx32/match.awk
@@ -1,4 +1,4 @@
-#!/bin/gawk
+#!/usr/bin/gawk
#
# Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
# All rights reserved.
-diff --git a/tests/uid.awk b/tests/uid.awk
-index a56c5be..67b0749 100644
---- a/tests/uid.awk
-+++ b/tests/uid.awk
+diff --git a/tests-mx32/sigaction.awk b/tests-mx32/sigaction.awk
+index 5c6b6d0..3e14464 100644
+--- a/tests-mx32/sigaction.awk
++++ b/tests-mx32/sigaction.awk
@@ -1,4 +1,4 @@
-#!/bin/gawk
+#!/usr/bin/gawk
#
# Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
# All rights reserved.
-diff --git a/tests/unix-yy-accept.awk b/tests/unix-yy-accept.awk
-index 4ed60e4..2a9d9c0 100644
---- a/tests/unix-yy-accept.awk
-+++ b/tests/unix-yy-accept.awk
+diff --git a/tests/caps.awk b/tests/caps.awk
+index 67003ac..a66f1f0 100644
+--- a/tests/caps.awk
++++ b/tests/caps.awk
+@@ -1,4 +1,4 @@
+-#!/bin/gawk
++#!/usr/bin/gawk
+ #
+ # This file is part of caps strace test.
+ #
+diff --git a/tests/match.awk b/tests/match.awk
+index abfbae9..f2740bf 100644
+--- a/tests/match.awk
++++ b/tests/match.awk
@@ -1,4 +1,4 @@
-#!/bin/gawk
+#!/usr/bin/gawk
#
- # Copyright (c) 2014 Masatake YAMATO <yamato@redhat.com>
# Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
-diff --git a/tests/unix-yy-connect.awk b/tests/unix-yy-connect.awk
-index 262bf2e..c809dfa 100644
---- a/tests/unix-yy-connect.awk
-+++ b/tests/unix-yy-connect.awk
+ # All rights reserved.
+diff --git a/tests/sigaction.awk b/tests/sigaction.awk
+index 5c6b6d0..3e14464 100644
+--- a/tests/sigaction.awk
++++ b/tests/sigaction.awk
@@ -1,4 +1,4 @@
-#!/bin/gawk
+#!/usr/bin/gawk
#
- # Copyright (c) 2014 Masatake YAMATO <yamato@redhat.com>
# Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
---
-1.9.1
-
+ # All rights reserved.
diff --git a/meta/recipes-devtools/strace/strace_4.11.bb b/meta/recipes-devtools/strace/strace_4.12.bb
similarity index 75%
rename from meta/recipes-devtools/strace/strace_4.11.bb
rename to meta/recipes-devtools/strace/strace_4.12.bb
index 56b64bb..70d7402 100644
--- a/meta/recipes-devtools/strace/strace_4.11.bb
+++ b/meta/recipes-devtools/strace/strace_4.12.bb
@@ -9,18 +9,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
file://more-robust-test-for-m32-mx32-compile-support.patch \
file://update-gawk-paths.patch \
file://use-asm-sgidefs.h.patch \
- file://0001-arc-metag-nios2-or1k-tile-fix-build.patch \
file://Makefile-ptest.patch \
- file://0001-tests-scm_rights.c-use-libtests.patch \
- file://0001-scm_rights-fd.test-rewrite-without-fork.patch \
- file://0001-Move-gcc-compat-macros-to-gcc_compat.h.patch \
- file://0001-tests-introduce-libtests.patch \
file://run-ptest \
file://0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch \
"
-SRC_URI[md5sum] = "a15d2555a7febb56d00c6e1a51c655dc"
-SRC_URI[sha256sum] = "e86a5f6cd8f941f67f3e4b28f4e60f3d9185c951cf266404533210a2e5cd8152"
+SRC_URI[md5sum] = "efb8611fc332e71ec419c53f59faa93e"
+SRC_URI[sha256sum] = "51144b78cb9ba22211b95a5aafe0af3694c0d575b25975d80ca9dd4dfd7c1e59"
inherit autotools ptest bluetooth
--
2.8.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 07/11] gnu-efi: 3.0.3 -> 3.0.4
2016-06-12 8:25 ` [PATCH 07/11] gnu-efi: 3.0.3 -> 3.0.4 Robert Yang
@ 2016-06-14 4:50 ` Maxin B. John
2016-06-14 9:54 ` Burton, Ross
0 siblings, 1 reply; 14+ messages in thread
From: Maxin B. John @ 2016-06-14 4:50 UTC (permalink / raw)
To: Robert Yang; +Cc: openembedded-core
Hi,
On Sun, Jun 12, 2016 at 01:25:09AM -0700, Robert Yang wrote:
> * Remove gnu-efi-Make-setjmp.S-portable-to-ARM.patch since it is already
> in the source.
>
> * Updated LIC_FILES_CHKSUM
> - The following files are gone:
> lib/arm/div64.S
> lib/arm/lib1funcs.S
> - Updated md5sum for other files, they add the following words, which are
> still GPLv2+:
> Redistribution and use in source and binary forms, with or without
> modification, are permitted provided that the following conditions
> are met:
> 1. Redistributions of source code must retain the above copyright
> notice and this list of conditions, without modification.
> 2. The name of the author may not be used to endorse or promote products
> derived from this software without specific prior written permission.
>
> Alternatively, this software may be distributed 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.
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
> - ldmia r0, {r3-r12,r14}
> ---
> -1.9.1
> -
> diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb
> similarity index 60%
> rename from meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb
> rename to meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb
> index 6b130a2..6a4acfb 100644
> --- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb
> +++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb
gnu-efi-3.0.4 build failed on qemux86-64 (Build host Debian-8.5)
http://errors.yoctoproject.org/Errors/Details/69406/
Best Regards,
Maxin
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 07/11] gnu-efi: 3.0.3 -> 3.0.4
2016-06-14 4:50 ` Maxin B. John
@ 2016-06-14 9:54 ` Burton, Ross
0 siblings, 0 replies; 14+ messages in thread
From: Burton, Ross @ 2016-06-14 9:54 UTC (permalink / raw)
To: Robert Yang; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 441 bytes --]
On 14 June 2016 at 05:50, Maxin B. John <maxin.john@intel.com> wrote:
> gnu-efi-3.0.4 build failed on qemux86-64 (Build host Debian-8.5)
> http://errors.yoctoproject.org/Errors/Details/69406/
>
I also see the same error on intel-corei7-64.
Also note that the makefiles produce the message "/bin/sh: 1: /usrgcc: not
found", which is because $prefix is exported. Adding prefix[noexport] =
"1" in the recipe solves this.
Ross
[-- Attachment #2: Type: text/html, Size: 1079 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2016-06-14 9:55 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-12 8:25 [PATCH 00/11] Packages upgrade Robert Yang
2016-06-12 8:25 ` [PATCH 01/11] autogen-native: 5.18.6 -> 5.18.10 Robert Yang
2016-06-12 8:25 ` [PATCH 02/11] file: 5.25 -> 5.27 Robert Yang
2016-06-12 8:25 ` [PATCH 03/11] mklibs-native: 0.1.40 -> 0.1.41 Robert Yang
2016-06-12 8:25 ` [PATCH 04/11] git: 2.8.2 -> 2.8.4 Robert Yang
2016-06-12 8:25 ` [PATCH 05/11] make: 4.1 -> 4.2 Robert Yang
2016-06-12 8:25 ` [PATCH 06/11] e2fsprogs: 1.42.99+1.43+git -> 1.43 Robert Yang
2016-06-12 8:25 ` [PATCH 07/11] gnu-efi: 3.0.3 -> 3.0.4 Robert Yang
2016-06-14 4:50 ` Maxin B. John
2016-06-14 9:54 ` Burton, Ross
2016-06-12 8:25 ` [PATCH 08/11] libbsd: 0.8.2 -> 0.8.3 Robert Yang
2016-06-12 8:25 ` [PATCH 09/11] libcap: 2.24 -> 2.25 Robert Yang
2016-06-12 8:25 ` [PATCH 10/11] tcl: 8.6.4 -> 8.6.5 Robert Yang
2016-06-12 8:25 ` [PATCH 11/11] strace: 4.11 -> 4.12 Robert Yang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.