diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-extended')
197 files changed, 1503 insertions, 7128 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-extended/acpica/acpica_20170303.bb b/import-layers/yocto-poky/meta/recipes-extended/acpica/acpica_20170303.bb index 868505b7d..51ae77b78 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/acpica/acpica_20170303.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/acpica/acpica_20170303.bb @@ -17,7 +17,6 @@ COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" DEPENDS = "bison flex" SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz \ - file://no-werror.patch \ file://rename-yy_scan_string-manually.patch \ file://manipulate-fds-instead-of-FILE.patch;striplevel=2 \ file://0001-Linux-add-support-for-X32-ABI-compilation.patch \ @@ -49,7 +48,6 @@ do_install() { PROVIDES = "iasl" RPROVIDES_${PN} += "iasl" RREPLACES_${PN} += "iasl" -RCONFLIGHTS_${PN} += "iasl" +RCONFLICTS_${PN} += "iasl" -NATIVE_INSTALL_WORKS = "1" BBCLASSEXTEND = "native" diff --git a/import-layers/yocto-poky/meta/recipes-extended/acpica/files/no-werror.patch b/import-layers/yocto-poky/meta/recipes-extended/acpica/files/no-werror.patch deleted file mode 100644 index a6e7b540a..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/acpica/files/no-werror.patch +++ /dev/null @@ -1,32 +0,0 @@ -Description: remove -Werror flag -Forwarded: not-needed -Author: Fathi Boudra <fathi.boudra@linaro.org> -Upstream-Status: Pending ---- - generate/unix/iasl/Makefile | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - ---- a/generate/unix/iasl/Makefile -+++ b/generate/unix/iasl/Makefile -@@ -266,19 +266,19 @@ $(OBJDIR)/prparser.y.h: $(OBJDIR)/prpars - # by the utilities above and they are not necessarily ANSI C, etc. - # - $(OBJDIR)/aslcompilerlex.o : $(OBJDIR)/aslcompilerlex.c -- $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ $(CC) -c $(CFLAGS) -Wall -o$@ $< - - $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c -- $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ $(CC) -c $(CFLAGS) -Wall -o$@ $< - - $(OBJDIR)/dtparserlex.o : $(OBJDIR)/dtparserlex.c -- $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ $(CC) -c $(CFLAGS) -Wall -o$@ $< - - $(OBJDIR)/dtparserparse.o : $(OBJDIR)/dtparserparse.c -- $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ $(CC) -c $(CFLAGS) -Wall -o$@ $< - - $(OBJDIR)/prparserlex.o : $(OBJDIR)/prparserlex.c -- $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ $(CC) -c $(CFLAGS) -Wall -o$@ $< diff --git a/import-layers/yocto-poky/meta/recipes-extended/at/at/makefile-fix-parallel.patch b/import-layers/yocto-poky/meta/recipes-extended/at/at/makefile-fix-parallel.patch index 932a4c0bf..d6056dcef 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/at/at/makefile-fix-parallel.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/at/at/makefile-fix-parallel.patch @@ -15,13 +15,13 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/Makefile.in b/Makefile.in -index 2a9b918..aa7c04a 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -75,7 +75,9 @@ at: $(ATOBJECTS) +Index: at-3.1.20/Makefile.in +=================================================================== +--- at-3.1.20.orig/Makefile.in ++++ at-3.1.20/Makefile.in +@@ -76,7 +76,9 @@ at: $(ATOBJECTS) atd: $(RUNOBJECTS) - $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) + $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(SELINUXLIB) -y.tab.c y.tab.h: parsetime.y +y.tab.h: y.tab.c @@ -30,6 +30,3 @@ index 2a9b918..aa7c04a 100644 $(YACC) -d parsetime.y lex.yy.c: parsetime.l --- -1.7.9.5 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/at/at_3.1.20.bb b/import-layers/yocto-poky/meta/recipes-extended/at/at_3.1.20.bb index 9b537eed5..8fe3b437e 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/at/at_3.1.20.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/at/at_3.1.20.bb @@ -5,7 +5,7 @@ the system load levels drop to a particular level." SECTION = "base" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" -DEPENDS = "flex flex-native \ +DEPENDS = "flex flex-native bison-native \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)} \ diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash.inc b/import-layers/yocto-poky/meta/recipes-extended/bash/bash.inc index f4e1f7a11..9c2b065f9 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/bash/bash.inc +++ b/import-layers/yocto-poky/meta/recipes-extended/bash/bash.inc @@ -6,7 +6,7 @@ DEPENDS = "ncurses bison-native virtual/libiconv" inherit autotools gettext texinfo update-alternatives ptest -EXTRA_AUTORECONF += "--exclude=autoheader" +EXTRA_AUTORECONF += "--exclude=autoheader --exclude=aclocal" EXTRA_OECONF = "--enable-job-control --without-bash-malloc" # If NON_INTERACTIVE_LOGIN_SHELLS is defined, all login shells read the @@ -25,7 +25,7 @@ RDEPENDS_${PN} += "base-files" RDEPENDS_${PN}_class-nativesdk = "" RDEPENDS_${PN}-ptest += "make" -DEPENDS_append_libc-glibc = " glibc-locale" +DEPENDS_append_libc-glibc = " virtual/libc-locale" RDEPENDS_${PN}-ptest_append_libc-glibc = " locale-base-fr-fr locale-base-de-de" USERADD_PACKAGES = "${PN}-ptest" @@ -33,12 +33,6 @@ USERADD_PARAM_${PN}-ptest = "--create-home --user-group test" CACHED_CONFIGUREVARS += "headersdir=${includedir}/${PN}" -do_configure_prepend () { - if [ ! -e ${S}/acinclude.m4 ]; then - cat ${S}/aclocal.m4 > ${S}/acinclude.m4 - fi -} - do_compile_ptest () { oe_runmake buildtest } diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash/execute_cmd.patch b/import-layers/yocto-poky/meta/recipes-extended/bash/bash/execute_cmd.patch index 81f8f0a9c..9970b4d8f 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/bash/bash/execute_cmd.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/bash/bash/execute_cmd.patch @@ -1,8 +1,10 @@ Upstream-Status: Inappropriate [embedded specific] ---- execute_cmd.c.orig Fri Jun 3 13:34:42 2011 -+++ execute_cmd.c Fri Jun 3 13:36:41 2011 -@@ -2202,7 +2202,11 @@ +Index: execute_cmd.c +=================================================================== +--- execute_cmd.c.orig ++++ execute_cmd.c +@@ -2459,7 +2459,11 @@ execute_pipeline (command, asynchronous, /* If the `lastpipe' option is set with shopt, and job control is not enabled, execute the last element of non-async pipelines in the current shell environment. */ @@ -13,5 +15,5 @@ Upstream-Status: Inappropriate [embedded specific] +#endif + asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) { - lstdin = move_to_high_fd (0, 0, 255); + lstdin = move_to_high_fd (0, 1, -1); if (lstdin > 0) diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash/pathexp-dep.patch b/import-layers/yocto-poky/meta/recipes-extended/bash/bash/pathexp-dep.patch new file mode 100644 index 000000000..e05bbda31 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/bash/bash/pathexp-dep.patch @@ -0,0 +1,13 @@ +pathexp includes libintl.h but doesn't depend on it, thus a build race can occur. + +Upstream-Status: Submitted (https://savannah.gnu.org/patch/index.php?9503) +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/Makefile.in b/Makefile.in +index c7b62bc0..241cbf12 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1281,2 +1281,3 @@ nojobs.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h + y.tab.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h ++pathexp.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h + pcomplete.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash_4.4.12.bb b/import-layers/yocto-poky/meta/recipes-extended/bash/bash_4.4.12.bb new file mode 100644 index 000000000..9382a77af --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/bash/bash_4.4.12.bb @@ -0,0 +1,24 @@ +require bash.inc + +# GPLv2+ (< 4.0), GPLv3+ (>= 4.0) +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ + file://execute_cmd.patch;striplevel=0 \ + file://mkbuiltins_have_stringize.patch \ + file://build-tests.patch \ + file://test-output.patch \ + file://fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch \ + file://run-ptest \ + file://fix-run-builtins.patch \ + file://0001-help-fix-printf-format-security-warning.patch \ + file://bash-memleak-bug-fix-for-builtin-command-read.patch \ + file://pathexp-dep.patch \ + " + +SRC_URI[tarball.md5sum] = "7c112970cbdcadfc331e10eeb5f6aa41" +SRC_URI[tarball.sha256sum] = "57d8432be54541531a496fd4904fdc08c12542f43605a9202594fa5d5f9f2331" + + +BBCLASSEXTEND = "nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash_4.4.bb b/import-layers/yocto-poky/meta/recipes-extended/bash/bash_4.4.bb deleted file mode 100644 index e544d07c1..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/bash/bash_4.4.bb +++ /dev/null @@ -1,59 +0,0 @@ -require bash.inc - -# GPLv2+ (< 4.0), GPLv3+ (>= 4.0) -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-001;apply=yes;striplevel=0;name=patch001 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-002;apply=yes;striplevel=0;name=patch002 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-003;apply=yes;striplevel=0;name=patch003 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-004;apply=yes;striplevel=0;name=patch004 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-005;apply=yes;striplevel=0;name=patch005 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-006;apply=yes;striplevel=0;name=patch006 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-007;apply=yes;striplevel=0;name=patch007 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-008;apply=yes;striplevel=0;name=patch008 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-009;apply=yes;striplevel=0;name=patch009 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-010;apply=yes;striplevel=0;name=patch010 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-011;apply=yes;striplevel=0;name=patch011 \ - ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-012;apply=yes;striplevel=0;name=patch012 \ - file://execute_cmd.patch;striplevel=0 \ - file://mkbuiltins_have_stringize.patch \ - file://build-tests.patch \ - file://test-output.patch \ - file://fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch \ - file://run-ptest \ - file://fix-run-builtins.patch \ - file://0001-help-fix-printf-format-security-warning.patch \ - file://bash-memleak-bug-fix-for-builtin-command-read.patch \ - " - -SRC_URI[tarball.md5sum] = "148888a7c95ac23705559b6f477dfe25" -SRC_URI[tarball.sha256sum] = "d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb" - -SRC_URI[patch001.md5sum] = "817d01a6c0af6f79308a8b7b649e53d8" -SRC_URI[patch001.sha256sum] = "3e28d91531752df9a8cb167ad07cc542abaf944de9353fe8c6a535c9f1f17f0f" -SRC_URI[patch002.md5sum] = "765e14cff12c7284009772e8e24f2fe0" -SRC_URI[patch002.sha256sum] = "7020a0183e17a7233e665b979c78c184ea369cfaf3e8b4b11f5547ecb7c13c53" -SRC_URI[patch003.md5sum] = "49e7da93bf07f510a2eb6bb43ac3e5a2" -SRC_URI[patch003.sha256sum] = "51df5a9192fdefe0ddca4bdf290932f74be03ffd0503a3d112e4199905e718b2" -SRC_URI[patch004.md5sum] = "4557d674ab5831a5fa98052ab19edaf4" -SRC_URI[patch004.sha256sum] = "ad080a30a4ac6c1273373617f29628cc320a35c8cd06913894794293dc52c8b3" -SRC_URI[patch005.md5sum] = "cce96dd77cdd1d293beec10848f6cbb5" -SRC_URI[patch005.sha256sum] = "221e4b725b770ad0bb6924df3f8d04f89eeca4558f6e4c777dfa93e967090529" -SRC_URI[patch006.md5sum] = "d3379f8d8abce5c6ee338f931ad008d5" -SRC_URI[patch006.sha256sum] = "6a8e2e2a6180d0f1ce39dcd651622fb6d2fd05db7c459f64ae42d667f1e344b8" -SRC_URI[patch007.md5sum] = "ec38c76ca439ca7f9c178e9baede84fc" -SRC_URI[patch007.sha256sum] = "de1ccc07b7bfc9e25243ad854f3bbb5d3ebf9155b0477df16aaf00a7b0d5edaf" -SRC_URI[patch008.md5sum] = "e0ba18c1e3b94f905da9b5bf9d38b58b" -SRC_URI[patch008.sha256sum] = "86144700465933636d7b945e89b77df95d3620034725be161ca0ca5a42e239ba" -SRC_URI[patch009.md5sum] = "e952d4f44e612048930c559d90eb99bb" -SRC_URI[patch009.sha256sum] = "0b6bdd1a18a0d20e330cc3bc71e048864e4a13652e29dc0ebf3918bea729343c" -SRC_URI[patch010.md5sum] = "57b5b35955d68f9a09dbef6b86d2c782" -SRC_URI[patch010.sha256sum] = "8465c6f2c56afe559402265b39d9e94368954930f9aa7f3dfa6d36dd66868e06" -SRC_URI[patch011.md5sum] = "cc896e1fa696b93ded568e557e2392d5" -SRC_URI[patch011.sha256sum] = "dd56426ef7d7295e1107c0b3d06c192eb9298f4023c202ca2ba6266c613d170d" -SRC_URI[patch012.md5sum] = "fa47fbfa56fb7e9e5367f19a9df5fc9e" -SRC_URI[patch012.sha256sum] = "fac271d2bf6372c9903e3b353cb9eda044d7fe36b5aab52f21f3f21cd6a2063e" - -BBCLASSEXTEND = "nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch b/import-layers/yocto-poky/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch index 5379eb6aa..db013cf08 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch @@ -10,12 +10,12 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> ppdc/Makefile | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) -Index: cups-2.0.0/ppdc/Makefile +Index: cups-2.2.6/ppdc/Makefile =================================================================== ---- cups-2.0.0.orig/ppdc/Makefile -+++ cups-2.0.0/ppdc/Makefile -@@ -242,8 +242,8 @@ genstrings: genstrings.o libcupsppdc.a - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ +--- cups-2.2.6.orig/ppdc/Makefile ++++ cups-2.2.6/ppdc/Makefile +@@ -228,8 +228,8 @@ genstrings: genstrings.o libcupsppdc.a + $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) - echo Generating localization strings... @@ -25,8 +25,8 @@ Index: cups-2.0.0/ppdc/Makefile # -@@ -260,9 +260,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cu - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ +@@ -246,9 +246,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cu + $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ $(COMMONLIBS) $(LIBZ) - echo Testing PPD compiler... @@ -38,8 +38,8 @@ Index: cups-2.0.0/ppdc/Makefile # -@@ -288,17 +288,17 @@ ppdi-static: ppdc-static ppdi.o libcups - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \ +@@ -274,17 +274,17 @@ ppdi-static: ppdc-static ppdi.o libcups + $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \ ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ $(COMMONLIBS) $(LIBZ) - echo Testing PPD importer... diff --git a/import-layers/yocto-poky/meta/recipes-extended/cups/cups_2.2.4.bb b/import-layers/yocto-poky/meta/recipes-extended/cups/cups_2.2.4.bb deleted file mode 100644 index ed94b67f3..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/cups/cups_2.2.4.bb +++ /dev/null @@ -1,6 +0,0 @@ -require cups.inc - -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f212b4338db0da8cb892e94bf2949460" - -SRC_URI[md5sum] = "d26e5a0a574a69fe1d01079b2931fc49" -SRC_URI[sha256sum] = "596d4db72651c335469ae5f37b0da72ac9f97d73e30838d787065f559dea98cc" diff --git a/import-layers/yocto-poky/meta/recipes-extended/cups/cups_2.2.6.bb b/import-layers/yocto-poky/meta/recipes-extended/cups/cups_2.2.6.bb new file mode 100644 index 000000000..3aa934bc0 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/cups/cups_2.2.6.bb @@ -0,0 +1,6 @@ +require cups.inc + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f212b4338db0da8cb892e94bf2949460" + +SRC_URI[md5sum] = "e91c26d8d97b5a1630a962f530f02192" +SRC_URI[sha256sum] = "40385778c2b3bdf55030d1c999734e22774c79e3425d91339ce677825620169b" diff --git a/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils.inc b/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils.inc index 7c5be50fb..c9e313058 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils.inc +++ b/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils.inc @@ -10,3 +10,4 @@ inherit autotools texinfo update-alternatives gettext ALTERNATIVE_${PN} = "diff cmp" ALTERNATIVE_PRIORITY = "100" +BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/import-layers/yocto-poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index bf66267e8..de3810404 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -5,11 +5,12 @@ Signed-off-by: Tudor Florea <tudor.florea@enea.com> Upstream-Status: Inappropriate (default automake behavior incompatible with ptest) -diff -ruN a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-28 18:19:13.513980977 +0200 -+++ b/configure.ac 2014-05-28 18:19:21.129660215 +0200 -@@ -2,7 +2,7 @@ - AC_INIT(ethtool, 3.14, netdev@vger.kernel.org) +Index: ethtool-4.13/configure.ac +=================================================================== +--- ethtool-4.13.orig/configure.ac ++++ ethtool-4.13/configure.ac +@@ -2,7 +2,7 @@ dnl Process this file with autoconf to p + AC_INIT(ethtool, 4.13, netdev@vger.kernel.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu]) diff --git a/import-layers/yocto-poky/meta/recipes-extended/ethtool/ethtool_4.11.bb b/import-layers/yocto-poky/meta/recipes-extended/ethtool/ethtool_4.13.bb index befe9b939..c862a5795 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/ethtool/ethtool_4.11.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/ethtool/ethtool_4.13.bb @@ -11,8 +11,8 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://avoid_parallel_tests.patch \ " -SRC_URI[md5sum] = "8f1072679888c9335e49b17efb798b4c" -SRC_URI[sha256sum] = "af2fd9692f3159d3ab1e41e6f9b7d8db2a4693f1cb22348c88ba89f70f0e6503" +SRC_URI[md5sum] = "2ba44eb0ca96752392e9bf8dc83ba302" +SRC_URI[sha256sum] = "d311c4b557c44c5248ac5436b9e19c391a60d8e4830b6a7f41be16d89c0556de" inherit autotools ptest RDEPENDS_${PN}-ptest += "make" diff --git a/import-layers/yocto-poky/meta/recipes-extended/gawk/gawk-4.1.4/test-arrayind1-Remove-hashbang-line.patch b/import-layers/yocto-poky/meta/recipes-extended/gawk/gawk-4.1.4/test-arrayind1-Remove-hashbang-line.patch deleted file mode 100644 index d4262ed0d..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/gawk/gawk-4.1.4/test-arrayind1-Remove-hashbang-line.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a3a3f26078223c47871c7b53e5c015ad163ae045 Mon Sep 17 00:00:00 2001 -From: Fabio Berton <fabio.berton@ossystems.com.br> -Date: Thu, 3 Nov 2016 14:50:52 -0200 -Subject: [PATCH] test/arrayind1: Remove hashbang line -Organization: O.S. Systems Software LTDA. - -Remove "#!/usr/local/bin/awk -f" as none of the other awk scripts in the -test suite have a hashbang. - -Upstream-Status: Submitted [1] - -[1] https://lists.gnu.org/archive/html/bug-gawk/2016-11/msg00003.html - -Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> ---- - test/arrayind1.awk | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/test/arrayind1.awk b/test/arrayind1.awk -index 5d4a6f3..59e8b4e 100755 ---- a/test/arrayind1.awk -+++ b/test/arrayind1.awk -@@ -1,4 +1,3 @@ --#!/usr/local/bin/awk -f - # this script renums pedigrees with metafounders - # so that they are added *before*regular animals - # mf are ascertained because they are not in the 1st column --- -2.1.4 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/gawk/gawk-4.1.4/run-ptest b/import-layers/yocto-poky/meta/recipes-extended/gawk/gawk/run-ptest index d23f0bf6d..d23f0bf6d 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/gawk/gawk-4.1.4/run-ptest +++ b/import-layers/yocto-poky/meta/recipes-extended/gawk/gawk/run-ptest diff --git a/import-layers/yocto-poky/meta/recipes-extended/gawk/gawk_4.1.4.bb b/import-layers/yocto-poky/meta/recipes-extended/gawk/gawk_4.2.0.bb index 995d37d2a..27f79a2be 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/gawk/gawk_4.1.4.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/gawk/gawk_4.2.0.bb @@ -17,11 +17,10 @@ PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr" SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ file://run-ptest \ - file://test-arrayind1-Remove-hashbang-line.patch \ " -SRC_URI[md5sum] = "f20c94ca51b6ebfc9bffb90f95c8ffbb" -SRC_URI[sha256sum] = "8c03080e2b5a56263e8783f6f1f306398d4591be18254041f3f547efef944d35" +SRC_URI[md5sum] = "0b598c31bc703d66082bd958d4189980" +SRC_URI[sha256sum] = "c88046c6e8396ee548bcb941e16def809b7b55b60a1044b5dd254094f347c7d9" inherit autotools gettext texinfo update-alternatives diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2016-7977.patch b/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2016-7977.patch deleted file mode 100644 index b7eed1241..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2016-7977.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8abd22010eb4db0fb1b10e430d5f5d83e015ef70 Mon Sep 17 00:00:00 2001 -From: Chris Liddell <chris.liddell@artifex.com> -Date: Mon, 3 Oct 2016 01:46:28 +0100 -Subject: [PATCH] Bug 697169: Be rigorous with SAFER permissions - -Once we've opened our input file from the command line, enforce the SAFER -rules. - -Upstream-Status: Backport -CVE: CVE-2016-7977 - -Signed-off-by: Catalin Enache <catalin.enache@windriver.com> ---- - psi/zfile.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/psi/zfile.c b/psi/zfile.c -index b6caea2..2c6c958 100644 ---- a/psi/zfile.c -+++ b/psi/zfile.c -@@ -1081,6 +1081,9 @@ lib_file_open(gs_file_path_ptr lib_path, const gs_memory_t *mem, i_ctx_t *i_ctx - gs_main_instance *minst = get_minst_from_memory(mem); - int code; - -+ if (i_ctx_p && starting_arg_file) -+ i_ctx_p->starting_arg_file = false; -+ - /* when starting arg files (@ files) iodev_default is not yet set */ - if (iodev == 0) - iodev = (gx_io_device *)gx_io_device_table[0]; --- -2.10.2 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch b/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch index e28a949bf..b4c14ea23 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch @@ -12,11 +12,12 @@ Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> # Summary: Generate arch.h for ppc32 # -diff -Nru ghostscript-8.64.orig/base/lib.mak ghostscript-8.64/base/lib.mak ---- ghostscript-8.64.orig/base/lib.mak 2010-02-10 10:30:02.000000000 +0800 -+++ ghostscript-8.64/base/lib.mak 2010-02-10 10:56:21.000000000 +0800 -@@ -67,8 +67,8 @@ - stdpre_h=$(GLSRC)stdpre.h $(stdpn_h) +Index: ghostscript-9.21/base/lib.mak +=================================================================== +--- ghostscript-9.21.orig/base/lib.mak ++++ ghostscript-9.21/base/lib.mak +@@ -73,8 +73,8 @@ arch_h=$(GLGEN)arch.h + stdpre_h=$(GLSRC)stdpre.h stdint__h=$(GLSRC)stdint_.h $(std_h) -$(GLGEN)arch.h : $(GENARCH_XE) diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript_9.21.bb b/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript_9.21.bb index bf985c44a..50ec7e20c 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript_9.21.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript_9.21.bb @@ -32,7 +32,6 @@ SRC_URI = "${SRC_URI_BASE} \ file://ghostscript-9.02-genarch.patch \ file://objarch.h \ file://cups-no-gcrypt.patch \ - file://CVE-2016-7977.patch \ file://CVE-2017-7207.patch \ file://CVE-2017-5951.patch \ file://CVE-2017-7975.patch \ diff --git a/import-layers/yocto-poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb b/import-layers/yocto-poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb index 222fc9d34..ab70ea98a 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda SRC_URI = "git://${GO_IMPORT}" SRCREV = "46695d81d1fae905a270fb7db8a4d11a334562fe" +UPSTREAM_CHECK_COMMITS = "1" GO_IMPORT = "github.com/golang/example" GO_INSTALL = "${GO_IMPORT}/hello" diff --git a/import-layers/yocto-poky/meta/recipes-extended/gperf/gperf.inc b/import-layers/yocto-poky/meta/recipes-extended/gperf/gperf.inc deleted file mode 100644 index a8ce230f6..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/gperf/gperf.inc +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "GNU gperf is a perfect hash function generator" -HOMEPAGE = "http://www.gnu.org/software/gperf" -SUMMARY = "Generate a perfect hash function from a set of keywords" -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://src/main.cc;beginline=8;endline=19;md5=dec8f611845d047387ed56b5b85fa99b" - -SRC_URI = "${GNU_MIRROR}/gperf/gperf-${PV}.tar.gz" - -inherit autotools - -# autoreconf couldn't find acinclude.m4 when stepping into subdirectory. Instead of -# duplicating acinclude.m4 in every subdirectory, use absolute include path to aclocal -EXTRA_AUTORECONF += " -I ${S}" - -do_configure_prepend() { - if [ ! -e ${S}/acinclude.m4 ]; then - cat ${S}/aclocal.m4 > ${S}/acinclude.m4 - fi -} - -BBCLASSEXTEND = "native" diff --git a/import-layers/yocto-poky/meta/recipes-extended/gperf/gperf_3.1.bb b/import-layers/yocto-poky/meta/recipes-extended/gperf/gperf_3.1.bb index 942820b91..f61b2a329 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/gperf/gperf_3.1.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/gperf/gperf_3.1.bb @@ -1,5 +1,18 @@ -require gperf.inc - +DESCRIPTION = "GNU gperf is a perfect hash function generator" +HOMEPAGE = "http://www.gnu.org/software/gperf" +SUMMARY = "Generate a perfect hash function from a set of keywords" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://src/main.cc;beginline=8;endline=19;md5=dec8f611845d047387ed56b5b85fa99b" +SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz" SRC_URI[md5sum] = "9e251c0a618ad0824b51117d5d9db87e" SRC_URI[sha256sum] = "588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2" + +inherit autotools + +# The nested configures don't find the parent aclocal.m4 out of the box, so tell +# it where to look explicitly (mirroring the behaviour of upstream's Makefile.devel). +EXTRA_AUTORECONF += " -I ${S} --exclude=aclocal" + +BBCLASSEXTEND = "native" diff --git a/import-layers/yocto-poky/meta/recipes-extended/grep/grep_3.1.bb b/import-layers/yocto-poky/meta/recipes-extended/grep/grep_3.1.bb index 05b6b9394..71810dc65 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/grep/grep_3.1.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/grep/grep_3.1.bb @@ -14,8 +14,6 @@ SRC_URI[sha256sum] = "db625c7ab3bb3ee757b3926a5cfa8d9e1c3991ad24707a83dde8a5ef2b inherit autotools gettext texinfo pkgconfig -EXTRA_OECONF = "--disable-perl-regexp" - # Fix "Argument list too long" error when len(TMPDIR) = 410 acpaths = "-I ./m4" @@ -36,6 +34,9 @@ do_install () { inherit update-alternatives +PACKAGECONFIG ??= "pcre" +PACKAGECONFIG[pcre] = "--enable-perl-regexp,--disable-perl-regexp,libpcre" + ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN} = "grep egrep fgrep" diff --git a/import-layers/yocto-poky/meta/recipes-extended/gzip/files/0001-gzip-port-zdiff-zless-to-Busybox.patch b/import-layers/yocto-poky/meta/recipes-extended/gzip/files/0001-gzip-port-zdiff-zless-to-Busybox.patch deleted file mode 100644 index 20d5a19f7..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/gzip/files/0001-gzip-port-zdiff-zless-to-Busybox.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 5f712621829ed81a758077431226a86df37fbc3b Mon Sep 17 00:00:00 2001 -From: Denys Zagorui <denys.zagorui@globallogic.com> -Date: Thu, 8 Jun 2017 16:05:50 +0300 -Subject: [PATCH] gzip: port zdiff, zless to Busybox - -Problem reported by Denys Zagorui (Bug#26088). -* tests/zdiff: Check that diff uses POSIX-format output. -* zless.in (less_version): Don't exit merely because 'less -V' -fails; instead, assume 'less' is compatible with an old version of -the original 'less'. Busybox 'less -V' fails, but apparently its -'less' works anyway somehow. - -Signed-off-by: Denys Zagorui <denys.zagorui@globallogic.com> - -Upstream-Status: Accepted ---- - tests/zdiff | 4 +++- - zless.in | 2 +- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/tests/zdiff b/tests/zdiff -index 0bb7c7d..9cd4fd4 100755 ---- a/tests/zdiff -+++ b/tests/zdiff -@@ -22,7 +22,6 @@ - - echo a > a || framework_failure_ - echo b > b || framework_failure_ --gzip a b || framework_failure_ - - cat <<EOF > exp - 1c1 -@@ -31,7 +30,10 @@ cat <<EOF > exp - > b - EOF - -+diff a b | diff exp - || skip_ "diff output format is incompatible with POSIX" -+ - fail=0 -+gzip a b || fail=1 - zdiff a.gz b.gz > out 2>&1 - test $? = 1 || fail=1 - -diff --git a/zless.in b/zless.in -index e634af6..9759ae6 100644 ---- a/zless.in -+++ b/zless.in -@@ -47,7 +47,7 @@ if test "${LESSMETACHARS+set}" != set; then - export LESSMETACHARS - fi - --less_version=`less -V` || exit -+less_version=`less -V 2>/dev/null` - case $less_version in - less' '45[1-9]* | \ - less' '4[6-9][0-9]* | \ --- -1.9.1 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch b/import-layers/yocto-poky/meta/recipes-extended/gzip/gzip-1.9/wrong-path-fix.patch index 4dc10002e..7c37bc8d2 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/gzip/gzip-1.9/wrong-path-fix.patch @@ -13,17 +13,24 @@ Signed-off-by: Ming Liu <ming.liu@windriver.com> Upstream-Status: Pending -Index: gzip-1.8/Makefile.am -=================================================================== ---- gzip-1.8.orig/Makefile.am -+++ gzip-1.8/Makefile.am -@@ -81,8 +81,7 @@ gzip.doc.gz: gzip.doc $(bin_PROGRAMS) - SUFFIXES = .in +--- + Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index d4ecc3f..e4657d2 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -82,8 +82,7 @@ SUFFIXES = .in .in: - $(AM_V_GEN)sed \ + $(AM_V_GEN)rm -f $@-t $@ \ + && sed \ - -e 's|/bin/sh|$(SHELL)|g' \ - -e 's|[@]GREP@|$(GREP)|g' \ + -e 's|[@]GREP@|$(base_bindir)/grep|g' \ -e 's|[@]VERSION@|$(VERSION)|g' \ $(srcdir)/$@.in >$@-t \ - && chmod a+x $@-t \ + && chmod a=rx $@-t \ +-- +2.7.4 + diff --git a/import-layers/yocto-poky/meta/recipes-extended/gzip/gzip_1.8.bb b/import-layers/yocto-poky/meta/recipes-extended/gzip/gzip_1.9.bb index d0932071c..a8eeba138 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/gzip/gzip_1.8.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/gzip/gzip_1.9.bb @@ -3,7 +3,6 @@ require gzip.inc LICENSE = "GPLv3+" SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \ - file://0001-gzip-port-zdiff-zless-to-Busybox.patch \ file://run-ptest" SRC_URI_append_class-target = " file://wrong-path-fix.patch" @@ -34,6 +33,6 @@ do_install_ptest() { ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile } -SRC_URI[md5sum] = "732553152814b22dc35aa0267df5286c" -SRC_URI[sha256sum] = "1ff7aedb3d66a0d73f442f6261e4b3860df6fd6c94025c2cb31a202c9c60fe0e" +SRC_URI[md5sum] = "929d6a6b832f75b28e3eeeafb30c1d9b" +SRC_URI[sha256sum] = "5d2d3a3432ef32f24cdb060d278834507b481a75adeca18850c73592f778f6ad" diff --git a/import-layers/yocto-poky/meta/recipes-extended/hdparm/hdparm/wiper.sh-fix-stat-path.patch b/import-layers/yocto-poky/meta/recipes-extended/hdparm/hdparm/wiper.sh-fix-stat-path.patch new file mode 100644 index 000000000..4af1b617e --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/hdparm/hdparm/wiper.sh-fix-stat-path.patch @@ -0,0 +1,38 @@ +From e233006ee212109d2a1401dac37a9a851cc493d8 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Thu, 14 Dec 2017 15:23:47 +0800 +Subject: [PATCH] wiper.sh: fix stat path + +Fix the stat path for OE. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + wiper/wiper.sh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/wiper/wiper.sh b/wiper/wiper.sh +index 79eddc8..9ef2840 100755 +--- a/wiper/wiper.sh ++++ b/wiper/wiper.sh +@@ -97,7 +97,6 @@ function find_prog(){ + hash -r ## Refresh bash's cached PATH entries + HDPARM=`find_prog /sbin/hdparm` || exit 1 + FIND=`find_prog /usr/bin/find` || exit 1 +-STAT=`find_prog /usr/bin/stat` || exit 1 + GAWK=`find_prog /usr/bin/gawk` || exit 1 + BLKID=`find_prog /sbin/blkid` || exit 1 + GREP=`find_prog /bin/grep` || exit 1 +@@ -105,7 +104,7 @@ ID=`find_prog /usr/bin/id` || exit 1 + LS=`find_prog /bin/ls` || exit 1 + DF=`find_prog /bin/df` || exit 1 + RM=`find_prog /bin/rm` || exit 1 +-STAT=`find_prog /usr/bin/stat` || exit 1 ++STAT=`find_prog /bin/stat` || exit 1 + + [ $verbose -gt 1 ] && HDPARM="$HDPARM --verbose" + +-- +2.7.4 + diff --git a/import-layers/yocto-poky/meta/recipes-extended/hdparm/hdparm_9.52.bb b/import-layers/yocto-poky/meta/recipes-extended/hdparm/hdparm_9.53.bb index 49fdc941a..4c3ec5c48 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/hdparm/hdparm_9.52.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/hdparm/hdparm_9.53.bb @@ -19,12 +19,14 @@ PACKAGES =+ "wiper" FILES_wiper = "${bindir}/wiper.sh" -RDEPENDS_wiper = "bash gawk stat" +RDEPENDS_wiper = "bash gawk coreutils" -SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/${BP}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/${BP}.tar.gz \ + file://wiper.sh-fix-stat-path.patch \ + " -SRC_URI[md5sum] = "410539d0bf3cc247181594581edbfb53" -SRC_URI[sha256sum] = "c3429cd423e271fa565bf584598fd751dd2e773bb7199a592b06b5a61cec4fb6" +SRC_URI[md5sum] = "1e54b52e0c8cb79389d4d47eacba411d" +SRC_URI[sha256sum] = "2673f591df6916c6a1faec07069a7eb1cb8ee307615a615d808192fb0c0265e5" EXTRA_OEMAKE = 'STRIP="echo" LDFLAGS="${LDFLAGS}"' diff --git a/import-layers/yocto-poky/meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch b/import-layers/yocto-poky/meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch deleted file mode 100644 index f1f85a6fa..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch +++ /dev/null @@ -1,46 +0,0 @@ -[PATCH] fix build with musl - -Define additional TCOPTS if not there -u_initX types are in sys/types.h be explicit about it - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- -diff -Naur iptables-1.6.0-origin/extensions/libxt_TCPOPTSTRIP.c iptables-1.6.0/extensions/libxt_TCPOPTSTRIP.c ---- iptables-1.6.0-origin/extensions/libxt_TCPOPTSTRIP.c 2015-12-09 14:55:06.000000000 +0200 -+++ iptables-1.6.0/extensions/libxt_TCPOPTSTRIP.c 2015-12-29 14:44:32.585327077 +0200 -@@ -12,6 +12,21 @@ - #ifndef TCPOPT_MD5SIG - # define TCPOPT_MD5SIG 19 - #endif -+#ifndef TCPOPT_MAXSEG -+#define TCPOPT_MAXSEG 2 -+#endif -+#ifndef TCPOPT_WINDOW -+#define TCPOPT_WINDOW 3 -+#endif -+#ifndef TCPOPT_SACK_PERMITTED -+#define TCPOPT_SACK_PERMITTED 4 -+#endif -+#ifndef TCPOPT_SACK -+#define TCPOPT_SACK 5 -+#endif -+#ifndef TCPOPT_TIMESTAMP -+#define TCPOPT_TIMESTAMP 8 -+#endif - - enum { - O_STRIP_OPTION = 0, -diff -Naur iptables-1.6.0-origin/include/linux/netfilter_ipv4/ip_tables.h iptables-1.6.0/include/linux/netfilter_ipv4/ip_tables.h ---- iptables-1.6.0-origin/include/linux/netfilter_ipv4/ip_tables.h 2015-12-09 14:55:06.000000000 +0200 -+++ iptables-1.6.0/include/linux/netfilter_ipv4/ip_tables.h 2015-12-29 14:40:21.250469195 +0200 -@@ -15,6 +15,7 @@ - #ifndef _IPTABLES_H - #define _IPTABLES_H - -+#include <sys/types.h> - #include <linux/types.h> - - #include <linux/netfilter_ipv4.h> diff --git a/import-layers/yocto-poky/meta/recipes-extended/iptables/iptables/types.h-add-defines-that-are-required-for-if_packet.patch b/import-layers/yocto-poky/meta/recipes-extended/iptables/iptables/types.h-add-defines-that-are-required-for-if_packet.patch deleted file mode 100644 index 24ee29e2d..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/iptables/iptables/types.h-add-defines-that-are-required-for-if_packet.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 19593491f43b70c1a71c3b9b8f4ff4fd14500014 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Fri, 23 Mar 2012 14:27:20 -0400 -Subject: [PATCH] types.h: add defines that are required for if_packet.h - -The iptables local linux/types.h overrides the kernel/sysroot -types.h. As such, we need to provide some defines that are required -to build against 3.2+ kernel headers. - -ifndef protection is provided for the defines to ensure that -configuration that already have these defines are still buildable. - -This commit is temporary until a new version of iptables can be -used that contains the defines. - -This is similar to the commit in the iptables git repository: - - https://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commit;h=dbe77cc974cee656eae37e75039dd1a410a4535b - -Upstream-Status: Backport - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - include/linux/types.h | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -diff --git a/include/linux/types.h b/include/linux/types.h -index 8b483c8..ebf6432 100644 ---- a/include/linux/types.h -+++ b/include/linux/types.h -@@ -34,5 +34,15 @@ typedef __u64 __bitwise __be64; - typedef __u16 __bitwise __sum16; - typedef __u32 __bitwise __wsum; - -+#ifndef __aligned_u64 -+#define __aligned_u64 __u64 __attribute__((aligned(8))) -+#endif -+#ifndef __aligned_be64 -+#define __aligned_be64 __be64 __attribute__((aligned(8))) -+#endif -+#ifndef __aligned_le64 -+#define __aligned_le64 __le64 __attribute__((aligned(8))) -+#endif -+ - #endif /* __ASSEMBLY__ */ - #endif /* _LINUX_TYPES_H */ --- -1.7.0.4 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/iptables/iptables_1.6.1.bb b/import-layers/yocto-poky/meta/recipes-extended/iptables/iptables_1.6.2.bb index b37c55a64..38a83d2b3 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/iptables/iptables_1.6.1.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/iptables/iptables_1.6.2.bb @@ -19,14 +19,12 @@ RRECOMMENDS_${PN} = "kernel-module-x-tables \ FILES_${PN} =+ "${libdir}/xtables/ ${datadir}/xtables" SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ - file://types.h-add-defines-that-are-required-for-if_packet.patch \ file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ file://0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch \ - file://0001-fix-build-with-musl.patch \ " -SRC_URI[md5sum] = "ab38a33806b6182c6f53d6afb4619add" -SRC_URI[sha256sum] = "0fc2d7bd5d7be11311726466789d4c65fb4c8e096c9182b56ce97440864f0cf5" +SRC_URI[md5sum] = "7d2b7847e4aa8832a18437b8a4c1873d" +SRC_URI[sha256sum] = "55d02dfa46263343a401f297d44190f2a3e5113c8933946f094ed40237053733" inherit autotools pkgconfig diff --git a/import-layers/yocto-poky/meta/recipes-extended/iputils/files/0001-Fix-build-on-MUSL.patch b/import-layers/yocto-poky/meta/recipes-extended/iputils/files/0001-Fix-build-on-MUSL.patch new file mode 100644 index 000000000..ce8cfebbb --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/iputils/files/0001-Fix-build-on-MUSL.patch @@ -0,0 +1,95 @@ +From c6c5966d9fae27bc2f0a34ab59b999555111bd2d Mon Sep 17 00:00:00 2001 +From: Aric Belsito <lluixhi@gmail.com> +Date: Sun, 29 Oct 2017 23:17:03 +0100 +Subject: [PATCH] Fix build on MUSL + +Add missing AI_IDN and NI_IDN declarations. + +Bug: https://bugs.gentoo.org/503914 + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + arping.c | 7 +++++++ + ping.h | 11 +++++++++++ + tracepath.c | 8 ++++++++ + traceroute6.c | 4 ++++ + 4 files changed, 30 insertions(+) + +diff --git a/arping.c b/arping.c +index 1a3f40b..531d29d 100644 +--- a/arping.c ++++ b/arping.c +@@ -45,6 +45,13 @@ struct sysfs_devattr_values; + #ifdef USE_IDN + #include <idna.h> + #include <locale.h> ++ ++#ifndef AI_IDN ++#define AI_IDN 0x0040 ++#endif ++#ifndef AI_CANONIDN ++#define AI_CANONIDN 0x0080 ++#endif + #endif + + #include "SNAPSHOT.h" +diff --git a/ping.h b/ping.h +index 749f3ff..227315f 100644 +--- a/ping.h ++++ b/ping.h +@@ -38,6 +38,17 @@ + #include <locale.h> + #include <idna.h> + #include <stringprep.h> ++ ++#ifndef AI_IDN ++#define AI_IDN 0x0040 ++#endif ++#ifndef AI_CANONIDN ++#define AI_CANONIDN 0x0080 ++#endif ++#ifndef NI_IDN ++#define NI_IDN 32 ++#endif ++ + #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN) + #define getnameinfo_flags NI_IDN + #else +diff --git a/tracepath.c b/tracepath.c +index 74a829d..dcec5b9 100644 +--- a/tracepath.c ++++ b/tracepath.c +@@ -30,6 +30,14 @@ + #ifdef USE_IDN + #include <idna.h> + #include <locale.h> ++ ++#ifndef AI_IDN ++#define AI_IDN 0x0040 ++#endif ++#ifndef NI_IDN ++#define NI_IDN 32 ++#endif ++ + #define getnameinfo_flags NI_IDN + #else + #define getnameinfo_flags 0 +diff --git a/traceroute6.c b/traceroute6.c +index 48fc5c5..8d1eebf 100644 +--- a/traceroute6.c ++++ b/traceroute6.c +@@ -251,6 +251,10 @@ + #include <idna.h> + #include <locale.h> + ++#ifndef NI_IDN ++#define NI_IDN 32 ++#endif ++ + #define getnameinfo_flags NI_IDN + #else + #define getnameinfo_flags 0 +-- +2.15.1 + diff --git a/import-layers/yocto-poky/meta/recipes-extended/iputils/files/0001-Fix-header-inclusion-for-musl.patch b/import-layers/yocto-poky/meta/recipes-extended/iputils/files/0001-Fix-header-inclusion-for-musl.patch deleted file mode 100644 index 20ef07e44..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/iputils/files/0001-Fix-header-inclusion-for-musl.patch +++ /dev/null @@ -1,92 +0,0 @@ -From be0bb81d72fea4d20da74f4f2236aa145684f332 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 6 Jan 2016 14:14:22 -0800 -Subject: [PATCH] Fix header inclusion for musl - -Fix errors e.g. - -In file included from tracepath.c:17:0: -/usr/include/linux/errqueue.h:33:18: -error: array type has incomplete element type 'struct timespec' - struct timespec ts[3]; - ^ -tracepath.c: In function 'main': -tracepath.c:329:16: error: 'INT_MAX' undeclared (first use in this -function) - overhead, INT_MAX); - ^ -tracepath.c:329:16: note: each undeclared identifier is reported only -once for each function it appears in -Makefile:131: recipe for target 'tracepath.o' failed -make: *** [tracepath.o] Error 1 - -ping_common.c: In function 'main_loop': -ping_common.c:756:15: error: 'HZ' undeclared (first use in this -function) - if (1000 % HZ == 0 ? next <= 1000 / HZ : (next < INT_MAX / HZ && -next * HZ <= 1000)) { - -protocols/timed.h is not needed and is absent in musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - clockdiff.c | 1 - - ping_common.c | 1 + - tracepath.c | 2 ++ - tracepath6.c | 1 + - 4 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/clockdiff.c b/clockdiff.c -index 7c1ea1b..1d6341e 100644 ---- a/clockdiff.c -+++ b/clockdiff.c -@@ -14,7 +14,6 @@ - #include <netinet/ip.h> - #include <netinet/ip_icmp.h> - #define TSPTYPES --#include <protocols/timed.h> - #include <fcntl.h> - #include <netdb.h> - #include <arpa/inet.h> -diff --git a/ping_common.c b/ping_common.c -index 7f82851..3ce699d 100644 ---- a/ping_common.c -+++ b/ping_common.c -@@ -2,6 +2,7 @@ - #include <ctype.h> - #include <sched.h> - #include <math.h> -+#include <asm-generic/param.h> - - int options; - -diff --git a/tracepath.c b/tracepath.c -index 89e6d16..c9d6ddd 100644 ---- a/tracepath.c -+++ b/tracepath.c -@@ -12,6 +12,8 @@ - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> -+#include <limits.h> -+#include <time.h> - #include <sys/socket.h> - #include <linux/types.h> - #include <linux/errqueue.h> -diff --git a/tracepath6.c b/tracepath6.c -index 126fadf..9d5745c 100644 ---- a/tracepath6.c -+++ b/tracepath6.c -@@ -12,6 +12,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> -+#include <limits.h> - #include <sys/socket.h> - #include <netinet/in.h> - #include <netinet/icmp6.h> --- -2.6.4 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/iputils/files/0001-Intialize-struct-elements-by-name.patch b/import-layers/yocto-poky/meta/recipes-extended/iputils/files/0001-Intialize-struct-elements-by-name.patch deleted file mode 100644 index 6da01dc61..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/iputils/files/0001-Intialize-struct-elements-by-name.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 000629f74908a2a95f6104444c77ad93cf40d62d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 13 Jan 2016 08:50:50 +0000 -Subject: [PATCH] Intialize struct elements by name - -makes it portable across glibc and musl - -Fixes errors - -| ping.c: In function 'send_probe': -| ping.c:735:19: warning: initialization makes integer from pointer -without a cast [-Wint-conversion] -| &iov, 1, &cmsg, 0, 0 }; -| ^ -| ping.c:735:19: note: (near initialization for 'm.__pad1') -| ping.c:735:19: error: initializer element is not computable at load -time -| ping.c:735:19: note: (near initialization for 'm.__pad1') -| make: *** [ping.o] Error 1 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - ping.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/ping.c b/ping.c -index 4989760..e67f381 100644 ---- a/ping.c -+++ b/ping.c -@@ -731,8 +731,15 @@ int send_probe() - - do { - static struct iovec iov = {outpack, 0}; -- static struct msghdr m = { &whereto, sizeof(whereto), -- &iov, 1, &cmsg, 0, 0 }; -+ static struct msghdr m = { -+ .msg_name = &whereto, -+ .msg_namelen = sizeof(whereto), -+ .msg_iov = &iov, -+ .msg_iovlen = 1, -+ .msg_control = &cmsg, -+ .msg_controllen = 0, -+ .msg_flags= 0, -+ }; - m.msg_controllen = cmsg_len; - iov.iov_len = cc; - --- -2.7.0 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/iputils/files/arping-fix-arping-hang-if-SIGALRM-is-blocked.patch b/import-layers/yocto-poky/meta/recipes-extended/iputils/files/arping-fix-arping-hang-if-SIGALRM-is-blocked.patch deleted file mode 100644 index 7b56276b3..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/iputils/files/arping-fix-arping-hang-if-SIGALRM-is-blocked.patch +++ /dev/null @@ -1,44 +0,0 @@ -arping: fix arping hang if SIGALRM is blocked - -Unblock SIGALRM so that the previously called alarm() can prevent -recvfrom() from blocking forever in case the inherited procmask is -blocking SIGALRM and no packet is received. - -Upstream-Status: Backport - -Reported-by: Rui Prior <rprior@dcc.fc.up.pt> -RH-Bugzilla: #1085971 -Signed-off-by: Jan Synacek <jsynacek@redhat.com> -Signed-off-by: Zhenbo Gao <zhenbo.gao@windriver.com> - -diff --git a/arping.c.orig b/arping.c -index 35408c1..2098159 100644 ---- a/arping.c.orig -+++ b/arping.c -@@ -1215,16 +1215,22 @@ main(int argc, char **argv) - socklen_t alen = sizeof(from); - int cc; - -+ sigemptyset(&sset); -+ sigaddset(&sset, SIGALRM); -+ sigaddset(&sset, SIGINT); -+ /* Unblock SIGALRM so that the previously called alarm() -+ * can prevent recvfrom from blocking forever in case the -+ * inherited procmask is blocking SIGALRM and no packet -+ * is received. */ -+ sigprocmask(SIG_UNBLOCK, &sset, &osset); -+ - if ((cc = recvfrom(s, packet, sizeof(packet), 0, - (struct sockaddr *)&from, &alen)) < 0) { - perror("arping: recvfrom"); - continue; - } - -- sigemptyset(&sset); -- sigaddset(&sset, SIGALRM); -- sigaddset(&sset, SIGINT); -- sigprocmask(SIG_BLOCK, &sset, &osset); -+ sigprocmask(SIG_BLOCK, &sset, NULL); - recv_pack(packet, cc, (struct sockaddr_ll *)&from); - sigprocmask(SIG_SETMASK, &osset, NULL); - } diff --git a/import-layers/yocto-poky/meta/recipes-extended/iputils/files/debian/targets.diff b/import-layers/yocto-poky/meta/recipes-extended/iputils/files/debian/targets.diff deleted file mode 100644 index 2cb5576c6..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/iputils/files/debian/targets.diff +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Inappropriate [disable feature] - -Index: iputils-s20121221/Makefile -=================================================================== ---- iputils-s20121221.orig/Makefile -+++ iputils-s20121221/Makefile -@@ -106,7 +106,7 @@ endif - endif - - # ------------------------------------- --IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd -+IPV4_TARGETS=tracepath ping clockdiff arping - IPV6_TARGETS=tracepath6 traceroute6 ping6 - TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS) - diff --git a/import-layers/yocto-poky/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff b/import-layers/yocto-poky/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff deleted file mode 100644 index d3b18868c..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff +++ /dev/null @@ -1,31 +0,0 @@ -Upstream-Status: Pending [from other distro Debian] - -Index: iputils-s20121221/tracepath.c -=================================================================== ---- iputils-s20121221.orig/tracepath.c -+++ iputils-s20121221/tracepath.c -@@ -370,9 +370,9 @@ main(int argc, char **argv) - } - #endif - -- he = gethostbyname(p); -+ he = gethostbyname2(argv[0], AF_INET); - if (he == NULL) { -- herror("gethostbyname"); -+ herror("gethostbyname2"); - exit(1); - } - -Index: iputils-s20121221/ping.c -=================================================================== ---- iputils-s20121221.orig/ping.c -+++ iputils-s20121221/ping.c -@@ -279,7 +279,7 @@ main(int argc, char **argv) - #else - idn = target; - #endif -- hp = gethostbyname(idn); -+ hp = gethostbyname2(idn, AF_INET); - if (!hp) { - fprintf(stderr, "ping: unknown host %s\n", target); - exit(2); diff --git a/import-layers/yocto-poky/meta/recipes-extended/iputils/files/nsgmls-path-fix.patch b/import-layers/yocto-poky/meta/recipes-extended/iputils/files/nsgmls-path-fix.patch deleted file mode 100644 index 92bf946f2..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/iputils/files/nsgmls-path-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -Fix nsgmls path issue - -Upstream-Status: Pending - -Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> - -Index: iputils-s20101006/doc/Makefile -=================================================================== ---- iputils-s20101006.orig/doc/Makefile 2011-09-13 20:42:27.000000000 +0800 -+++ iputils-s20101006/doc/Makefile 2011-09-13 21:01:52.000000000 +0800 -@@ -27,10 +27,15 @@ - # docbook2man produces utterly ugly output and I did not find - # any way to customize this but hacking backend perl script a little. - # Well, hence... -+# nsgmls seems append path to search directory according to the sysid path. -+# e.g. if input ../index.db, it would search $search_directory/../ rather than -+# $search_directory, which leads searching failure. Fixing nsgmls probably -+# introduce some side effects, so use this ugly hack: running nsgmls in current -+# directory, and running docbook2man in tmp directory. - - $(MANFILES): index.db - @-mkdir tmp.db2man -- @set -e; cd tmp.db2man; nsgmls ../$< | sgmlspl ../docbook2man-spec.pl ; mv $@ .. -+ @set -e; nsgmls $< >tmp.db2man/output; cd tmp.db2man; cat output | sgmlspl ../docbook2man-spec.pl ; mv $@ .. - @-rm -rf tmp.db2man - - clean: diff --git a/import-layers/yocto-poky/meta/recipes-extended/iputils/iputils_s20151218.bb b/import-layers/yocto-poky/meta/recipes-extended/iputils/iputils_s20161105.bb index 46de6fc44..0125739b0 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/iputils/iputils_s20151218.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/iputils/iputils_s20161105.bb @@ -1,7 +1,7 @@ SUMMARY = "Network monitoring tools" DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \ tracepath, tracepath6, ping, ping6 and arping." -HOMEPAGE = "http://www.skbuff.net/iputils" +HOMEPAGE = "https://github.com/iputils/iputils" SECTION = "console/network" LICENSE = "BSD & GPLv2+" @@ -13,36 +13,31 @@ LIC_FILES_CHKSUM = "file://ping.c;beginline=1;endline=35;md5=f9ceb201733e9a6cf8f DEPENDS = "gnutls libcap libgcrypt" +SRC_URI = "git://github.com/iputils/iputils \ + file://0001-Fix-build-on-MUSL.patch \ + " +S = "${WORKDIR}/git" +SRCREV = "bffc0e957b98d626ab4cea218c89251201425442" -SRC_URI = "http://www.skbuff.net/iputils/${BPN}-${PV}.tar.bz2 \ - file://debian/use_gethostbyname2.diff \ - file://debian/targets.diff \ - file://nsgmls-path-fix.patch \ - file://0001-Fix-header-inclusion-for-musl.patch \ - file://0001-Intialize-struct-elements-by-name.patch \ - file://arping-fix-arping-hang-if-SIGALRM-is-blocked.patch \ - " - -SRC_URI[md5sum] = "8aaa7395f27dff9f57ae016d4bc753ce" -SRC_URI[sha256sum] = "549f58d71951e52b46595829134d4e330642f522f50026917fadc349a54825a1" - -UPSTREAM_CHECK_REGEX = "iputils-(?P<pver>s\d+).tar" +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>s\d+)" EXTRA_OEMAKE = "-e MAKEFLAGS=" +PACKAGECONFIG ?= "" +PACKAGECONFIG[libidn] = "USE_IDN=yes,USE_IDN=no,libidn" + do_compile () { - oe_runmake 'CC=${CC} -D_GNU_SOURCE' VPATH="${STAGING_LIBDIR}:${STAGING_DIR_HOST}/${base_libdir}" all + oe_runmake 'CC=${CC} -D_GNU_SOURCE' VPATH="${STAGING_LIBDIR}:${STAGING_DIR_HOST}/${base_libdir}" ${PACKAGECONFIG_CONFARGS} all } do_install () { install -m 0755 -d ${D}${base_bindir} # SUID root programs install -m 4555 ping ${D}${base_bindir}/ping - install -m 4555 ping6 ${D}${base_bindir}/ping6 install -m 4555 traceroute6 ${D}${base_bindir}/ install -m 4555 clockdiff ${D}${base_bindir}/ # Other programgs - for i in arping tracepath tracepath6; do + for i in arping tracepath; do install -m 0755 $i ${D}${base_bindir}/ done } @@ -54,19 +49,14 @@ ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN}-ping = "ping" ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" -ALTERNATIVE_${PN}-ping6 = "ping6" -ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6" - -PACKAGES += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6 ${PN}-clockdiff" +PACKAGES += "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-traceroute6 ${PN}-clockdiff" ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN} += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6 ${PN}-clockdiff" +RDEPENDS_${PN} += "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-traceroute6 ${PN}-clockdiff" FILES_${PN} = "" FILES_${PN}-ping = "${base_bindir}/ping.${BPN}" -FILES_${PN}-ping6 = "${base_bindir}/ping6.${BPN}" FILES_${PN}-arping = "${base_bindir}/arping" FILES_${PN}-tracepath = "${base_bindir}/tracepath" -FILES_${PN}-tracepath6 = "${base_bindir}/tracepath6" FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" FILES_${PN}-clockdiff = "${base_bindir}/clockdiff" diff --git a/import-layers/yocto-poky/meta/recipes-extended/less/less_487.bb b/import-layers/yocto-poky/meta/recipes-extended/less/less_529.bb index 23ae484b9..c86f75483 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/less/less_487.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/less/less_529.bb @@ -27,8 +27,8 @@ DEPENDS = "ncurses" SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \ " -SRC_URI[md5sum] = "dcc8bf183a83b362d37fe9ef8df1fb60" -SRC_URI[sha256sum] = "f3dc8455cb0b2b66e0c6b816c00197a71bf6d1787078adeee0bcf2aea4b12706" +SRC_URI[md5sum] = "32018b53a1f7319ab54349baf80e6aa8" +SRC_URI[sha256sum] = "dba42cd4c38174b7bd0d426d8a39df2be6bcc1ec18946a4642713290f6bf9a0b" UPSTREAM_CHECK_URI = "http://www.greenwoodsoftware.com/less/download.html" diff --git a/import-layers/yocto-poky/meta/recipes-extended/libaio/libaio/destdir.patch b/import-layers/yocto-poky/meta/recipes-extended/libaio/libaio/destdir.patch index dad9601c4..0f90406be 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/libaio/libaio/destdir.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/libaio/libaio/destdir.patch @@ -2,16 +2,16 @@ Upstream-Status: Pending from openembedded, added by Qing He <qing.he@intel.com> -Index: libaio-0.3.106/Makefile +Index: libaio-0.3.110/Makefile =================================================================== ---- libaio-0.3.106.orig/Makefile 2004-02-26 07:25:10.000000000 -0800 -+++ libaio-0.3.106/Makefile 2006-10-14 09:19:07.000000000 -0700 -@@ -15,7 +15,7 @@ +--- libaio-0.3.110.orig/Makefile ++++ libaio-0.3.110/Makefile +@@ -15,7 +15,7 @@ all: @$(MAKE) -C src install: - @$(MAKE) -C src install prefix=$(prefix) includedir=$(includedir) libdir=$(libdir) + @$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) includedir=$(DESTDIR)$(includedir) libdir=$(DESTDIR)$(libdir) - - clean: + check: + @$(MAKE) -C harness check diff --git a/import-layers/yocto-poky/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch b/import-layers/yocto-poky/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch index 5683d3c98..db91317ca 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch @@ -9,12 +9,12 @@ This patch fixes following issue with automake 1.12 Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2012/05/03 -Index: libidn-1.24/configure.ac +Index: libidn-1.33/configure.ac =================================================================== ---- libidn-1.24.orig/configure.ac -+++ libidn-1.24/configure.ac -@@ -34,6 +34,10 @@ AC_SUBST(LT_CURRENT, 17) - AC_SUBST(LT_REVISION, 7) +--- libidn-1.33.orig/configure.ac ++++ libidn-1.33/configure.ac +@@ -33,6 +33,10 @@ AC_SUBST(LT_CURRENT, 17) + AC_SUBST(LT_REVISION, 16) AC_SUBST(LT_AGE, 6) +# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it diff --git a/import-layers/yocto-poky/meta/recipes-extended/libmnl/libmnl_1.0.4.bb b/import-layers/yocto-poky/meta/recipes-extended/libmnl/libmnl_1.0.4.bb index b45879980..23262e8c6 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/libmnl/libmnl_1.0.4.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/libmnl/libmnl_1.0.4.bb @@ -11,3 +11,5 @@ SRC_URI[tar.md5sum] = "be9b4b5328c6da1bda565ac5dffadb2d" SRC_URI[tar.sha256sum] = "171f89699f286a5854b72b91d06e8f8e3683064c5901fb09d954a9ab6f551f81" inherit autotools pkgconfig + +BBCLASSEXTEND = "native" diff --git a/import-layers/yocto-poky/meta/recipes-extended/libpipeline/libpipeline_1.5.0.bb b/import-layers/yocto-poky/meta/recipes-extended/libpipeline/libpipeline_1.5.0.bb new file mode 100644 index 000000000..14cc9e519 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/libpipeline/libpipeline_1.5.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "pipeline manipulation library" +DESCRIPTION = "This is a C library for setting up and running pipelines of processes, \ +without needing to involve shell command-line parsing which is often \ +error-prone and insecure." +HOMEPAGE = "http://libpipeline.nongnu.org/" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "${SAVANNAH_GNU_MIRROR}/libpipeline/libpipeline-${PV}.tar.gz" +SRC_URI[md5sum] = "b7437a5020190cfa84f09c412db38902" +SRC_URI[sha256sum] = "0d72e12e4f2afff67fd7b9df0a24d7ba42b5a7c9211ac5b3dcccc5cd8b286f2b" + +inherit pkgconfig autotools + diff --git a/import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch b/import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch index a575d0ebc..e5cb60dd5 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch @@ -1,4 +1,4 @@ -From 4d9b6ec30b78d00ead0a22eb5d047dcdba37e99c Mon Sep 17 00:00:00 2001 +From 47c6f1b4332a9e4935c48cca826786a6b8fe6f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Neal=20Gompa=20=28=E3=83=8B=E3=83=BC=E3=83=AB=E3=83=BB?= =?UTF-8?q?=E3=82=B3=E3=82=99=E3=83=B3=E3=83=8F=E3=82=9A=29?= <ngompa13@gmail.com> @@ -13,6 +13,7 @@ Alex Kanavin: rebased CMakeLists.txt change to apply to latest upstream code. Upstream-Status: Denied [https://github.com/openSUSE/libsolv/pull/112] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- ext/CMakeLists.txt | 7 ++ ext/solv_xfopen.c | 10 +-- @@ -23,7 +24,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> create mode 100644 ext/solv_xfopen_fallback_fopencookie.h diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt -index 586eda8..477a2ef 100644 +index b8917a2..fac6c32 100644 --- a/ext/CMakeLists.txt +++ b/ext/CMakeLists.txt @@ -4,6 +4,13 @@ SET (libsolvext_SRCS @@ -41,11 +42,11 @@ index 586eda8..477a2ef 100644 SET (libsolvext_SRCS ${libsolvext_SRCS} pool_fileconflicts.c repo_rpmdb.c) diff --git a/ext/solv_xfopen.c b/ext/solv_xfopen.c -index b0421bf..31345dd 100644 +index 2c64bb6..eb3a3ad 100644 --- a/ext/solv_xfopen.c +++ b/ext/solv_xfopen.c -@@ -13,6 +13,10 @@ - #include <zlib.h> +@@ -12,6 +12,10 @@ + #include <string.h> #include <fcntl.h> +#if !defined(HAVE_FUNOPEN) && !defined(HAVE_FOPENCOOKIE) @@ -55,7 +56,7 @@ index b0421bf..31345dd 100644 #include "solv_xfopen.h" #include "util.h" -@@ -39,7 +43,7 @@ static FILE *cookieopen(void *cookie, const char *mode, +@@ -21,7 +25,7 @@ static FILE *cookieopen(void *cookie, const char *mode, ssize_t (*cwrite)(void *, const char *, size_t), int (*cclose)(void *)) { @@ -64,7 +65,7 @@ index b0421bf..31345dd 100644 if (!cookie) return 0; return funopen(cookie, -@@ -48,7 +52,7 @@ static FILE *cookieopen(void *cookie, const char *mode, +@@ -30,7 +34,7 @@ static FILE *cookieopen(void *cookie, const char *mode, (fpos_t (*)(void *, fpos_t, int))NULL, /* seekfn */ cclose ); @@ -73,7 +74,7 @@ index b0421bf..31345dd 100644 cookie_io_functions_t cio; if (!cookie) -@@ -60,8 +64,6 @@ static FILE *cookieopen(void *cookie, const char *mode, +@@ -42,8 +46,6 @@ static FILE *cookieopen(void *cookie, const char *mode, cio.write = cwrite; cio.close = cclose; return fopencookie(cookie, *mode == 'w' ? "w" : "r", cio); @@ -246,5 +247,5 @@ index 0000000..6a7bfee + +#endif -- -2.11.0 +2.4.0 diff --git a/import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv/0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch b/import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv/0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch deleted file mode 100644 index 4a4e5cba2..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv/0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1c4c935cb73ac1ccb9693df1a51ba218a22e8ca8 Mon Sep 17 00:00:00 2001 -From: Ming Liu <liu.ming50@gmail.com> -Date: Sat, 30 Sep 2017 11:15:16 +0800 -Subject: [PATCH] repo_rpmdb.c: increase MAX_HDR_CNT and MAX_HDR_DSIZE - -Upstream-Status: Submitted [https://github.com/openSUSE/libsolv/pull/230] - -We encountered 'corrupt rpm' issues when installing extreme big RPM -packages like the kernel-devsrc package of Yocto project. - -It can be fixed by increasing MAX_HDR_CNT and MAX_HDR_DSIZE per test. - -Signed-off-by: Ming Liu <liu.ming50@gmail.com> ---- - ext/repo_rpmdb.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c -index c7000a9..7000835 100644 ---- a/ext/repo_rpmdb.c -+++ b/ext/repo_rpmdb.c -@@ -170,8 +170,8 @@ - #define MAX_SIG_CNT 0x100000 - #define MAX_SIG_DSIZE 0x100000 - --#define MAX_HDR_CNT 0x100000 --#define MAX_HDR_DSIZE 0x2000000 -+#define MAX_HDR_CNT 0x200000 -+#define MAX_HDR_DSIZE 0x4000000 - - typedef struct rpmhead { - int cnt; --- -2.7.4 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv/0002-Fixes-to-internal-fopencookie-implementation.patch b/import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv/0002-Fixes-to-internal-fopencookie-implementation.patch index efb4e3ad7..93b8cc9c1 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv/0002-Fixes-to-internal-fopencookie-implementation.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv/0002-Fixes-to-internal-fopencookie-implementation.patch @@ -1,4 +1,4 @@ -From 99b10cdf6a0f8a24e1670c1813b1d9563ae3f5b5 Mon Sep 17 00:00:00 2001 +From 84e12bf7ece49073c559dfd58005132a6099a964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Neal=20Gompa=20=28=E3=83=8B=E3=83=BC=E3=83=AB=E3=83=BB?= =?UTF-8?q?=E3=82=B3=E3=82=99=E3=83=B3=E3=83=8F=E3=82=9A=29?= <ngompa13@gmail.com> @@ -11,6 +11,7 @@ the tests all pass. Upstream-Status: Denied [https://github.com/openSUSE/libsolv/pull/112] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- ext/solv_xfopen_fallback_fopencookie.c | 19 ++++++++++--------- ext/solv_xfopen_fallback_fopencookie.h | 10 +++++----- @@ -100,5 +101,5 @@ index 6a7bfee..7223e3f 100644 #ifndef SOLV_XFOPEN_FALLBACK_FOPENCOOKIE_H -- -2.11.0 +2.4.0 diff --git a/import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv_0.6.28.bb b/import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv_0.6.33.bb index 6c8f7fc73..0401ced24 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv_0.6.28.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv_0.6.33.bb @@ -8,13 +8,12 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8" DEPENDS = "expat zlib rpm" SRC_URI = "git://github.com/openSUSE/libsolv.git \ - file://0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch \ " SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation.patch \ file://0002-Fixes-to-internal-fopencookie-implementation.patch \ " -SRCREV = "b8a9ddd88eb4e0ab351eb55a53186b5dc5ac0825" +SRCREV = "69f1803978ba7a46a57928fa4be6430792419e4e" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" @@ -25,7 +24,6 @@ EXTRA_OECMAKE = "-DLIB=${baselib} -DMULTI_SEMANTICS=ON -DENABLE_RPMMD=ON -DENABL PACKAGES =+ "${PN}-tools ${PN}ext" -FILES_${PN}-dev += "${datadir}/cmake/Modules/FindLibSolv.cmake" FILES_${PN}-tools = "${bindir}/*" FILES_${PN}ext = "${libdir}/${PN}ext.so.*" diff --git a/import-layers/yocto-poky/meta/recipes-extended/libuser/libuser_0.62.bb b/import-layers/yocto-poky/meta/recipes-extended/libuser/libuser_0.62.bb index 176534664..7ec54eb16 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/libuser/libuser_0.62.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/libuser/libuser_0.62.bb @@ -22,6 +22,9 @@ SRC_URI[sha256sum] = "a58ff4fabb01a25043b142185a33eeea961109dd60d4b40b6a9df4fa3c DEPENDS = "popt libpam glib-2.0 python3" +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + inherit autotools gettext python3native python3-dir pkgconfig gtk-doc EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" diff --git a/import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch b/import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch index b8c7f3751..f17bdce2c 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch @@ -1,4 +1,4 @@ -From e7a8c925b9316a72bdc8f32789ffe56fda5c4788 Mon Sep 17 00:00:00 2001 +From 22afc5d9aaa215c3c87ba21c77d47da44ab3b113 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 26 Aug 2016 18:20:32 +0300 Subject: [PATCH] Use pkg-config for pcre dependency instead of -config script. @@ -7,31 +7,36 @@ RP 2014/5/22 Upstream-Status: Pending Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- - configure.ac | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) + configure.ac | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index 1d172a1..a9236da 100644 +index 5383cec..c29a902 100644 --- a/configure.ac +++ b/configure.ac -@@ -380,11 +380,12 @@ if test "$WITH_PCRE" != "no"; then - PCRE_LIB="-L$WITH_PCRE/lib -lpcre" - CPPFLAGS="$CPPFLAGS -I$WITH_PCRE/include" - else -- AC_PATH_PROG(PCRECONFIG, pcre-config) -- if test x"$PCRECONFIG" != x; then -- PCRE_LIB=`$PCRECONFIG --libs` -- CPPFLAGS="$CPPFLAGS `$PCRECONFIG --cflags`" -- fi -+ PKG_CHECK_MODULES(PCREPKG, [libpcre], [ +@@ -651,10 +651,18 @@ AC_ARG_WITH([pcre], + ) + AC_MSG_RESULT([$WITH_PCRE]) + +-if test "$WITH_PCRE" != no; then +- if test "$WITH_PCRE" != yes; then +- PCRE_LIB="-L$WITH_PCRE/lib -lpcre" +- CPPFLAGS="$CPPFLAGS -I$WITH_PCRE/include" ++if test "$WITH_PCRE" != "no"; then ++ PKG_CHECK_MODULES(PCREPKG, [libpcre], [ + PCRE_LIB=${PCREPKG_LIBS} + CPPFLAGS="$CPPFLAGS ${PCREPKG_CFLAGS}" -+ ], [ ++ ], [ + AC_MSG_ERROR([pcre pkgconfig not found, install the pcre-devel package or build with --without-pcre]) -+ ]) - fi - - if test x"$PCRE_LIB" != x; then ++ ]) ++ ++ if test x"$PCRE_LIB" != x; then ++ AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre]) ++ AC_DEFINE([HAVE_PCRE_H], [1], [pcre.h]) ++ AC_SUBST(PCRE_LIB) + else + AC_PATH_PROG([PCRECONFIG], [pcre-config]) + if test -n "$PCRECONFIG"; then -- -2.9.3 +2.15.0 diff --git a/import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb b/import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb index 08dda3360..3c4444cf4 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb @@ -20,8 +20,8 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ " -SRC_URI[md5sum] = "a128e1eda76899ce3fd115efae5fe631" -SRC_URI[sha256sum] = "1c97225deea33eefba6d4158c2cef27913d47553263516bbe9d2e2760fc43a3f" +SRC_URI[md5sum] = "1e3a9eb5078f481e3a8a1d0aaac8c3c8" +SRC_URI[sha256sum] = "0f8ad5aac7529d7b948b9d7e8cd0b4a9e177309d85d6bf6516e28e6e40d74f36" PACKAGECONFIG ??= "openssl pcre zlib \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ diff --git a/import-layers/yocto-poky/meta/recipes-extended/logrotate/logrotate_3.12.3.bb b/import-layers/yocto-poky/meta/recipes-extended/logrotate/logrotate_3.13.0.bb index 620b2087c..990cf9178 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/logrotate/logrotate_3.12.3.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/logrotate/logrotate_3.13.0.bb @@ -25,8 +25,8 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz file://disable-check-different-filesystems.patch \ " -SRC_URI[md5sum] = "a560c57fac87c45b2fc17406cdf79288" -SRC_URI[sha256sum] = "2e6a401cac9024db2288297e3be1a8ab60e7401ba8e91225218aaf4a27e82a07" +SRC_URI[md5sum] = "78ef24d6fddcc4df8e412dd75c551b4c" +SRC_URI[sha256sum] = "3222ca032f99be8d7a4a8c6ad69f3dcc49b9511bfe384bd5a271ebcd9bd3e52c" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}" diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsb_4.1.bb b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsb_5.0.bb index 07856108b..df4812e4b 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsb_4.1.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsb_5.0.bb @@ -2,7 +2,6 @@ SUMMARY = "LSB support for OpenEmbedded" SECTION = "console/utils" HOMEPAGE = "http://prdownloads.sourceforge.net/lsb" LICENSE = "GPLv2+" -PR = "r2" LSB_CORE = "lsb-core-${TARGET_ARCH}" LSB_CORE_x86 = "lsb-core-ia32" @@ -43,12 +42,12 @@ do_install() { mkdir -p ${D}${base_libdir} mkdir -p ${D}${sysconfdir}/lsb-release.d - printf "LSB_VERSION=\"core-4.1-noarch:" > ${D}${sysconfdir}/lsb-release + printf "LSB_VERSION=\"core-5.0-noarch:" > ${D}${sysconfdir}/lsb-release if [ "${TARGET_ARCH}" = "i586" ] || [ "${TARGET_ARCH}" = "i686" ]; then - printf "core-4.1-ia32" >> ${D}${sysconfdir}/lsb-release + printf "core-5.0-ia32" >> ${D}${sysconfdir}/lsb-release else - printf "core-4.1-${TARGET_ARCH}" >> ${D}${sysconfdir}/lsb-release + printf "core-5.0-${TARGET_ARCH}" >> ${D}${sysconfdir}/lsb-release fi echo "\"" >> ${D}${sysconfdir}/lsb-release echo "DISTRIB_ID=${DISTRO}" >> ${D}${sysconfdir}/lsb-release diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch index 17c90029c..c0076453f 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch @@ -7,18 +7,15 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> rc.d/init.d/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions -index 6850046..11223f7 100644 ---- a/rc.d/init.d/functions -+++ b/rc.d/init.d/functions -@@ -597,6 +597,6 @@ if [ "$_use_systemctl" = "1" ]; then - fi +Index: initscripts-9.72/rc.d/init.d/functions +=================================================================== +--- initscripts-9.72.orig/rc.d/init.d/functions ++++ initscripts-9.72/rc.d/init.d/functions +@@ -686,6 +686,6 @@ if [ "$_use_systemctl" = "1" ]; then + fi fi -strstr "$(cat /proc/cmdline)" "rc.debug" && set -x +strstr "$(cat /proc/cmdline)" "rc.debug" && set -x || true return 0 - --- -2.1.0 - + diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch index 9c58d90c3..e912daa70 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch @@ -1,7 +1,7 @@ -From 57468c5f4e364bdad556604dca09046e1afca929 Mon Sep 17 00:00:00 2001 +From e46b056282c8420f096d5c34d78c00f816788784 Mon Sep 17 00:00:00 2001 From: Fan Xin <fan.xin@jp.fujitsu.com> Date: Mon, 5 Jun 2017 16:26:47 +0900 -Subject: [PATCH] Upstream-Status: Inappropriate [configuration] +Subject: [PATCH 1/2] Upstream-Status: Inappropriate [configuration] Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> @@ -10,23 +10,24 @@ Rebase on 9.72 Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> Upstream-Status: Pending + --- - initscripts-9.72/rc.d/init.d/functions | 2 +- + rc.d/init.d/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/initscripts-9.72/rc.d/init.d/functions b/initscripts-9.72/rc.d/init.d/functions -index 0f627f1..a6aa092 100644 ---- a/initscripts-9.72/rc.d/init.d/functions -+++ b/initscripts-9.72/rc.d/init.d/functions +diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions +index 2e3da964..1a204dec 100644 +--- a/rc.d/init.d/functions ++++ b/rc.d/init.d/functions @@ -59,7 +59,7 @@ systemctl_redirect () { [ -z "${COLUMNS:-}" ] && COLUMNS=80 if [ -z "${CONSOLETYPE:-}" ]; then -- if [ -c "/dev/stderr" -a -r "/dev/stderr" ]; then -+ if [ -c "/dev/stderr" -a -r "/dev/stderr" -a -e /sbin/consoletype ]; then +- if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ]; then ++ if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ] && [ -e /sbin/consoletype ]; then CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)" else CONSOLETYPE="serial" -- -1.9.1 +2.15.1 diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts_9.72.bb b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb index 2d74a6f9d..46edeed8a 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts_9.72.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb @@ -10,11 +10,13 @@ RCONFLICTS_${PN} = "initscripts-functions" LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6" -S="${WORKDIR}/initscripts-${PV}" -SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}.tar.gz/sha512/b6ed38f9576e9227c2ecf047e2d60e1e872f40d51d13861b0c91dddb282f10f7e6b79706a4d1435d7a57a14a0b73a1b71541cfe44c00e8e03ef96b08de19ec32/initscripts-${PV}.tar.gz \ - file://functions.patch;striplevel=2 \ +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/fedora-sysv/initscripts \ + file://functions.patch \ file://0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch \ " +SRCREV = "a51c1b4f7dcf55b568b2ee4c2b18078849943469" +UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)" SRC_URI[md5sum] = "d6c798f40dceb117e12126d94cb25a9a" SRC_URI[sha256sum] = "1793677bdd1f7ee4cb00878ce43346196374f848a4c8e4559e086040fc7487db" diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh index 0eb2793b1..073e247a5 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh +++ b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh @@ -60,7 +60,7 @@ fi PACKAGES_DIR="/var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb" -BASE_PACKAGES_DIR="${PACKAGES_DIR}/base/${LSB_RELEASE}/binary" +BASE_PACKAGES_DIR="${PACKAGES_DIR}/base/released-all/binary" RUNTIME_BASE_PACKAGES_DIR="${PACKAGES_DIR}/test_suites/released-all/binary/runtime" RUNTIME_PACKAGES_DIR="${PACKAGES_DIR}/test_suites/${LSB_RELEASE}/binary/runtime" APP_PACKAGES_DIR="${PACKAGES_DIR}/app-battery/${LSB_RELEASE}/${LSB_ARCH}" @@ -98,7 +98,7 @@ then fi # Official download server list. You can replace them with your own server. -SERVER_IPADDR="140.211.169.23" +SERVER_IPADDR="140.211.169.28" SERVER_NAME="ftp.linuxfoundation.org" if ! `grep -F -q "${SERVER_NAME}" /etc/hosts`; then diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/packages_list b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/packages_list index 959f93150..1a6c11699 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/packages_list +++ b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/packages_list @@ -1,7 +1,7 @@ LSB_RELEASE="released-5.0" LSB_ARCH="lsbarch" -BASE_PACKAGES_LIST="lsb-setup-4.1.0-1.noarch.rpm" +BASE_PACKAGES_LIST="lsb-setup-5.0.0-2.noarch.rpm" RUNTIME_BASE_PACKAGES_LIST="lsb-dist-checker-5.0.0.1-1.targetarch.rpm \ lsb-tet3-lite-3.7-27.lsb5.targetarch.rpm \ diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/session b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/session index 3abcca740..4d47e40f7 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/session +++ b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/session @@ -2,7 +2,7 @@ VERBOSE_LEVEL: 1 ARCHITECTURE: targetarch USE_INTERNET: 1 -STD_VERSION: LSB 4.1 +STD_VERSION: LSB 5.0 STD_PROFILE: no [cmdchk] RUN: 1 @@ -126,15 +126,6 @@ VERSION: local|* AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/python AUTOREPLY_RESULTS_DIR: /opt/lsb/test/python/results -[qt4-azov] -RUN: 1 -VERSION: local|* - -[qt4-azov|local|*] -AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/qt4-azov -AUTOREPLY_X11_FONT_PATH: [default] -AUTOREPLY_RESULTS_DIR: /opt/lsb/test/qt4-azov/results - [xml2-azov] RUN: 1 VERSION: local|* diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest_1.0.bb b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest_1.0.bb index 36f52fd73..a90c023d5 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest_1.0.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest_1.0.bb @@ -10,14 +10,13 @@ SRC_URI = "file://LSB_Test.sh \ file://packages_list \ file://session \ " -RDEPENDS_${PN} = "rpm" +RDEPENDS_${PN} = "lsb rpm" S = "${WORKDIR}" do_install() { - install -d ${D}${bindir} - install -m 0755 ${S}/LSB_Test.sh ${D}${bindir} install -d ${D}/opt/lsb-test + install -m 0755 ${S}/LSB_Test.sh ${D}/opt/lsb-test/LSB_Test.sh install -m 0644 ${S}/packages_list ${D}/opt/lsb-test/packages_list install -m 0644 ${S}/session ${D}/opt/lsb-test/session if [ "${TARGET_ARCH}" = "i586" ] || [ "${TARGET_ARCH}" = "i686" ];then diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0001-add-_GNU_SOURCE-to-pec_listener.c.patch b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0001-add-_GNU_SOURCE-to-pec_listener.c.patch deleted file mode 100644 index 7ec66f814..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0001-add-_GNU_SOURCE-to-pec_listener.c.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ae10245c15a617bd57337981bb42eb36629f9b59 Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke.du@windriver.com> -Date: Wed, 8 Feb 2017 15:53:31 +0800 -Subject: [PATCH 01/26] add _GNU_SOURCE to pec_listener.c - -In previous patch 0007-replace-SIGCLD-with-SIGCHLD.patch made by Khem Raj -contains two aspects: - - 1. replace SIGCLD with SIGCHLD - 2. add _GNU_SOURCE to pec_listener.c - -The replace SIGCLD with SIGCHLD have been integrated upstream, so make a -another patch to add _GNU_SOURCE to pec_listener.c comply with Khem Raj's -previous patch. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Dengke Du <dengke.du@windriver.com> -Upstream-Status: Pending - -%% original patch: 0001-add-_GNU_SOURCE-to-pec_listener.c.patch ---- - testcases/kernel/connectors/pec/pec_listener.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/testcases/kernel/connectors/pec/pec_listener.c b/testcases/kernel/connectors/pec/pec_listener.c -index d11e4dc..b8b5e0d 100644 ---- a/testcases/kernel/connectors/pec/pec_listener.c -+++ b/testcases/kernel/connectors/pec/pec_listener.c -@@ -20,6 +20,7 @@ - /* */ - /******************************************************************************/ - -+#define _GNU_SOURCE - #include <sys/socket.h> - #include <sys/poll.h> - #include <sys/types.h> --- -2.8.1 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch new file mode 100644 index 000000000..da62687d5 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch @@ -0,0 +1,31 @@ +From 4ace68a6ba501907a0741dba5f5f155e06a74c35 Mon Sep 17 00:00:00 2001 +From: Petr Vorel <pvorel@suse.cz> +Date: Wed, 7 Feb 2018 11:09:49 +0100 +Subject: [PATCH] configure: Fix default value of --without-numa switch in help + +The default value is no. + +Fixes: 39a85a1f1 ("configure: add knob to control numa support") + +Signed-off-by: Petr Vorel <pvorel@suse.cz> +Upstream-Status: Accepted +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b39a31d..d66ea00 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -86,7 +86,7 @@ fi + # Numa + AC_ARG_WITH([numa], + AC_HELP_STRING([--without-numa], +- [without numa support (default=yes)]), ++ [without numa support (default=no)]), + [with_numa=no], + [with_numa=yes] + ) +-- +2.7.4 + diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0001-configure-add-knob-to-control-numa-support.patch b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0001-configure-add-knob-to-control-numa-support.patch new file mode 100644 index 000000000..8aaa287b7 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0001-configure-add-knob-to-control-numa-support.patch @@ -0,0 +1,50 @@ +From 39a85a1f1e6624f554215ba4b6843d3689a8415e Mon Sep 17 00:00:00 2001 +From: Anders Roxell <anders.roxell@linaro.org> +Date: Mon, 5 Feb 2018 11:56:04 +0100 +Subject: [PATCH] configure: add knob to control numa support + +Allow to disable numa from the top level. + +Based on patch: +http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-extended/ltp?id=4c7873552e13dfdba96afca7562c398d2966ca71 + +Reported-by: Roy Li <rongqing.li@windriver.com> +Signed-off-by: Anders Roxell <anders.roxell@linaro.org> +Signed-off-by: Petr Vorel <pvorel@suse.cz> +Upstream-Status: Accepted +--- + configure.ac | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 5c8d4ea..b39a31d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -83,6 +83,14 @@ else + AC_SUBST([WITH_EXPECT],["no"]) + fi + ++# Numa ++AC_ARG_WITH([numa], ++ AC_HELP_STRING([--without-numa], ++ [without numa support (default=yes)]), ++ [with_numa=no], ++ [with_numa=yes] ++) ++ + # Perl + AC_ARG_WITH([perl], + [AC_HELP_STRING([--with-perl], +@@ -157,7 +165,9 @@ LTP_CHECK_SELINUX + LTP_CHECK_SIGNAL + LTP_CHECK_SYSCALL_EVENTFD + LTP_CHECK_SYSCALL_MODIFY_LDT ++if test "x$with_numa" = xyes; then + LTP_CHECK_SYSCALL_NUMA ++fi + LTP_CHECK_SYSCALL_QUOTACTL + LTP_CHECK_SYSCALL_SIGNALFD + LTP_CHECK_SYSCALL_UNSHARE +-- +2.7.4 + diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch deleted file mode 100644 index 98650205d..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 867ad5d5d64b9b27ee32148027532db0a00f6433 Mon Sep 17 00:00:00 2001 -From: "Roy.Li" <rongqing.li@windriver.com> -Date: Thu, 7 Jan 2016 17:33:26 +0000 -Subject: [PATCH 02/32] Add knob to control whether numa support should be - checked - -otherwise undeterministic dependency will be generated -during build depending upong numa being staged or not - -Signed-off-by: Roy.Li <rongqing.li@windriver.com> -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending ---- - m4/ltp-numa.m4 | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/m4/ltp-numa.m4 b/m4/ltp-numa.m4 -index 60ae07b..ed7078d 100644 ---- a/m4/ltp-numa.m4 -+++ b/m4/ltp-numa.m4 -@@ -24,7 +24,13 @@ dnl ---------------------------- - dnl - AC_DEFUN([LTP_CHECK_SYSCALL_NUMA], - [dnl --AC_CHECK_HEADERS([linux/mempolicy.h numa.h numaif.h],[ -+AC_MSG_CHECKING([for numa]) -+AC_ARG_WITH( -+ [numa], -+ AC_HELP_STRING([--without-numa], -+ [without numa support]), -+ [], -+ [AC_CHECK_HEADERS([linux/mempolicy.h numa.h numaif.h],[ - LTP_SYSCALL_NUMA_HEADERS=yes - AC_CHECK_LIB(numa,numa_alloc_onnode,[have_numa_alloc_onnode="yes"]) - if test "x$have_numa_alloc_onnode" = "xyes"; then -@@ -48,3 +54,5 @@ if test "x$have_mpol_constants" = "xyes"; then - AC_DEFINE(HAVE_MPOL_CONSTANTS,1,[define to 1 if you have all constants required to use mbind tests]) - fi - )]) -+AC_MSG_RESULT([$with_numa]) -+]) --- -2.7.0 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch index cf744639c..84ab37ea3 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch @@ -22,10 +22,10 @@ Upstream-Status: Pending testcases/realtime/stress/pi-tests/Makefile | 5 +++++ 8 files changed, 35 insertions(+), 2 deletions(-) -diff --git a/Makefile b/Makefile -index 297f8e7..906b280 100644 ---- a/Makefile -+++ b/Makefile +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile @@ -49,6 +49,11 @@ SKIP_IDCHECK ?= 0 UCLINUX ?= 0 export UCLINUX @@ -38,11 +38,11 @@ index 297f8e7..906b280 100644 # CLEAN_TARGETS: Targets which exist solely in clean. # COMMON_TARGETS: Targets which exist in all, clean, and install. # INSTALL_TARGETS: Targets which exist in clean and install (contains -diff --git a/testcases/kernel/Makefile b/testcases/kernel/Makefile -index 50a12fa..4f1987f 100644 ---- a/testcases/kernel/Makefile -+++ b/testcases/kernel/Makefile -@@ -47,13 +47,16 @@ SUBDIRS += connectors \ +Index: git/testcases/kernel/Makefile +=================================================================== +--- git.orig/testcases/kernel/Makefile ++++ git/testcases/kernel/Makefile +@@ -48,13 +48,16 @@ SUBDIRS += connectors \ logging \ mem \ numa \ @@ -60,10 +60,10 @@ index 50a12fa..4f1987f 100644 ifeq ($(WITH_POWER_MANAGEMENT_TESTSUITE),yes) SUBDIRS += power_management endif -diff --git a/testcases/kernel/sched/Makefile b/testcases/kernel/sched/Makefile -index 6245ed0..aa4eb7f 100644 ---- a/testcases/kernel/sched/Makefile -+++ b/testcases/kernel/sched/Makefile +Index: git/testcases/kernel/sched/Makefile +=================================================================== +--- git.orig/testcases/kernel/sched/Makefile ++++ git/testcases/kernel/sched/Makefile @@ -23,5 +23,7 @@ top_srcdir ?= ../../.. @@ -73,11 +73,11 @@ index 6245ed0..aa4eb7f 100644 + FILTER_OUT_DIRS += process_stress +endif include $(top_srcdir)/include/mk/generic_trunk_target.mk -diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile -index 8acb395..b749126 100644 ---- a/testcases/kernel/syscalls/Makefile -+++ b/testcases/kernel/syscalls/Makefile -@@ -28,5 +28,10 @@ ifeq ($(UCLINUX),1) +Index: git/testcases/kernel/syscalls/Makefile +=================================================================== +--- git.orig/testcases/kernel/syscalls/Makefile ++++ git/testcases/kernel/syscalls/Makefile +@@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1) FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ mincore mprotect nftw profil remap_file_pages sbrk endif @@ -87,12 +87,13 @@ index 8acb395..b749126 100644 + ustat +endif - include $(top_srcdir)/include/mk/generic_trunk_target.mk -diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile -index 8bc78c2..c36cf50 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 + ifeq ($(UCLIBC),1) + FILTER_OUT_DIRS += profil +Index: git/testcases/network/nfsv4/acl/Makefile +=================================================================== +--- git.orig/testcases/network/nfsv4/acl/Makefile ++++ git/testcases/network/nfsv4/acl/Makefile +@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre LDLIBS += $(ACL_LIBS) @@ -101,10 +102,10 @@ index 8bc78c2..c36cf50 100644 +endif + 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 3160813..9bdf5d0 100644 ---- a/testcases/network/rpc/basic_tests/Makefile -+++ b/testcases/network/rpc/basic_tests/Makefile +Index: git/testcases/network/rpc/basic_tests/Makefile +=================================================================== +--- git.orig/testcases/network/rpc/basic_tests/Makefile ++++ git/testcases/network/rpc/basic_tests/Makefile @@ -23,4 +23,9 @@ top_srcdir ?= ../../../.. @@ -115,11 +116,11 @@ index 3160813..9bdf5d0 100644 +endif + 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 7a7a57a..5808866 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 +Index: git/testcases/realtime/func/pi-tests/Makefile +=================================================================== +--- git.orig/testcases/realtime/func/pi-tests/Makefile ++++ git/testcases/realtime/func/pi-tests/Makefile +@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre include $(abs_srcdir)/../../config.mk MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex @@ -129,10 +130,10 @@ index 7a7a57a..5808866 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 5edc3b4..aa5987a 100644 ---- a/testcases/realtime/stress/pi-tests/Makefile -+++ b/testcases/realtime/stress/pi-tests/Makefile +Index: git/testcases/realtime/stress/pi-tests/Makefile +=================================================================== +--- git.orig/testcases/realtime/stress/pi-tests/Makefile ++++ git/testcases/realtime/stress/pi-tests/Makefile @@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. include $(top_srcdir)/include/mk/env_pre.mk @@ -143,6 +144,3 @@ index 5edc3b4..aa5987a 100644 +endif + include $(top_srcdir)/include/mk/generic_leaf_target.mk --- -2.7.0 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-sigset1.patch b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-sigset1.patch deleted file mode 100644 index 25f6ba78a..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-sigset1.patch +++ /dev/null @@ -1,139 +0,0 @@ -From dc1905b6d972f9176b40da270c83d8fb4d1751b5 Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke.du@windriver.com> -Date: Wed, 8 Feb 2017 16:12:34 +0800 -Subject: [PATCH 2/5] Rename sigset variable to sigset1 - -sigset API from signal.h is shadowed by this name conflict - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Dengke Du <dengke.du@windriver.com> - -Upstream-Status: Pending ---- - testcases/kernel/mem/shmt/shmt04.c | 10 +++++----- - testcases/kernel/mem/shmt/shmt06.c | 10 +++++----- - testcases/kernel/syscalls/sigprocmask/sigprocmask01.c | 10 +++++----- - 3 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/testcases/kernel/mem/shmt/shmt04.c b/testcases/kernel/mem/shmt/shmt04.c -index b2682da..3f35fad 100644 ---- a/testcases/kernel/mem/shmt/shmt04.c -+++ b/testcases/kernel/mem/shmt/shmt04.c -@@ -56,7 +56,7 @@ int TST_TOTAL = 2; /* Total number of test cases. */ - /**************/ - - key_t key; --sigset_t set; -+sigset_t set1; - - #define SIZE 16*1024 - -@@ -71,9 +71,9 @@ int main(void) - - key = (key_t) getpid(); - -- sigemptyset(&set); -- sigaddset(&set, SIGUSR1); -- sigprocmask(SIG_BLOCK, &set, NULL); -+ sigemptyset(&set1); -+ sigaddset(&set1, SIGUSR1); -+ sigprocmask(SIG_BLOCK, &set1, NULL); - - pid = fork(); - switch (pid) { -@@ -148,7 +148,7 @@ int child(void) - char *cp; - int sig; - -- sigwait(&set, &sig); -+ sigwait(&set1, &sig); - chld_pid = getpid(); - /*--------------------------------------------------------*/ - -diff --git a/testcases/kernel/mem/shmt/shmt06.c b/testcases/kernel/mem/shmt/shmt06.c -index dd69de7..56fb1da 100644 ---- a/testcases/kernel/mem/shmt/shmt06.c -+++ b/testcases/kernel/mem/shmt/shmt06.c -@@ -57,7 +57,7 @@ int TST_TOTAL = 2; /* Total number of test cases. */ - /**************/ - - key_t key; --sigset_t set; -+sigset_t set1; - - int child(); - static int rm_shm(int); -@@ -70,9 +70,9 @@ int main(void) - - key = (key_t) getpid(); - -- sigemptyset(&set); -- sigaddset(&set, SIGUSR1); -- sigprocmask(SIG_BLOCK, &set, NULL); -+ sigemptyset(&set1); -+ sigaddset(&set1, SIGUSR1); -+ sigprocmask(SIG_BLOCK, &set1, NULL); - - pid = fork(); - switch (pid) { -@@ -147,7 +147,7 @@ int child(void) - char *cp; - int sig; - -- sigwait(&set, &sig); -+ sigwait(&set1, &sig); - chld_pid = getpid(); - - if ((shmid = shmget(key, SIZE, 0)) < 0) { -diff --git a/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c b/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c -index 232d25a..06d902f 100644 ---- a/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c -+++ b/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c -@@ -91,7 +91,7 @@ int TST_TOTAL = 1; - int sig_catch = 0; /* variable to blocked/unblocked signals */ - - struct sigaction sa_new; /* struct to hold signal info */ --sigset_t set; /* signal set to hold signal lists */ -+sigset_t set1; /* signal set to hold signal lists */ - sigset_t sigset2; - - int main(int ac, char **av) -@@ -112,7 +112,7 @@ int main(int ac, char **av) - * so that, signal will not be delivered to - * the test process. - */ -- TEST(sigprocmask(SIG_BLOCK, &set, 0)); -+ TEST(sigprocmask(SIG_BLOCK, &set1, 0)); - - /* Get the process id of test process */ - my_pid = getpid(); -@@ -165,7 +165,7 @@ int main(int ac, char **av) - */ - errno = 0; - if (sigprocmask(SIG_UNBLOCK, -- &set, 0) == -1) { -+ &set1, 0) == -1) { - tst_brkm(TFAIL, cleanup, - "sigprocmask() failed " - "to unblock signal, " -@@ -212,7 +212,7 @@ void setup(void) - * Initialise the signal sets with the list that - * excludes/includes all system-defined signals. - */ -- if (sigemptyset(&set) == -1) { -+ if (sigemptyset(&set1) == -1) { - tst_brkm(TFAIL, cleanup, - "sigemptyset() failed, errno=%d : %s", - errno, strerror(errno)); -@@ -235,7 +235,7 @@ void setup(void) - * Add specified signal (SIGINT) to the signal set - * which excludes system-defined signals. - */ -- if (sigaddset(&set, SIGINT) == -1) { -+ if (sigaddset(&set1, SIGINT) == -1) { - tst_brkm(TFAIL, cleanup, - "sigaddset() failed, errno=%d : %s", - errno, strerror(errno)); --- -2.7.4 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch index 3e79c9f29..462976da4 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch @@ -18,10 +18,10 @@ Upstream-Status: Pending testcases/kernel/syscalls/mremap/mremap03.c | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) -diff --git a/testcases/kernel/syscalls/mremap/mremap01.c b/testcases/kernel/syscalls/mremap/mremap01.c -index d63d1e4..24ca174 100644 ---- a/testcases/kernel/syscalls/mremap/mremap01.c -+++ b/testcases/kernel/syscalls/mremap/mremap01.c +Index: git/testcases/kernel/syscalls/mremap/mremap01.c +=================================================================== +--- git.orig/testcases/kernel/syscalls/mremap/mremap01.c ++++ git/testcases/kernel/syscalls/mremap/mremap01.c @@ -76,10 +76,12 @@ */ #include <unistd.h> @@ -35,11 +35,11 @@ index d63d1e4..24ca174 100644 +#undef _GNU_SOURCE #include "test.h" - -diff --git a/testcases/kernel/syscalls/mremap/mremap02.c b/testcases/kernel/syscalls/mremap/mremap02.c -index 5a51b9a..a530a6b 100644 ---- a/testcases/kernel/syscalls/mremap/mremap02.c -+++ b/testcases/kernel/syscalls/mremap/mremap02.c + #include "safe_macros.h" +Index: git/testcases/kernel/syscalls/mremap/mremap02.c +=================================================================== +--- git.orig/testcases/kernel/syscalls/mremap/mremap02.c ++++ git/testcases/kernel/syscalls/mremap/mremap02.c @@ -75,9 +75,11 @@ #include <errno.h> #include <unistd.h> @@ -52,10 +52,10 @@ index 5a51b9a..a530a6b 100644 #include "test.h" -diff --git a/testcases/kernel/syscalls/mremap/mremap03.c b/testcases/kernel/syscalls/mremap/mremap03.c -index 12e3829..9b39f8b 100644 ---- a/testcases/kernel/syscalls/mremap/mremap03.c -+++ b/testcases/kernel/syscalls/mremap/mremap03.c +Index: git/testcases/kernel/syscalls/mremap/mremap03.c +=================================================================== +--- git.orig/testcases/kernel/syscalls/mremap/mremap03.c ++++ git/testcases/kernel/syscalls/mremap/mremap03.c @@ -76,9 +76,11 @@ #include <errno.h> #include <unistd.h> @@ -68,6 +68,3 @@ index 12e3829..9b39f8b 100644 #include "test.h" --- -2.7.0 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0025-mc_gethost-include-sys-types.h.patch b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0025-mc_gethost-include-sys-types.h.patch deleted file mode 100644 index afcba63e1..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0025-mc_gethost-include-sys-types.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9d14edfc12eefac900dd54729a88b3ccf91c1c43 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 8 Jan 2016 07:18:15 +0000 -Subject: [PATCH 25/32] mc_gethost: include sys/types.h - -Fix build on musl -error: unknown type name 'u_char' - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending ---- - testcases/network/multicast/mc_gethost/mc_gethost.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/testcases/network/multicast/mc_gethost/mc_gethost.c b/testcases/network/multicast/mc_gethost/mc_gethost.c -index 5b9a790..c799e2a 100644 ---- a/testcases/network/multicast/mc_gethost/mc_gethost.c -+++ b/testcases/network/multicast/mc_gethost/mc_gethost.c -@@ -6,6 +6,7 @@ - - #include <sys/param.h> - #include <sys/socket.h> -+#include <sys/types.h> - #include <netinet/in.h> - #include <arpa/inet.h> - #include <arpa/nameser.h> --- -2.7.0 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch deleted file mode 100644 index adf6f2741..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1471012164ba8f26046d4b1ce5531a0d92805ef5 Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke.du@windriver.com> -Date: Wed, 8 Feb 2017 16:21:16 +0800 -Subject: [PATCH 4/5] sysconf01: Use _SC_2_C_VERSION conditionally - -_SC_2_C_VERSION is not available on musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Dengke Du <dengke.du@windriver.com> - -Upstream-Status: Pending ---- - testcases/kernel/syscalls/sysconf/sysconf01.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/testcases/kernel/syscalls/sysconf/sysconf01.c b/testcases/kernel/syscalls/sysconf/sysconf01.c -index 583deef..de93695 100644 ---- a/testcases/kernel/syscalls/sysconf/sysconf01.c -+++ b/testcases/kernel/syscalls/sysconf/sysconf01.c -@@ -103,7 +103,9 @@ int main(void) - test_sysconf(_SC_2_C_BIND); - test_sysconf(_SC_2_C_DEV); - #ifdef _SC_2_C_VERSION -+#ifdef __GLIBC__ - test_sysconf(_SC_2_C_VERSION); -+#endif - #else - tst_resm(TCONF, "_SC_2_C_VERSION not defined"); - #endif --- -2.7.4 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch deleted file mode 100644 index efa6d060a..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 00ba7cdd0608b1507027428f9f87b1cb9747372b Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke.du@windriver.com> -Date: Thu, 9 Feb 2017 15:54:53 +0800 -Subject: [PATCH] lib: Use PTHREAD_MUTEX_RECURSIVE in place of - PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP for non-glibc - -e.g. musl does not implement the _NP mutex types - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Dengke Du <dengke.du@windriver.com> - -Upstream-Status: Pending ---- - lib/tst_res.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/lib/tst_res.c b/lib/tst_res.c -index 61daaeb..435224f 100644 ---- a/lib/tst_res.c -+++ b/lib/tst_res.c -@@ -79,7 +79,11 @@ int TEST_ERRNO; - assert(strlen(buf) > 0); \ - } while (0) - -+#ifdef __GLIBC__ - static pthread_mutex_t tmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; -+#else -+static pthread_mutex_t tmutex = { PTHREAD_MUTEX_RECURSIVE }; -+#endif - - static void check_env(void); - static void tst_condense(int tnum, int ttype, const char *tmesg); --- -2.7.4 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch deleted file mode 100644 index 868e1cf1f..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 5e3dea669e5b0b769f322d54a3bb9f320b5327da Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 22 Mar 2016 15:47:14 +0000 -Subject: [PATCH 26/26] shmat1: Cover GNU specific code under __USE_GNU - -on x86, we use uc_mcontext element from sigcontext -which is marked gnu-specific in glibc, this patch -adds this condition around the code - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - testcases/kernel/mem/mtest06/shmat1.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/testcases/kernel/mem/mtest06/shmat1.c b/testcases/kernel/mem/mtest06/shmat1.c -index 0d6d7a4..bee69f6 100644 ---- a/testcases/kernel/mem/mtest06/shmat1.c -+++ b/testcases/kernel/mem/mtest06/shmat1.c -@@ -111,7 +111,7 @@ int done_shmat = 0; /* disallow read and writes before shmat */ - static void sig_handler(int signal, /* signal number, set to handle SIGALRM */ - int code, struct ucontext *ut) - { /* contains pointer to sigcontext structure */ --#ifdef __i386__ -+#if defined(__i386__) && defined(__USE_GNU) - unsigned long except; /* exception type. */ - int ret = 0; /* exit code from signal handler. */ - struct sigcontext *scp = /* pointer to sigcontext structure */ -@@ -122,7 +122,7 @@ static void sig_handler(int signal, /* signal number, set to handle SIGALRM - fprintf(stdout, "Test ended, success\n"); - exit(0); - } --#ifdef __i386__ -+#if defined(__i386__) && defined(__USE_GNU) - else { - except = scp->trapno; - fprintf(stderr, "signal caught - [%d] ", signal); --- -1.9.1 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch deleted file mode 100644 index c8738ae0d..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch +++ /dev/null @@ -1,113 +0,0 @@ -From a9d5595d2fa2ab252f1cabf63f4b65c3efbafeb9 Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke.du@windriver.com> -Date: Thu, 10 Aug 2017 15:27:03 +0800 -Subject: [PATCH] ltp: fix PAGE_SIZE redefinition and O_CREAT undeclear when - build with musl - -error 1: - -|stack_clash.c:50:22: error: expected identifier or '(' before numeric constant -| static unsigned long PAGE_SIZE; - -This is because the musl libc already contain PAGE_SIZE definition in limits.c, -we can check it here: - - https://git.musl-libc.org/cgit/musl/tree/include/limits.h#n43 - -error 2: - -|ck01.c:157:22: error: 'O_CREAT' undeclared (first use in this function); did you mean 'S_IREAD'? -| fd = open(filename, O_CREAT | O_TRUNC | O_RDWR, 0644); -| ^~~~~~~ -| S_IREAD - -This is because the musl libc put those in fcntl.h, so we should include that -file. - -Upstream-Status: Submitted [ https://github.com/linux-test-project/ltp/pull/194 ] - -Signed-off-by: Dengke Du <dengke.du@windriver.com> ---- - testcases/cve/stack_clash.c | 12 ++++++------ - testcases/kernel/syscalls/flock/flock01.c | 1 + - testcases/kernel/syscalls/flock/flock02.c | 1 + - 3 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/testcases/cve/stack_clash.c b/testcases/cve/stack_clash.c -index 2ef1a82..7c45991 100644 ---- a/testcases/cve/stack_clash.c -+++ b/testcases/cve/stack_clash.c -@@ -47,7 +47,7 @@ - #include "tst_test.h" - #include "tst_safe_stdio.h" - --static unsigned long PAGE_SIZE; -+static unsigned long PAGE_SIZE_tst; - static unsigned long PAGE_MASK; - static unsigned long GAP_PAGES = 256; - static unsigned long THRESHOLD; -@@ -66,7 +66,7 @@ void exhaust_stack_into_sigsegv(void) - exhaust_stack_into_sigsegv(); - } - --#define MAPPED_LEN PAGE_SIZE -+#define MAPPED_LEN PAGE_SIZE_tst - static unsigned long mapped_addr; - - void segv_handler(int sig, siginfo_t *info, void *data LTP_ATTRIBUTE_UNUSED) -@@ -150,7 +150,7 @@ void do_child(void) - stack_t signal_stack; - struct sigaction segv_sig = {.sa_sigaction = segv_handler, .sa_flags = SA_ONSTACK|SA_SIGINFO}; - void *map; -- unsigned long gap = GAP_PAGES * PAGE_SIZE; -+ unsigned long gap = GAP_PAGES * PAGE_SIZE_tst; - struct rlimit rlimit; - - rlimit.rlim_cur = rlimit.rlim_max = RLIM_INFINITY; -@@ -200,8 +200,8 @@ void setup(void) - { - char buf[4096], *p; - -- PAGE_SIZE = sysconf(_SC_PAGESIZE); -- PAGE_MASK = ~(PAGE_SIZE - 1); -+ PAGE_SIZE_tst = sysconf(_SC_PAGESIZE); -+ PAGE_MASK = ~(PAGE_SIZE_tst - 1); - - buf[4095] = '\0'; - SAFE_FILE_SCANF("/proc/cmdline", "%4095[^\n]", buf); -@@ -214,7 +214,7 @@ void setup(void) - tst_res(TINFO, "stack_guard_gap = %ld", GAP_PAGES); - } - -- THRESHOLD = (GAP_PAGES - 1) * PAGE_SIZE; -+ THRESHOLD = (GAP_PAGES - 1) * PAGE_SIZE_tst; - - { - volatile int *a = alloca(128); -diff --git a/testcases/kernel/syscalls/flock/flock01.c b/testcases/kernel/syscalls/flock/flock01.c -index 3e17be4..06d89e3 100644 ---- a/testcases/kernel/syscalls/flock/flock01.c -+++ b/testcases/kernel/syscalls/flock/flock01.c -@@ -69,6 +69,7 @@ - #include <stdio.h> - #include <sys/wait.h> - #include <sys/file.h> -+#include <fcntl.h> - #include "test.h" - - void setup(void); -diff --git a/testcases/kernel/syscalls/flock/flock02.c b/testcases/kernel/syscalls/flock/flock02.c -index 414df68..9ddf729 100644 ---- a/testcases/kernel/syscalls/flock/flock02.c -+++ b/testcases/kernel/syscalls/flock/flock02.c -@@ -75,6 +75,7 @@ - #include <sys/types.h> - #include <sys/file.h> - #include <sys/wait.h> -+#include <fcntl.h> - #include <errno.h> - #include <stdio.h> - #include "test.h" --- -2.7.4 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch deleted file mode 100644 index f7c0a4bf1..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2f6ab8f694b26b7f2566624f6d1f23788d6ab8a0 Mon Sep 17 00:00:00 2001 -From: Jan Stancek <jstancek@redhat.com> -Date: Mon, 11 Sep 2017 12:57:58 +0200 -Subject: [PATCH] commands/gdb01: replace stdin with /dev/null - -If this testcase runs as background process, gdb can receive -SIGTTOU and then testcase gets stuck. - -Signed-off-by: Jan Stancek <jstancek@redhat.com> - -Upstream-Status: Backport -[https://github.com/linux-test-project/ltp/commit/2f6ab8f694b26b7f2566624f6d1f23788d6ab8a0] - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - testcases/commands/gdb/gdb01.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/commands/gdb/gdb01.sh b/testcases/commands/gdb/gdb01.sh -index 07ae36f..e3a5b51 100755 ---- a/testcases/commands/gdb/gdb01.sh -+++ b/testcases/commands/gdb/gdb01.sh -@@ -29,7 +29,7 @@ TST_NEEDS_CMDS="gdb /bin/cat" - - simple_test() - { -- gdb /bin/cat -ex "run /etc/passwd" -ex quit -+ gdb /bin/cat -ex "run /etc/passwd" -ex quit < /dev/null - RC=$? - if [ $RC -eq 0 ] ; then - tst_res TPASS "gdb attached to process and completed run" --- -2.7.4 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch new file mode 100644 index 000000000..e7c927e11 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch @@ -0,0 +1,252 @@ +From 04da9478887e705ea38e4f097492da20e651686c Mon Sep 17 00:00:00 2001 +From: Guangwen Feng <fenggw-fnst@cn.fujitsu.com> +Date: Wed, 13 Sep 2017 15:48:42 +0800 +Subject: [PATCH] commands/ar01: Fix for test in deterministic mode + +If binutils was configured with --enable-deterministic-archives, +ar will run in deterministic mode by default, and use zero for +timestamps and uids/gids, which makes the test case abnormal. + +Fix this by add the "U" modifier when deterministic mode is default. + +Signed-off-by: Guangwen Feng <fenggw-fnst@cn.fujitsu.com> +Signed-off-by: Fei Jie <feij.fnst@cn.fujitsu.com> + +Upstream-Status: Backport +[http://lists.linux.it/pipermail/ltp/2017-September/005668.html] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + testcases/commands/ar/ar01 | 92 ++++++++++++++++++++++++++-------------------- + 1 file changed, 52 insertions(+), 40 deletions(-) + +diff --git a/testcases/commands/ar/ar01 b/testcases/commands/ar/ar01 +index ddab2e0..d688f76 100644 +--- a/testcases/commands/ar/ar01 ++++ b/testcases/commands/ar/ar01 +@@ -23,14 +23,26 @@ + # This is a basic ar command test. + # + TST_CNT=17 ++TST_SETUP=setup + TST_TESTFUNC=test + TST_NEEDS_TMPDIR=1 + . tst_test.sh + ++setup() ++{ ++ ar --help | grep "use zero for timestamps and uids/gids (default)" \ ++ >/dev/null ++ if [ $? -eq 0 ]; then ++ MOD="U" ++ else ++ MOD="" ++ fi ++} ++ + test1() + { +- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in +- ROD ar -ra file1.in lib.a $TST_DATAROOT/file2.in ++ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in ++ ROD ar -ra"$MOD" file1.in lib.a $TST_DATAROOT/file2.in + ROD ar -t lib.a \> ar.out + + printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp +@@ -47,9 +59,9 @@ test1() + + test2() + { +- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \ +- $TST_DATAROOT/file3.in $TST_DATAROOT/file4.in +- ROD ar -ma file1.in lib.a file4.in ++ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \ ++ $TST_DATAROOT/file3.in $TST_DATAROOT/file4.in ++ ROD ar -ma"$MOD" file1.in lib.a file4.in + ROD ar -t lib.a \> ar.out + + printf "file1.in\nfile4.in\nfile2.in\nfile3.in\n" > ar.exp +@@ -66,8 +78,8 @@ test2() + + test3() + { +- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in +- ROD ar -rb file3.in lib.a $TST_DATAROOT/file2.in ++ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in ++ ROD ar -rb"$MOD" file3.in lib.a $TST_DATAROOT/file2.in + ROD ar -t lib.a \> ar.out + + printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp +@@ -84,9 +96,9 @@ test3() + + test4() + { +- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in \ +- $TST_DATAROOT/file2.in +- ROD ar -mb file3.in lib.a file2.in ++ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in \ ++ $TST_DATAROOT/file2.in ++ ROD ar -mb"$MOD" file3.in lib.a file2.in + ROD ar -t lib.a \> ar.out + + printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp +@@ -103,7 +115,7 @@ test4() + + test5() + { +- ROD ar -cr lib.a $TST_DATAROOT/file1.in \> ar.out ++ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in \> ar.out + + if [ -s ar.out ]; then + tst_res TFAIL "ar produced output unexpectedly (-c)" +@@ -117,7 +129,7 @@ test5() + + test6() + { +- ROD ar -qc lib.a $TST_DATAROOT/file1.in \> ar.out ++ ROD ar -qc"$MOD" lib.a $TST_DATAROOT/file1.in \> ar.out + + if [ -s ar.out ]; then + tst_res TFAIL "ar produced output unexpectedly (-qc)" +@@ -131,9 +143,9 @@ test6() + + test7() + { +- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \ +- $TST_DATAROOT/file3.in +- ROD ar -d lib.a file1.in file2.in ++ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \ ++ $TST_DATAROOT/file3.in ++ ROD ar -d"$MOD" lib.a file1.in file2.in + ROD ar -t lib.a \> ar.out + + printf "file3.in\n" > ar.exp +@@ -150,9 +162,9 @@ test7() + + test8() + { +- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \ +- $TST_DATAROOT/file3.in +- ROD ar -d lib.a ++ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \ ++ $TST_DATAROOT/file3.in ++ ROD ar -d"$MOD" lib.a + ROD ar -t lib.a \> ar.out + + printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp +@@ -169,8 +181,8 @@ test8() + + test9() + { +- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in +- ROD ar -ri file3.in lib.a $TST_DATAROOT/file2.in ++ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in ++ ROD ar -ri"$MOD" file3.in lib.a $TST_DATAROOT/file2.in + ROD ar -t lib.a \> ar.out + + printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp +@@ -187,9 +199,9 @@ test9() + + test10() + { +- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in \ +- $TST_DATAROOT/file2.in +- ROD ar -mi file3.in lib.a file2.in ++ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in \ ++ $TST_DATAROOT/file2.in ++ ROD ar -mi"$MOD" file3.in lib.a file2.in + ROD ar -t lib.a \> ar.out + + printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp +@@ -206,9 +218,9 @@ test10() + + test11() + { +- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in \ +- $TST_DATAROOT/file2.in +- ROD ar -m lib.a file3.in ++ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in \ ++ $TST_DATAROOT/file2.in ++ ROD ar -m"$MOD" lib.a file3.in + ROD ar -t lib.a \> ar.out + + printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp +@@ -225,9 +237,9 @@ test11() + + test12() + { +- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \ +- $TST_DATAROOT/file3.in +- ROD ar -p lib.a \> ar.out ++ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \ ++ $TST_DATAROOT/file3.in ++ ROD ar -p"$MOD" lib.a \> ar.out + + printf "This is file one\nThis is file two\nThis is file three\n" > ar.exp + +@@ -244,9 +256,9 @@ test12() + test13() + { + +- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \ +- $TST_DATAROOT/file3.in +- ROD ar -q lib.a $TST_DATAROOT/file4.in ++ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \ ++ $TST_DATAROOT/file3.in ++ ROD ar -q"$MOD" lib.a $TST_DATAROOT/file4.in + ROD ar -t lib.a \> ar.out + + printf "file1.in\nfile2.in\nfile3.in\nfile4.in\n" > ar.exp +@@ -264,14 +276,14 @@ test13() + test14() + { + ROD touch file0.in +- ROD ar -cr lib.a file0.in $TST_DATAROOT/file1.in ++ ROD ar -cr"$MOD" lib.a file0.in $TST_DATAROOT/file1.in + + file0_mtime1=$(ar -tv lib.a | grep file0.in) + file1_mtime1=$(ar -tv lib.a | grep file1.in) + + touch -c -t $(date --date='next day' +"%Y%m%d%H%M") file0.in + +- ROD ar -ru lib.a file0.in $TST_DATAROOT/file1.in ++ ROD ar -ru"$MOD" lib.a file0.in $TST_DATAROOT/file1.in + + file0_mtime2=$(ar -tv lib.a | grep file0.in) + file1_mtime2=$(ar -tv lib.a | grep file1.in) +@@ -293,7 +305,7 @@ test14() + + test15() + { +- ROD ar -cr lib.a $TST_DATAROOT/file1.in ++ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in + ROD ar -tv lib.a \> ar.out + + if grep -q '[rwx-]\{9\} [0-9].*/[0-9].*\s*[0-9].*.*file1.in' ar.out; then +@@ -308,9 +320,9 @@ test15() + + test16() + { +- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \ +- $TST_DATAROOT/file3.in +- ROD ar -xv lib.a \> ar.out ++ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \ ++ $TST_DATAROOT/file3.in ++ ROD ar -xv"$MOD" lib.a \> ar.out + + printf "x - file1.in\nx - file2.in\nx - file3.in\n" > ar.exp + +@@ -332,8 +344,8 @@ test16() + + test17() + { +- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in +- ROD ar -xv lib.a file2.in \> ar.out ++ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in ++ ROD ar -xv"$MOD" lib.a file2.in \> ar.out + + printf "x - file2.in\n" > ar.exp + +-- +2.7.4 + diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch new file mode 100644 index 000000000..5096a85c1 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch @@ -0,0 +1,40 @@ +From 67af7dbe8bdf29f9ed980d8d29feeae32a0a7a1d Mon Sep 17 00:00:00 2001 +From: Li Wang <liwang@redhat.com> +Date: Tue, 23 Jan 2018 17:46:35 +0800 +Subject: [PATCH] safe_macros: make is_fuse() return zero if fs_type is NULL + +This commmit 28507e514c(safe_mount: Do not try mount() syscall for FUSE fs) +involves FUSE fs check in safe_mount(), but we'd better guarantee the "fs_type" +is legal to check in is_fuse() function otherwise system will kill the program. + + cmdline="fanotify06" + contacts="" + analysis=exit + <<<test_output>>> + tst_test.c:980: INFO: Timeout per run is 0h 10m 00s + tst_test.c:1025: BROK: Test killed by SIGSEGV! + +Signed-off-by: Li Wang <liwang@redhat.com> +Acked-by: Jan Stancek <jstancek@redhat.com> +Upstream-Status: Accepted [https://github.com/linux-test-project/ltp/commit/67af7dbe8bdf29f9ed980d8d29feeae32a0a7a1d] +--- + lib/safe_macros.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/safe_macros.c b/lib/safe_macros.c +index c48e436dc..abdeca013 100644 +--- a/lib/safe_macros.c ++++ b/lib/safe_macros.c +@@ -708,6 +708,9 @@ static int is_fuse(const char *fs_type) + { + unsigned int i; + ++ if (!fs_type) ++ return 0; ++ + for (i = 0; i < ARRAY_SIZE(fuse_fs_types); i++) { + if (!strcmp(fuse_fs_types[i], fs_type)) + return 1; +-- +2.11.0 + diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp_20170516.bb b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp_20180118.bb index 653cbfd4e..14fb41b3b 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp_20170516.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp_20180118.bb @@ -21,11 +21,11 @@ DEPENDS_append_libc-musl = " fts " EXTRA_OEMAKE_append_libc-musl = " LIBC=musl " CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "18916a2e6d8c997b7b29dcfa9550d5a15b22ed22" +SRCREV = "731cd34e682d297b207668be8b1d15320a9ac1b1" SRC_URI = "git://github.com/linux-test-project/ltp.git \ - file://0001-add-_GNU_SOURCE-to-pec_listener.c.patch \ - file://0002-Add-knob-to-control-whether-numa-support-should-be-c.patch \ + file://0001-configure-add-knob-to-control-numa-support.patch \ + file://0001-configure-Fix-default-value-of-without-numa-switch-i.patch \ file://0003-Add-knob-to-control-tirpc-support.patch \ file://0004-build-Add-option-to-select-libc-implementation.patch \ file://0005-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ @@ -33,23 +33,18 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \ file://0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch \ file://0010-replace-__BEGIN_DECLS-and-__END_DECLS.patch \ - file://0011-Rename-sigset-variable-to-sigset1.patch \ file://0018-guard-mallocopt-with-__GLIBC__.patch \ file://0020-getdents-define-getdents-getdents64-only-for-glibc.patch \ file://0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch \ file://0023-ptrace-Use-int-instead-of-enum-__ptrace_request.patch \ file://0024-rt_sigaction-rt_sigprocmark-Define-_GNU_SOURCE.patch \ - file://0025-mc_gethost-include-sys-types.h.patch \ file://0026-crash01-Define-_GNU_SOURCE.patch \ - file://0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch \ file://0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch \ - file://0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch \ - file://0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch \ file://0034-periodic_output.patch \ file://0035-fix-test_proc_kill-hang.patch \ file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ - file://0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch \ - file://0038-commands-gdb01-replace-stdin-with-dev-null.patch \ + file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \ + file://0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch \ " S = "${WORKDIR}/git" @@ -101,20 +96,18 @@ RDEPENDS_${PN} = "\ logrotate \ perl \ python-core \ + procps \ unzip \ util-linux \ which \ + tar \ " -FILES_${PN}-staticdev += "/opt/ltp/lib/libmem.a /opt/ltp/testcases/data/nm01/lib.a" +FILES_${PN} += "/opt/ltp/* /opt/ltp/runtest/* /opt/ltp/scenario_groups/* /opt/ltp/testcases/bin/* /opt/ltp/testcases/bin/*/bin/* /opt/ltp/testscripts/* /opt/ltp/testcases/open_posix_testsuite/* /opt/ltp/testcases/open_posix_testsuite/conformance/* /opt/ltp/testcases/open_posix_testsuite/Documentation/* /opt/ltp/testcases/open_posix_testsuite/functional/* /opt/ltp/testcases/open_posix_testsuite/include/* /opt/ltp/testcases/open_posix_testsuite/scripts/* /opt/ltp/testcases/open_posix_testsuite/stress/* /opt/ltp/testcases/open_posix_testsuite/tools/* /opt/ltp/testcases/data/nm01/lib.a /opt/ltp/lib/libmem.a" -FILES_${PN} += "/opt/ltp/* /opt/ltp/runtest/* /opt/ltp/scenario_groups/* /opt/ltp/testcases/bin/* /opt/ltp/testcases/bin/*/bin/* /opt/ltp/testscripts/* /opt/ltp/testcases/open_posix_testsuite/* /opt/ltp/testcases/open_posix_testsuite/conformance/* /opt/ltp/testcases/open_posix_testsuite/Documentation/* /opt/ltp/testcases/open_posix_testsuite/functional/* /opt/ltp/testcases/open_posix_testsuite/include/* /opt/ltp/testcases/open_posix_testsuite/scripts/* /opt/ltp/testcases/open_posix_testsuite/stress/* /opt/ltp/testcases/open_posix_testsuite/tools/*" - -# Avoid generated binaries stripping. Otherwise some of the ltp tests such as ldd01 & nm01 fails -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -# However, test_arch_stripped is already stripped, so... -INSANE_SKIP_${PN} += "already-stripped" +# Avoid stripping some generated binaries otherwise some of the ltp tests such as ldd01 & nm01 fail +INHIBIT_PACKAGE_STRIP_FILES = "/opt/ltp/testcases/bin/nm01 /opt/ltp/testcases/bin/ldd01" +INSANE_SKIP_${PN} += "already-stripped staticdev" # Avoid file dependency scans, as LTP checks for things that may or may not # exist on the running system. For instance it has specific checks for diff --git a/import-layers/yocto-poky/meta/recipes-extended/man-db/man-db_2.8.1.bb b/import-layers/yocto-poky/meta/recipes-extended/man-db/man-db_2.8.1.bb new file mode 100644 index 000000000..8328a671f --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/man-db/man-db_2.8.1.bb @@ -0,0 +1,43 @@ +SUMMARY = "An implementation of the standard Unix documentation system accessed using the man command" +HOMEPAGE = "http://man-db.nongnu.org/" +LICENSE = "LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ + file://docs/COPYING;md5=eb723b61539feef013de476e68b5c50a" + +SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz" +SRC_URI[md5sum] = "51842978e06686286421f9498d1009b7" +SRC_URI[sha256sum] = "a6aec641ca3d9942b054cc0e9c3f05cb46a3a992bc0006795755e2fed1357f3e" + +DEPENDS = "libpipeline gdbm groff-native" + +# | /usr/src/debug/man-db/2.8.0-r0/man-db-2.8.0/src/whatis.c:939: undefined reference to `_nl_msg_cat_cntr' +USE_NLS_libc-musl = "no" + +inherit gettext pkgconfig autotools + +EXTRA_OECONF = "--with-pager=less --disable-cache-owner" + +do_install_append_libc-musl() { + rm -f ${D}${libdir}/charset.alias +} + +FILES_${PN} += "${prefix}/lib/tmpfiles.d" + +FILES_${PN}-dev += "${libdir}/man-db/libman.so ${libdir}/${BPN}/libmandb.so" + +RDEPENDS_${PN} += "groff" +RRECOMMENDS_${PN} += "less" +RPROVIDES_${PN} += " man" + +def compress_pkg(d): + if bb.utils.contains("INHERIT", "compress_doc", True, False, d): + compress = d.getVar("DOC_COMPRESS") + if compress == "gz": + return "gzip" + elif compress == "bz2": + return "bzip2" + elif compress == "xz": + return "xz" + return "" + +RDEPENDS_${PN} += "${@compress_pkg(d)}" diff --git a/import-layers/yocto-poky/meta/recipes-extended/man-pages/man-pages_4.11.bb b/import-layers/yocto-poky/meta/recipes-extended/man-pages/man-pages_4.14.bb index a3077a9ff..f8bd090d1 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/man-pages/man-pages_4.11.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/man-pages/man-pages_4.14.bb @@ -4,11 +4,11 @@ SECTION = "console/utils" HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://README;md5=8f2a3d43057d458e5066714980567a60" +LIC_FILES_CHKSUM = "file://README;md5=794f701617cc03fe50c53257660d8ec4" SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/Archive/${BP}.tar.gz" -SRC_URI[md5sum] = "408300ed09d1ad5938070158b21da1d1" -SRC_URI[sha256sum] = "e6db91a24e68c7c765b7b8e60f1591ed1049bc2dc3143db779eae4838b89d195" +SRC_URI[md5sum] = "82bd2d05c4d0dba5e7a90d39c9555197" +SRC_URI[sha256sum] = "aeebc6b09a11e7f7bbc98f3984fe8b8b2bde9d2f5f9dcbd4348a9e0d93704238" RDEPENDS_${PN} = "man" diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/configure_sed.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/configure_sed.patch deleted file mode 100644 index d49e6831d..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/configure_sed.patch +++ /dev/null @@ -1,32 +0,0 @@ -man: replace ',' with '#' - -Sometimes, the parameters of CC/BUILD_CC contains the ',', which -cause the sed command failed, so replace the ',' with '#' - -Upstream-Status: Pending - -Signed-off-by: Yue Tao <Yue.Tao@windriver.com> -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> ---- - configure | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 9f62cf9..9a565ae 100755 ---- a/configure -+++ b/configure -@@ -1321,9 +1321,9 @@ do - echo "Creating $infile from $infile.in" - sed -e ' - s,@version@,$version, --s,@CC@,$CC, -+s#@CC@#$CC# - s,@EXEEXT@,$EXEEXT, --s,@BUILD_CC@,$BUILD_CC, -+s#@BUILD_CC@#$BUILD_CC# - s,@INSTALL@,$INSTALL, - s,@DEFS@,$DEFS, - s,@LIBS@,$LIBS, --- -1.9.1 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch deleted file mode 100644 index 6f834bd01..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch +++ /dev/null @@ -1,16 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - -diff -u -r man-1.5g.old/configure man-1.5g/configure ---- man-1.5g.old/configure Wed Apr 7 04:16:05 1999 -+++ man-1.5g/configure Mon May 15 15:22:44 2000 -@@ -791,7 +791,7 @@ - read mode - if test "$mode" != ""; then man_mode=$mode; fi - fi -- man_install_flags="-m $man_mode -o $man_user -g $man_group" -+ man_install_flags="" - fi - - # What sections do we anticipate? diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5h1-gencat.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5h1-gencat.patch deleted file mode 100644 index 044b14c50..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5h1-gencat.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - ---- gencat/genlib.c 2006-08-02 20:11:44.000000000 +0200 -+++ gencat/genlib.c.oden 2008-12-21 19:18:50.000000000 +0100 -@@ -47,6 +47,7 @@ up-to-date. Many thanks. - 01/14/91 4 nazgul Off by one on number specified entries - */ - -+#undef _GNU_SOURCE - #include <stdio.h> - #include <stdlib.h> - #ifdef SYSV diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5h1-make.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5h1-make.patch deleted file mode 100644 index 8631eb2c5..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5h1-make.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - ---- man-1.5g/man/Makefile.in.mike Fri Apr 9 13:35:54 1999 -+++ man-1.5g/man/Makefile.in Fri Apr 9 13:36:45 1999 -@@ -1,8 +1,8 @@ - # only executed from a subdir - MAN1 = man whatis apropos --MAN5 = man.conf -+MAN5 = man.config - MAN8 = makewhatis --ALL = man.1 whatis.1 apropos.1 man.conf.5 -+ALL = man.1 whatis.1 apropos.1 man.config.5 - MAYBE8 = makewhatis - - .SUFFIXES: .man .1 .5 .8 diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5i2-initial.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5i2-initial.patch deleted file mode 100644 index fe56c0706..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5i2-initial.patch +++ /dev/null @@ -1,19 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - ---- man-1.5i2/src/makewhatis.sh.initial Tue Jul 3 15:38:39 2001 -+++ man-1.5i2/src/makewhatis.sh Tue Jul 3 15:39:39 2001 -@@ -81,8 +81,10 @@ - continue;; - -s) setsections=1 - continue;; -- -u) findarg="-newer /var/cache/man/whatis" -- update=1 -+ -u) if [ -e /var/cache/man/whatis ]; then -+ findarg="-newer /var/cache/man/whatis" -+ update=1 -+ fi - continue;; - -v) verbose=1 - continue;; diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5i2-newline.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5i2-newline.patch deleted file mode 100644 index 611df5d25..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5i2-newline.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - ---- src/man.c 2008-12-21 19:17:31.000000000 +0100 -+++ src/man.c.oden 2008-12-21 19:17:38.000000000 +0100 -@@ -391,7 +391,7 @@ again: - beg++; - - end = beg; -- while (*end != ' ' && *end != '\t' && *end != '\n' && *end != '\0') -+ while (*end != ' ' && *end != '\t' && *end != '\n' && *end != '\0' && (end-buf)<BUFSIZE) - end++; /* note that buf is NUL-terminated */ - *end = '\0'; - diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5i2-overflow.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5i2-overflow.patch deleted file mode 100644 index 52d2881a8..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5i2-overflow.patch +++ /dev/null @@ -1,16 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - ---- man-1.5i2/src/man.c.overflow Mon Jun 25 00:01:45 2001 -+++ man-1.5i2/src/man.c Mon Jun 25 00:01:45 2001 -@@ -381,6 +381,9 @@ - strcat(name, "/"); - strcat(name, beg); - } -+ /* If this is too long, bad things have already happened. * -+ * we should quit IMMEDIATELY. */ -+ if(strlen(name)>sizeof(ultname)) _exit(1); - - goto again; - } diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5j-i18n.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5j-i18n.patch deleted file mode 100644 index 2ae09c0ea..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5j-i18n.patch +++ /dev/null @@ -1,16 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - ---- man-1.5j/msgs/inst.sh.i18n Wed Apr 25 10:40:50 2001 -+++ man-1.5j/msgs/inst.sh Wed Apr 25 10:41:17 2001 -@@ -27,8 +27,7 @@ - for j in $M; do - if [ -f $j ]; then - i=`echo $j | sed -e 's/mess.//; s/.cat//'` -- dest=`echo $locdir | sed -e "s/%N/man/; s/%L/$i/"` -- dest=${PREFIX}$dest -+ dest=${PREFIX}/`echo $locdir | sed -e "s/%N/man/; s/%L/$i/"` - echo "mkdir -p `dirname $dest`" - mkdir -p `dirname $dest`; - echo "install -c -m 644 $j $dest" diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5j-nocache.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5j-nocache.patch deleted file mode 100644 index 751dddd53..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5j-nocache.patch +++ /dev/null @@ -1,16 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - ---- man-1.5j/src/man.conf.in.nocache Thu Nov 22 15:07:12 2001 -+++ man-1.5j/src/man.conf.in Thu Nov 22 15:07:12 2001 -@@ -81,6 +81,9 @@ - # - #NOCACHE - # -+# NOCACHE keeps man from creating cache pages -+NOCACHE -+# - # Useful paths - note that COL should not be defined when - # NROFF is defined as "groff -Tascii" or "groff -Tlatin1"; - # not only is it superfluous, but it actually damages the output. diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5j-utf8.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5j-utf8.patch deleted file mode 100644 index 33d3e4c97..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5j-utf8.patch +++ /dev/null @@ -1,61 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - ---- man-1.5j/configure.utf8 Thu Nov 22 15:02:35 2001 -+++ man-1.5j/configure Thu Nov 22 15:03:15 2001 -@@ -408,9 +408,9 @@ - Fgawk=/bin/gawk - Fawk=/bin/gawk - Fmawk=missing -- troff="" -- nroff="" -- jnroff="" -+ troff=/usr/bin/troff -+ nroff=/usr/bin/nroff -+ jnroff=/usr/bin/nroff - eqn="" - neqn="" - jneqn="" -@@ -453,6 +453,8 @@ - done - done - Fgroff=/usr/bin/groff -+ Fnroff=/usr/bin/nroff -+ Fjnroff=/usr/bin/nroff - Fgeqn=/usr/bin/geqn - Fgtbl=/usr/bin/gtbl - Fcol=/usr/bin/col -@@ -485,25 +487,25 @@ - then - if test $Fnroff = "missing" - then -- nroff="nroff -Tlatin1 -mandoc" -+ nroff="nroff -Tutf8 -mandoc" - else -- nroff="$Fnroff -Tlatin1 -mandoc" -+ nroff="$Fnroff -Tutf8 -mandoc" - fi - troff="troff -mandoc" - echo "Warning: could not find groff" - else - if test $Fnroff = "missing" - then -- nroff="$Fgroff -Tlatin1 -mandoc" -+ nroff="$Fgroff -Tutf8 -mandoc" - else -- nroff="$Fnroff -Tlatin1 -mandoc" -+ nroff="$Fnroff -Tutf8 -mandoc" - fi - troff="$Fgroff -Tps -mandoc" -- jnroff="$Fgroff -Tnippon -mandocj" -+ jnroff="$Fjnroff -Tutf8 -mandocj" - fi - eqn="$Fgeqn -Tps" -- neqn="$Fgeqn -Tlatin1" -- jneqn="$Fgeqn -Tnippon" -+ neqn="$Fgeqn -Tutf8" -+ jneqn="$Fgeqn -Tutf8" - tbl="$Fgtbl" - col="$Fcol" - vgrind="$Fvgrind" diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5k-confpath.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5k-confpath.patch deleted file mode 100644 index b5746c2df..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5k-confpath.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - ---- configure 2006-05-01 19:56:14.000000000 +0200 -+++ configure.oden 2008-12-21 19:16:50.000000000 +0100 -@@ -198,7 +198,7 @@ - confdir="${confprefix}/share/misc" - fi - fi --conffilename="man.conf" -+conffilename="man.config" - - if test "$RANDOM" = "$RANDOM"; then - # Plain old Bourne shell. diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5k-nonascii.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5k-nonascii.patch deleted file mode 100644 index d662d9b6a..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5k-nonascii.patch +++ /dev/null @@ -1,18 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - ---- ./src/apropos.sh.nonascii 2001-11-23 00:30:42.000000000 +0100 -+++ ./src/apropos.sh 2002-08-13 15:44:53.000000000 +0200 -@@ -18,9 +18,9 @@ - - # When man pages in your favorite locale look to grep like binary files - # (and you use GNU grep) you may want to add the 'a' option to *grepopt1. --aproposgrepopt1='i' -+aproposgrepopt1='ia' - aproposgrepopt2='' --whatisgrepopt1='iw' -+whatisgrepopt1='iwa' - whatisgrepopt2='^' - grepopt1=$%apropos_or_whatis%grepopt1 - grepopt2=$%apropos_or_whatis%grepopt2 diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5k-sofix.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5k-sofix.patch deleted file mode 100644 index 50b925288..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5k-sofix.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - ---- man-1.5j/src/man.c.sofix Thu Nov 22 14:51:44 2001 -+++ man-1.5j/src/man.c Thu Nov 22 14:52:44 2001 -@@ -300,7 +300,7 @@ - - if (strlen(name0) >= sizeof(ultname)) - return name0; -- strcpy(ultname, name0); -+ strncpy(ultname, name0, BUFSIZE-32); - name = ultname; - - again: -@@ -332,7 +332,7 @@ - * .so files - we could glob for all possible extensions, - * for now: only try .gz - */ -- else if (fp == NULL && get_expander(".gz") && -+ if (fp == NULL && get_expander(".gz") && - strlen(name)+strlen(".gz") < BUFSIZE) { - strcat(name, ".gz"); - fp = fopen (name, "r"); diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch deleted file mode 100644 index 051299906..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - ---- ./configure.ad 2003-12-11 19:17:10.000000000 +0100 -+++ ./configure 2003-12-11 19:17:27.000000000 +0100 -@@ -26,7 +26,7 @@ - # (Indeed, -r may cause the terminal to get into funny states. - # Very inconvenient. For viewing pages in strange locales, set LC_*.) - # --DEFAULTLESSOPT="-is" -+DEFAULTLESSOPT="-isr" - # - # Note that not creating any cat directories (/var/cache/man or so) - # and not making man suid or sgid is recommended. diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch deleted file mode 100644 index bc97f56b9..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch +++ /dev/null @@ -1,52 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - ---- ./configure.less 2003-12-11 19:18:15.000000000 +0100 -+++ ./configure 2003-12-11 19:20:03.000000000 +0100 -@@ -401,18 +401,13 @@ - - if test "$ans" = "false" - then -- for i in more less cmp cat awk gawk mawk -- do -- eval F$i="missing" -- for j in $DEFPATH -- do -- if test -f $j/$i -- then -- eval F$i=$j/$i -- break -- fi -- done -- done -+ Fmore=/bin/more -+ Fless=/usr/bin/less -+ Fcmp=/usr/bin/cmp -+ Fcat=/bin/cat -+ Fgawk=/bin/gawk -+ Fawk=/bin/gawk -+ Fmawk=missing - troff="" - nroff="" - jnroff="" -@@ -457,6 +452,19 @@ - fi - done - done -+ Fgroff=/usr/bin/groff -+ Fgeqn=/usr/bin/geqn -+ Fgtbl=/usr/bin/gtbl -+ Fcol=/usr/bin/col -+ Fgrefer=/usr/bin/grefer -+ Fgpic=/usr/bin/gpic -+ Fmore=/bin/more -+ Fless=/usr/bin/less -+ Fcmp=/usr/bin/cmp -+ Fcat=/bin/cat -+ Fgawk=/bin/gawk -+ -+ - for i in eqn tbl refer pic - do - if test `eval echo \\$Fg$i` = "missing" diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch deleted file mode 100644 index c85ff1d8c..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - ---- man-1.5m2/configure.color 2006-09-16 18:27:37.000000000 +0200 -+++ man-1.5m2/configure 2006-09-16 18:28:44.000000000 +0200 -@@ -539,6 +539,8 @@ - troff="$troff -c" - nroff="$nroff -c" - jnroff="$jnroff -c" -+else -+ troff="$troff -c" - fi - - if [ x$default = x ]; then diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch deleted file mode 100644 index 8af78eab7..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch +++ /dev/null @@ -1,30 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - ---- man-1.5m2/src/util.c_sigpipe 2006-12-09 13:43:21.000000000 +0100 -+++ man-1.5m2/src/util.c 2006-12-09 13:53:13.000000000 +0100 -@@ -116,11 +116,14 @@ - static int - system1 (const char *command) { - void (*prev_handler)(int) = signal (SIGINT,catch_int); -+ signal (SIGPIPE,SIG_IGN); - int ret = system(command); - - /* child terminated with signal? */ - if (WIFSIGNALED(ret) && -- (WTERMSIG(ret) == SIGINT || WTERMSIG(ret) == SIGQUIT)) -+ (WTERMSIG(ret) == SIGINT || -+ WTERMSIG(ret) == SIGPIPE || -+ WTERMSIG(ret) == SIGQUIT)) - exit(1); - - /* or we caught an interrupt? */ -@@ -128,6 +131,7 @@ - exit(1); - - signal(SIGINT,prev_handler); -+ signal(SIGPIPE,SIG_DFL); - return ret; - } - diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch deleted file mode 100644 index e321325d6..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch +++ /dev/null @@ -1,145 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - -diff -Naur man-1.6e.orig/src/apropos.sh man-1.6e/src/apropos.sh ---- man-1.6e.orig/src/apropos.sh 2007-05-18 13:49:31.000000000 -0300 -+++ man-1.6e/src/apropos.sh 2007-05-18 14:24:33.000000000 -0300 -@@ -60,16 +60,56 @@ - esac - done - -+# list of languages to look for -+LANG_LIST=`echo $LANGUAGE:$LC_ALL:$LC_MESSAGES:$LANG | tr ':' ' '` -+DIR_LIST="" -+for d in /var/cache/man $manpath /usr/lib -+do -+ for l in $LANG_LIST -+ do -+ if [ -d $d/$l ] -+ then -+ # check that the path is not already in the list -+ if ! echo "$DIR_LIST" | grep " $d/$l\b" > /dev/null -+ then -+ DIR_LIST="$DIR_LIST $d/$l" -+ fi -+ fi -+ done -+ DIR_LIST="$DIR_LIST $d" -+ # check that the path is not already in the list -+ if ! echo "$DIR_LIST" | grep " $d\b" > /dev/null -+ then -+ DIR_LIST="$DIR_LIST $d/$l" -+ fi -+done -+ - while [ "$1" != "" ] - do - found=0 -- for d in /var/cache/man $manpath /usr/lib -+ # in order not to display lines in more than one language for -+ # a same man page; we check that a given man page name -+ # hasn't already been displayed -+ BAZ="" -+ for d in $DIR_LIST - do - if [ -f $d/whatis ] - then -- if grep -"$grepopt1" "$grepopt2""$1" $d/whatis -+ if FOO=`grep -"$grepopt1" "$grepopt2""$1" $d/whatis` - then -- found=1 -+ # the LC_ALL=C is needed in case the text is -+ # in a different encoding than the locale -+ BAR=`echo -e "$FOO" | LC_ALL=C sed 's/ - .*$//' | tr ' []' '_' | sort -u` -+ for i in $BAR -+ do -+ if ! echo "$BAZ" | grep "$i" > /dev/null -+ then -+ BAZ="$BAZ $i" -+ i="^`echo $i | sed 's:_\+:\\\(\[_ \]\\\|\\\[\\\|\\\]\\\)\\\+:g'`" -+ echo -e "$FOO" | grep "$i" -+ found=1 -+ fi -+ done - # Some people are satisfied with a single occurrence - # But it is better to give all - # break -diff -Naur man-1.6e.orig/src/makewhatis.sh man-1.6e/src/makewhatis.sh ---- man-1.6e.orig/src/makewhatis.sh 2007-05-18 13:49:31.000000000 -0300 -+++ man-1.6e/src/makewhatis.sh 2007-05-18 13:50:07.000000000 -0300 -@@ -41,12 +41,32 @@ - - program=`basename $0` - -+# this allows to define language specific values fro NAME, DESCRIPTION -+# if not defined, using those default values -+if [ -z "$MAN_NAME" ] -+then -+ MAN_NAME="ИМЕ|NOM|JMÉNO|NAVN|ΟΝΟΜΑ|NOMBRE|NIME|IZENA|NIMI|IME|\ -+NÉV|NOME|名前|이름|NAAM|NAZWA|NUME|ИМЯ|MENO|НАЗВА|名称|名稱" -+fi -+if [ -z "$MAN_DESCRIPTION" ] -+then -+ MAN_DESCRIPTION="ОПИСАНИЕ|DESCRIPCIÓ|POPIS|BESKRIVELSE|BESCHREIBUNG|\ -+ΠΕΡΙΓΡΑΦΗ|DESCRIPCIÓN|KIRJELDUS|AZALPENA|KUVAUS|OPIS|LEÍRÁS|DESCRIZIONE|\ -+説明|설명|BESCHRIJVING|DESCRIÇÃO|DESCRIERE|ОПИС|描述" -+fi -+# make them into awk regexp -+MAN_NAME="^(${MAN_NAME})"; -+MAN_DESCRIPTION="^(${MAN_DESCRIPTION})"; -+ - # In case both /usr/man and /usr/share/man exist, the former is local - # and should be first. - # It is a bug to add /var/cache/man to DEFCATPATH. - dm= - for d in /usr/share/man /usr/man /usr/X11R6/man /usr/local/man - do -+ if [ -n "$LANG" -a -d "$d/$LANG" ]; then -+ if [ x$dm = x ]; then dm="$d/$LANG"; else dm=$dm:"$d/$LANG"; fi -+ fi - if [ -d $d ]; then - if [ x$dm = x ]; then dm=$d; else dm=$dm:$d; fi - fi -@@ -55,6 +75,9 @@ - dc= - for d in /var/cache/man /usr/share/man/preformat /usr/man/preformat /usr/share/man /usr/man - do -+ if [ -n "$LANG" -a -d "$d/$LANG" ]; then -+ if [ x$dc = x ]; then dm="$d/$LANG"; else dm=$dc:"$d/$LANG"; fi -+ fi - if [ -d $d ]; then - if [ x$dc = x ]; then dc=$d; else dc=$dc:$d; fi - fi -@@ -194,7 +217,7 @@ - section=$i - curdir=$mandir/${pages}$i - export section verbose curdir -- find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | $AWK ' -+ find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | LC_ALL=C $AWK -v MAN_NAME="$MAN_NAME" -v MAN_DESCRIPTION="$MAN_DESCRIPTION" ' - - function readline() { - if (use_zcat || use_bzcat) { -@@ -261,13 +284,7 @@ - gsub(/.\b/, ""); - if (($1 ~ /^\.[Ss][Hh]/ && - ($2 ~ /[Nn][Aa][Mm][Ee]/ || -- $2 ~ /^JMNO/ || $2 ~ /^NAVN/ || $2 ~ /^NUME/ || -- $2 ~ /^BEZEICHNUNG/ || $2 ~ /^NOMBRE/ || -- $2 ~ /^NIMI/ || $2 ~ /^NOM/ || $2 ~ /^IME/ || -- $2 ~ /^N[E]V/ || $2 ~ /^NAMA/ || $2 ~ /^̾/ || -- $2 ~ /^̾/ || $2 ~ /^̸/ || $2 ~ /^NAZWA/ || -- $2 ~ /^/ || $2 ~ /^/ || $2 ~ /^W/ || -- $2 ~ /^NOME/ || $2 ~ /^NAAM/ || $2 ~ /^/)) || -+ $2 ~ MAN_NAME )) || - (pages == "cat" && $1 ~ /^NAME/)) { - if (!insh) { - insh = 1; -@@ -278,6 +295,7 @@ - if ($1 ~ /^\.[Ss][HhYS]/ || - (pages == "cat" && - ($1 ~ /^S[yYeE]/ || $1 ~ /^DESCRIPTION/ || -+ $1 ~ MAN_DESCRIPTION || - $1 ~ /^COMMAND/ || $1 ~ /^OVERVIEW/ || - $1 ~ /^STRUCTURES/ || $1 ~ /^INTRODUCTION/ || - $0 ~ /^[^ ]/))) { diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6e-mandirs.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6e-mandirs.patch deleted file mode 100644 index b240064c9..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6e-mandirs.patch +++ /dev/null @@ -1,31 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - ---- man-1.6e.orig/src/man.conf.in 2005-08-20 20:26:06.000000000 -0300 -+++ man-1.6e/src/man.conf.in 2007-05-18 10:30:29.000000000 -0300 -@@ -36,11 +36,12 @@ - # - # Every automatically generated MANPATH includes these fields - # --MANPATH /usr/man - MANPATH /usr/share/man -+MANPATH /usr/X11R6/man - MANPATH /usr/local/man - MANPATH /usr/local/share/man --MANPATH /usr/X11R6/man -+MANPATH /usr/kerberos/man -+MANPATH /usr/man - # - # Uncomment if you want to include one of these by default - # -@@ -67,6 +68,9 @@ - MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man - MANPATH_MAP /usr/bin/X11 /usr/X11R6/man - MANPATH_MAP /usr/bin/mh /usr/share/man -+MANPATH_MAP /usr/kerberos/bin /usr/kerberos/man -+MANPATH_MAP /usr/kerberos/sbin /usr/kerberos/man -+ - # - # NOAUTOPATH keeps man from automatically adding directories that look like - # manual page directories to the path. diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6e-new_sections.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6e-new_sections.patch deleted file mode 100644 index fb9773c64..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6e-new_sections.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - ---- man-1.6e.orig/configure 2006-05-01 14:56:14.000000000 -0300 -+++ man-1.6e/configure 2007-05-18 14:35:43.000000000 -0300 -@@ -960,7 +960,7 @@ - - # What sections do we anticipate? - --tmpsections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o" -+tmpsections="1 1p 8 2 3 3p 3pm 4 5 6 7 9 0p tcl n l p o" - - if [ x$default = x ]; then - echo "" diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch deleted file mode 100644 index 1d1cb0c72..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch +++ /dev/null @@ -1,33 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - -Index: man-1.6f/src/makewhatis.sh -=================================================================== ---- man-1.6f.orig/src/makewhatis.sh 2010-12-29 13:42:34.000000000 -0800 -+++ man-1.6f/src/makewhatis.sh 2010-12-29 13:42:35.667428347 -0800 -@@ -124,7 +124,7 @@ - continue;; - -s) setsections=1 - continue;; -- -u) findarg="-ctime 0" -+ -u) findarg="-newer /var/cache/man/whatis" - update=1 - continue;; - -v) verbose=1 -@@ -165,14 +165,7 @@ - # first truncate all the whatis files that will be created new, - # then only update - we might visit the same directory twice - if [ x$update = x ]; then -- for pages in man cat -- do -- eval path="\$$pages"path -- for mandir in $path -- do -- cp /dev/null $mandir/whatis -- done -- done -+ cp /dev/null /var/cache/man/whatis - fi - - for pages in man cat diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6e-security.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6e-security.patch deleted file mode 100644 index 312a882f0..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6e-security.patch +++ /dev/null @@ -1,62 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - -diff -Naur man-1.6e.orig/src/makewhatis.sh man-1.6e/src/makewhatis.sh ---- man-1.6e.orig/src/makewhatis.sh 2006-07-19 01:58:08.000000000 -0300 -+++ man-1.6e/src/makewhatis.sh 2007-05-18 10:18:31.000000000 -0300 -@@ -45,7 +45,7 @@ - # and should be first. - # It is a bug to add /var/cache/man to DEFCATPATH. - dm= --for d in /usr/man /usr/share/man /usr/X11R6/man /usr/local/man -+for d in /usr/share/man /usr/man /usr/X11R6/man /usr/local/man - do - if [ -d $d ]; then - if [ x$dm = x ]; then dm=$d; else dm=$dm:$d; fi -@@ -53,7 +53,7 @@ - done - DEFMANPATH=$dm - dc= --for d in /usr/man/preformat /usr/man /usr/share/man/preformat /usr/share/man -+for d in /var/cache/man /usr/share/man/preformat /usr/man/preformat /usr/share/man /usr/man - do - if [ -d $d ]; then - if [ x$dc = x ]; then dc=$d; else dc=$dc:$d; fi -@@ -76,12 +76,12 @@ - # We try here to be careful (and avoid preconstructed symlinks) - # in case makewhatis is run as root, by creating a subdirectory of /tmp. - --TMPFILEDIR=/tmp/whatis.tmp.dir.$$ --rm -rf $TMPFILEDIR --if ! mkdir -m 0700 $TMPFILEDIR; then -- echo Could not create $TMPFILEDIR -- exit 1; -+TMPFILEDIR=`mktemp -d /tmp/makewhatisXXXXXX` -+if [ $? -ne 0 ]; then -+ echo "$0: Can't create temp file, exiting..." -+ exit 1 - fi -+chmod 0700 $TMPFILEDIR - TMPFILE=$TMPFILEDIR/w - - # make sure TMPFILEDIR is deleted if program is killed or terminates -diff -Naur man-1.6e.orig/src/man.c man-1.6e/src/man.c ---- man-1.6e.orig/src/man.c 2006-05-01 17:34:22.000000000 -0300 -+++ man-1.6e/src/man.c 2007-05-18 10:11:33.000000000 -0300 -@@ -1234,7 +1234,6 @@ - #endif - - --#if 0 - { - /* There are no known cases of buffer overflow caused by - excessively long environment variables. In case you find one, -@@ -1257,7 +1256,6 @@ - MAN_ICONV_PATH, MAN_ICONV_OPT, MAN_ICONV_INPUT_CHARSET, - MAN_ICONV_OUTPUT_CHARSET, NLSPATH, PATH */ - } --#endif - - - #ifndef __FreeBSD__ diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_std_way.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_std_way.patch deleted file mode 100644 index 568f74210..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_std_way.patch +++ /dev/null @@ -1,160 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - -diff -Naur man-1.6e.orig/catopen/catopen.c man-1.6e/catopen/catopen.c ---- man-1.6e.orig/catopen/catopen.c 2005-08-20 20:26:06.000000000 -0300 -+++ man-1.6e/catopen/catopen.c 2007-05-18 11:31:05.000000000 -0300 -@@ -9,22 +9,63 @@ - extern char *index (const char *, int); /* not always in <string.h> */ - extern char *my_malloc(int); /* in util.c */ - -+/* if the program has sgid/suid privileges then getenv doesn't return -+ * NLSPATH; so we set here a good default value. -+ */ - #ifndef DEFAULT_NLSPATH - # if __GLIBC__ >= 2 --# define DEFAULT_NLSPATH "/usr/share/locale/%L/%N" -+# define DEFAULT_NLSPATH "/usr/share/locale/%L/%N:/usr/share/locale/%l_%t/%N:/usr/share/locale/%l/%N" - # else - # define DEFAULT_NLSPATH "/usr/lib/locale/%N/%L" - # endif - #endif - --static nl_catd my_catopenpath(char *name, char *path); -+static nl_catd my_catopenpath(char *name, char *path, char *lang); - - static /* this source included in gripes.c */ - nl_catd - my_catopen(char *name, int oflag) { -- nl_catd fd; -+ nl_catd fd = (nl_catd) -1; -+ -+ /* using first the my_catopenpath, which looks with LANGUAGE -+ * and only if it fails ressort to catopen, it gives better i18n -+ */ -+ { -+ char *nlspath, *lang, *s; - -- fd = catopen(name, oflag); -+ /* -+ * "If NLSPATH does not exist in the environment, or if a -+ * message catalog cannot be opened in any of the paths specified -+ * by NLSPATH, then an implementation defined default path is used" -+ */ -+ nlspath = getenv("NLSPATH"); -+ if (!nlspath) -+ nlspath = DEFAULT_NLSPATH; -+ -+ lang = getenv("LANGUAGE"); -+ if (!lang) -+ lang = getenv("LC_ALL"); -+ if (!lang) -+ lang = getenv("LC_MESSAGES"); -+ if (!lang) -+ lang = getenv("LANG"); -+ if (!lang) -+ lang = ""; -+ -+ while(*lang && (fd == (nl_catd) -1)) { -+ s = index(lang, ':'); -+ if (s) *s = 0; -+ fd = my_catopenpath(name, nlspath, lang); -+ if (s) lang=s+1; -+ else lang = ""; -+ } -+ if (fd == (nl_catd) -1) -+ fd = my_catopenpath(name, nlspath, "en"); -+ } -+ -+ /* still not found, use the system catopen */ -+ if (fd == (nl_catd) -1) -+ fd = catopen(name, oflag); - - if (fd == (nl_catd) -1 && oflag) { - oflag = 0; -@@ -32,8 +73,6 @@ - } - - if (fd == (nl_catd) -1) { -- char *nlspath; -- - /* The libc catopen fails - let us see if we can do better */ - /* The quotes below are from X/Open, XPG 1987, Vol. 3. */ - -@@ -58,17 +97,6 @@ - #endif - } - -- /* -- * "If NLSPATH does not exist in the environment, or if a -- * message catalog cannot be opened in any of the paths specified -- * by NLSPATH, then an implementation defined default path is used" -- */ -- -- nlspath = getenv("NLSPATH"); -- if (nlspath) -- fd = my_catopenpath(name, nlspath); -- if (fd == (nl_catd) -1) -- fd = my_catopenpath(name, DEFAULT_NLSPATH); - } - return fd; - } -@@ -90,15 +118,13 @@ - * - */ - static nl_catd --my_catopenpath(char *name, char *nlspath) { -- int fd; -+my_catopenpath(char *name, char *nlspath, char *lang) { - nl_catd cfd = (nl_catd) -1; -- char *path0, *path, *s, *file, *lang, *lang_l, *lang_t, *lang_c; -+ char *path0, *path, *s, *file, *lang_l, *lang_t, *lang_c; - int langsz, namesz, sz, lang_l_sz, lang_t_sz, lang_c_sz; - - namesz = strlen(name); - -- lang = getenv("LANG"); - if (!lang) - lang = ""; - langsz = strlen(lang); -@@ -194,14 +220,9 @@ - path = s+1; - } else - path = 0; -- fd = open(file, O_RDONLY); -- if (fd != -1) { -- /* we found the right catalog - but we don't know the -- type of nl_catd, so close it again and ask libc */ -- close(fd); -- cfd = catopen(file, 0); -- break; -- } -+ cfd = catopen(file, 0); -+ if (cfd != (nl_catd) -1) -+ break; - } - - free(path0); -diff -Naur man-1.6e.orig/src/manpath.c man-1.6e/src/manpath.c ---- man-1.6e.orig/src/manpath.c 2006-08-03 18:18:33.000000000 -0300 -+++ man-1.6e/src/manpath.c 2007-05-18 11:02:48.000000000 -0300 -@@ -282,13 +282,14 @@ - /* We cannot use "lang = setlocale(LC_MESSAGES, NULL)" or so: - the return value of setlocale is an opaque string. */ - /* POSIX prescribes the order: LC_ALL, LC_MESSAGES, LANG */ -- if((lang = getenv("LC_ALL")) != NULL) -+ /* LANGUAGE is GNU/Linux and overrules all */ -+ if((lang = getenv("LANGUAGE")) != NULL) - split2(dir, lang, add_to_mandirlist_x, perrs); -- if((lang = getenv("LC_MESSAGES")) != NULL) -+ else if((lang = getenv("LC_ALL")) != NULL) - split2(dir, lang, add_to_mandirlist_x, perrs); -- if((lang = getenv("LANG")) != NULL) -+ else if((lang = getenv("LC_MESSAGES")) != NULL) - split2(dir, lang, add_to_mandirlist_x, perrs); -- if((lang = getenv("LANGUAGE")) != NULL) -+ else if((lang = getenv("LANG")) != NULL) - split2(dir, lang, add_to_mandirlist_x, perrs); - add_to_mandirlist_x(dir, 0, perrs); - } diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6e-whatis2.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6e-whatis2.patch deleted file mode 100644 index fc4ed3135..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6e-whatis2.patch +++ /dev/null @@ -1,59 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - -Index: man-1.6f/src/makewhatis.sh -=================================================================== ---- man-1.6f.orig/src/makewhatis.sh 2010-12-29 13:51:45.000000000 -0800 -+++ man-1.6f/src/makewhatis.sh 2010-12-29 13:59:35.399799412 -0800 -@@ -164,10 +164,15 @@ - fi - catpath=`echo ${catpath} | tr : ' '` - -+#WHATIS_DIR=$DESTDIR/var/cache/man/`echo $here|sed -e 's!.*/man/!!g'` -+WHATIS_DIR=$DESTDIR/var/cache/man/$LANG -+[[ -d $WHATIS_DIR ]] || mkdir -p $WHATIS_DIR/ -+ - # first truncate all the whatis files that will be created new, - # then only update - we might visit the same directory twice - if [ x$update = x ]; then -- cp /dev/null /var/cache/man/whatis -+ mkdir -p $WHATIS_DIR/ -+ /bin/echo -n > $WHATIS_DIR/whatis - fi - - for pages in man cat -@@ -180,13 +185,7 @@ - echo "about to enter $mandir" > /dev/stderr - fi - -- # kludge for Slackware's /usr/man/preformat -- if [ $mandir = /usr/man/preformat ] -- then -- mandir1=/usr/man -- else -- mandir1=$mandir -- fi -+ mandir1=$WHATIS_DIR - - # if $mandir is on a readonly partition, and the whatis file - # is not a symlink, then let's skip trying to update it -@@ -207,11 +206,6 @@ - fi - fi - -- if [ -s ${mandir}/whatis -a $pages = man -a x$update = x ]; then -- if [ x$verbose != x ]; then -- echo skipping $mandir - we did it already > /dev/stderr -- fi -- else - here=`pwd` - cd $mandir - for i in $sections -@@ -447,7 +447,6 @@ - - chmod 644 ${mandir1}/whatis - rm $TMPFILE -- fi - done - done diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch deleted file mode 100644 index 4631d2d06..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch +++ /dev/null @@ -1,105 +0,0 @@ -Fix a build error when building man.config.5 (a remnant of a long -ago previous patch). Optimized the manpages Makefile for parallel -builds. Also, fix compile warnings in a couple other files. - -Upstream-Status: Pending - -Signed-off-by: Bill Randle <william.c.randle@intel.com> - ---- man-1.6g/man/Makefile.in.orig 2016-03-28 17:31:08.723949180 -0700 -+++ man-1.6g/man/Makefile.in 2016-03-28 17:46:12.866910386 -0700 -@@ -5,6 +5,13 @@ - ALL = man.1 whatis.1 apropos.1 man.config.5 - MAYBE8 = makewhatis - -+SUBDIRS := $(shell echo @languages@) -+ -+.PHONY: subdirs $(SUBDIRS) -+ -+man.config.man: man.conf.man -+ @cp $< $@ -+ - .SUFFIXES: .man .1 .5 .8 - - .man.1: -@@ -19,11 +26,11 @@ - INSTALL = @INSTALL@ -c -m 644 - - # Where to put the manual pages. --mandir = $(DESTDIR)$(PREFIX)@mandir@$(SLANG) -+mandir := $(DESTDIR)$(PREFIX)@mandir@$(SLANG) - - all: $(ALL) - for i in $(MAYBE8); \ -- do if test -f $$i.man; then make -f ../Makefile $$i.8; fi; done -+ do if test -f $$i.man; then $(MAKE) -f ../Makefile $$i.8; fi; done - - install: $(ALL) - mkdir -p $(mandir)/man1 $(mandir)/man5 $(mandir)/man8 -@@ -38,24 +45,27 @@ - rm -f core *.in *.@man1ext@ *.@man5ext@ *.@man8ext@ *~ - - spotless: -+ rm -f man.config.man - - subdirs: -- @for i in @languages@; do if test -d $$i; then echo; \ -- echo "==== Making the `cat $$i.txt` man pages. ===="; \ -- cd $$i; make -f ../Makefile; cd ..; \ -- else echo "==== No $$i man pages found. ===="; fi; done -+subdirs: $(SUBDIRS) -+$(SUBDIRS): -+ if test -d $@; then echo; \ -+ echo "==== Making the `cat $@.txt` man pages. ===="; \ -+ $(MAKE) -C $@ -f ../Makefile all; \ -+ else echo "==== No $@ man pages found. ===="; fi - - installsubdirs: - @for i in @languages@; do if test -d $$i; then echo; \ - echo "==== Installing the `cat $$i.txt` man pages. ===="; \ - cd $$i; SLANG=/$$i; if test $$SLANG = /en; then SLANG= ; fi; \ -- export SLANG; make -f ../Makefile install; cd ..; \ -+ export SLANG; $(MAKE) -f ../Makefile install; cd ..; \ - else echo "==== No $$i man pages found. ===="; fi; done - - cleansubdirs: -- @for i in ??; do cd $$i; make -f ../Makefile clean; cd ..; done -+ @for i in ??; do $(MAKE) -C $$i -f ../Makefile clean; done - rm -f core *~ - - spotlesssubdirs: -- for i in ??; do cd $$i; make -f ../Makefile spotless; cd ..; done -+ for i in ??; do $(MAKE) -C $$i -f ../Makefile spotless; done - rm -f Makefile - ---- man-1.6g/src/gripes.c.orig 2006-11-21 11:53:44.000000000 -0800 -+++ man-1.6g/src/gripes.c 2016-03-30 16:32:31.601103487 -0700 -@@ -7,8 +7,6 @@ - - extern char *msg[]; - --static char *mantexts = "man"; /* e.g. /usr/lib/locale/%L/man.cat */ -- - #ifdef NONLS - - static char * -@@ -30,6 +28,8 @@ - #include <nl_types.h> - #include "../catopen/catopen.c" - -+static char *mantexts = "man"; /* e.g. /usr/lib/locale/%L/man.cat */ -+ - nl_catd catfd = (nl_catd) -1; - int cat_is_open = 0; - ---- man-1.6g/src/manfile.c.orig 2005-08-20 16:26:06.000000000 -0700 -+++ man-1.6g/src/manfile.c 2016-03-29 09:10:21.527841285 -0700 -@@ -299,7 +299,7 @@ - const char *((*tocat)(const char *man_filename, const char *ext, - int flags))) { - char **sl; -- struct manpage *res; -+ struct manpage *res = 0; - - standards = (flags & (FHS | FSSTND | DO_HP | DO_IRIX)); - to_cat_filename = tocat; diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6g-configure.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6g-configure.patch deleted file mode 100644 index 106cc9878..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6g-configure.patch +++ /dev/null @@ -1,68 +0,0 @@ -Use BUILD_CC and target include files for configuration tests. -If cross-compiling, force pathnames for helper programs, since -autodiscovery by the configure script will not work. - -Upstream-Status: Pending - -Signed-off-by: Bill Randle <william.c.randle at intel.com> - ---- man-1.6g/configure.orig 2016-03-28 17:46:12.734910976 -0700 -+++ man-1.6g/configure 2016-03-30 21:47:45.110572908 -0700 -@@ -216,7 +216,8 @@ - INCLUDEDIR=${INCLUDEDIR-/usr/include} - - rm -f conftest conftest.c --compile="$CC $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1" -+# since we are interested in target feature support, use that sysroot -+compile="$BUILD_CC -isystem/${PKG_CONFIG_SYSROOT_DIR}/usr/include $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1" - - # Check for various header files. - -@@ -455,19 +456,23 @@ - fi - done - done -- Fgroff=/usr/bin/groff -- Fnroff=/usr/bin/nroff -- Fjnroff=/usr/bin/nroff -- Fgeqn=/usr/bin/geqn -- Fgtbl=/usr/bin/gtbl -- Fcol=/usr/bin/col -- Fgrefer=/usr/bin/grefer -- Fgpic=/usr/bin/gpic -- Fmore=/bin/more -- Fless=/usr/bin/less -- Fcmp=/usr/bin/cmp -- Fcat=/bin/cat -- Fgawk=/bin/gawk -+ if [ $BUILD_CC != $CC ]; then -+ # cross compiling => target fs not available, so force defaults -+ Fgroff=/usr/bin/groff -+ Fnroff=/usr/bin/nroff -+ Fjnroff=/usr/bin/nroff -+ Fgeqn=/usr/bin/eqn -+ Fgneqn=/usr/bin/neqn -+ Fgtbl=/usr/bin/tbl -+ Fcol=/usr/bin/col -+ Fgrefer=/usr/bin/refer -+ Fgpic=/usr/bin/pic -+ Fmore=/bin/more -+ Fless=/usr/bin/less -+ Fcmp=/usr/bin/cmp -+ Fcat=/bin/cat -+ Fgawk=/usr/bin/gawk -+ fi - - - for i in eqn tbl refer pic -@@ -507,8 +512,8 @@ - jnroff="$Fjnroff -Tutf8 -mandocj" - fi - eqn="$Fgeqn -Tps" -- neqn="$Fgeqn -Tutf8" -- jneqn="$Fgeqn -Tutf8" -+ neqn="$Fgneqn -Tutf8" -+ jneqn="$Fgneqn -Tutf8" - tbl="$Fgtbl" - col="$Fcol" - vgrind="$Fvgrind" diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6g-parallel.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6g-parallel.patch deleted file mode 100644 index 72a88b898..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6g-parallel.patch +++ /dev/null @@ -1,30 +0,0 @@ -The Makefile for man has a rule to create two generated targets with -a program run from the shell. Because the rule was run twice, with -parallel make, the generated files were being overwritten at the same -time they were being compiled. This patch forces the rule to be run -only once. - -Upstream-Status: Pending - -Signed-off-by: Bill Randle <william.c.randle at intel.com> - ---- man-1.6g/src/Makefile.in.orig 2010-12-31 12:28:46.000000000 -0800 -+++ man-1.6g/src/Makefile.in 2016-03-28 09:09:16.845458798 -0700 -@@ -43,8 +43,10 @@ - makemsg: - $(BUILD_CC) -o makemsg makemsg.c - --msg.c gripedefs.h: ../msgs/mess.en makemsg -+msg.c gripedefs.h: genfiles-stamp -+genfiles-stamp: ../msgs/mess.en makemsg - ./makemsg ../msgs/mess.en gripedefs.h msg.c -+ touch genfiles-stamp - - # glob.c does not have prototypes - glob.o: glob.c ndir.h -@@ -117,4 +119,4 @@ - - spotless: clean - rm -f Makefile config.status paths.h version.h man.conf -- rm -f gripedefs.h msg.c mess.*.cat -+ rm -f gripedefs.h msg.c mess.*.cat genfiles-stamp diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6g-whatis3.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6g-whatis3.patch deleted file mode 100644 index 633445685..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6g-whatis3.patch +++ /dev/null @@ -1,20 +0,0 @@ -Do not use absolute path for awk while getting the path of awk -when running makewhatis. -This can avoid errors if path of awk changes. - -Upstream-Status: Submitted [man-1.6g] - -Signed-off-by: Jian Liu <jian.liu@windriver.com> - -diff -Nur man-1.6g.orig/src/makewhatis.sh man-1.6g/src/makewhatis.sh ---- man-1.6g.orig/src/makewhatis.sh 2015-02-25 16:13:12.657611419 +0800 -+++ man-1.6g/src/makewhatis.sh 2015-02-25 16:14:49.334694815 +0800 -@@ -67,7 +67,7 @@ - # but that leads to problems and bugs. - - # AWK=/usr/bin/gawk --AWK=@awk@ -+AWK=`which awk` - - # Find a place for our temporary files. If security is not a concern, use - # TMPFILE=/tmp/whatis$$; TMPFILEDIR=none diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man.1.gz b/import-layers/yocto-poky/meta/recipes-extended/man/man/man.1.gz Binary files differdeleted file mode 100644 index c36804515..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man.1.gz +++ /dev/null diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man.7.gz b/import-layers/yocto-poky/meta/recipes-extended/man/man/man.7.gz Binary files differdeleted file mode 100644 index e85af8242..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man.7.gz +++ /dev/null diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man.conf b/import-layers/yocto-poky/meta/recipes-extended/man/man/man.conf deleted file mode 100644 index fc10be275..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/man.conf +++ /dev/null @@ -1,141 +0,0 @@ -# -# Generated automatically from man.conf.in by the -# configure script. -# -# man.conf from man-1.5p -# -# For more information about this file, see the man pages man(1) -# and man.conf(5). -# -# This file is read by man to configure the default manpath (also used -# when MANPATH contains an empty substring), to find out where the cat -# pages corresponding to given man pages should be stored, -# and to map each PATH element to a manpath element. -# It may also record the pathname of the man binary. [This is unused.] -# The format is: -# -# MANBIN pathname -# MANPATH manpath_element [corresponding_catdir] -# MANPATH_MAP path_element manpath_element -# -# If no catdir is given, it is assumed to be equal to the mandir -# (so that this dir has both man1 etc. and cat1 etc. subdirs). -# This is the traditional Unix setup. -# Certain versions of the FSSTND recommend putting formatted versions -# of /usr/.../man/manx/page.x into /var/catman/.../catx/page.x. -# The keyword FSSTND will cause this behaviour. -# Certain versions of the FHS recommend putting formatted versions of -# /usr/.../share/man/[locale/]manx/page.x into -# /var/cache/man/.../[locale/]catx/page.x. -# The keyword FHS will cause this behaviour (and overrides FSSTND). -# Explicitly given catdirs override. -# -# FSSTND -FHS -# -# This file is also read by man in order to find how to call nroff, less, etc., -# and to determine the correspondence between extensions and decompressors. -# -# MANBIN /usr/local/bin/man -# -# Every automatically generated MANPATH includes these fields -# -MANPATH /usr/man -MANPATH /usr/share/man -MANPATH /usr/local/man -MANPATH /usr/local/share/man -MANPATH /usr/X11R6/man -# -# Uncomment if you want to include one of these by default -# -# MANPATH /opt/*/man -# MANPATH /usr/lib/*/man -# MANPATH /usr/share/*/man -# MANPATH /usr/kerberos/man -# -# Set up PATH to MANPATH mapping -# -# If people ask for "man foo" and have "/dir/bin/foo" in their PATH -# and the docs are found in "/dir/man", then no mapping is required. -# -# The below mappings are superfluous when the right hand side is -# in the mandatory manpath already, but will keep man from statting -# lots of other nearby files and directories. -# -MANPATH_MAP /bin /usr/share/man -MANPATH_MAP /sbin /usr/share/man -MANPATH_MAP /usr/bin /usr/share/man -MANPATH_MAP /usr/sbin /usr/share/man -MANPATH_MAP /usr/local/bin /usr/local/share/man -MANPATH_MAP /usr/local/sbin /usr/local/share/man -MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man -MANPATH_MAP /usr/bin/X11 /usr/X11R6/man -MANPATH_MAP /usr/bin/mh /usr/share/man -# -# NOAUTOPATH keeps man from automatically adding directories that look like -# manual page directories to the path. -# -#NOAUTOPATH -# -# NOCACHE keeps man from creating cache pages ("cat pages") -# (generally one enables/disable cat page creation by creating/deleting -# the directory they would live in - man never does mkdir) -# -#NOCACHE -# -# Useful paths - note that COL should not be defined when -# NROFF is defined as "groff -Tascii" or "groff -Tlatin1"; -# not only is it superfluous, but it actually damages the output. -# For use with utf-8, NROFF should be "nroff -mandoc" without -T option. -# (Maybe - but today I need -Tlatin1 to prevent double conversion to utf8.) -# -# If you have a new troff (version 1.18.1?) and its colored output -# causes problems, add the -c option to TROFF, NROFF, JNROFF. -# -TROFF /usr/bin/groff -Tps -mandoc -NROFF /usr/bin/nroff -Tlatin1 -mandoc -JNROFF /usr/bin/groff -Tnippon -mandocj -EQN /usr/bin/eqn -Tps -NEQN /usr/bin/eqn -Tlatin1 -JNEQN /usr/bin/eqn -Tnippon -TBL /usr/bin/tbl -# COL /usr/bin/col -REFER /usr/bin/refer -PIC /usr/bin/pic -VGRIND -GRAP -PAGER /usr/bin/less -isR -CAT /bin/cat -# -# The command "man -a xyzzy" will show all man pages for xyzzy. -# When CMP is defined man will try to avoid showing the same -# text twice. (But compressed pages compare unequal.) -# -CMP /usr/bin/cmp -s -# -# Compress cat pages -# -COMPRESS /bin/bzip2 -COMPRESS_EXT .bz2 -# -# Default manual sections (and order) to search if -S is not specified -# and the MANSECT environment variable is not set. -# -MANSECT 1:1p:8:2:3:3p:4:5:6:7:9:0p:tcl:n:l:p:o -# -# Default options to use when man is invoked without options -# This is mainly for the benefit of those that think -a should be the default -# Note that some systems have /usr/man/allman, causing pages to be shown twice. -# -#MANDEFOPTIONS -a -# -# Decompress with given decompressor when input file has given extension -# The command given must act as a filter. -# -.gz /bin/gunzip -c -.bz2 /usr/bin/bunzip2 -c -.xz /usr/bin/unxz -c -.z -.Z /bin/zcat -.F -.Y diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/manpath.5.gz b/import-layers/yocto-poky/meta/recipes-extended/man/man/manpath.5.gz Binary files differdeleted file mode 100644 index c012ff897..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man/manpath.5.gz +++ /dev/null diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man_1.6g.bb b/import-layers/yocto-poky/meta/recipes-extended/man/man_1.6g.bb deleted file mode 100644 index ff603f842..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/man/man_1.6g.bb +++ /dev/null @@ -1,86 +0,0 @@ -SUMMARY = "Online documentation tools" -DESCRIPTION = "A set of documentation tools: man, apropos and whatis" -SECTION = "console/utils" -HOMEPAGE = "http://primates.ximian.com/~flucifredi/man" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" - -PR = "r1" - -DEPENDS = "groff less" - -def compress_pkg(d): - if "compress_doc" in (d.getVar("INHERIT") or "").split(): - compress = d.getVar("DOC_COMPRESS") - if compress == "gz": - return "gzip" - elif compress == "bz2": - return "bzip2" - elif compress == "xz": - return "xz" - return "" - -RDEPENDS_${PN} += "${@compress_pkg(d)}" - -SRC_URI = "http://pkgs.fedoraproject.org/lookaside/pkgs/man2html/${BP}.tar.gz/ba154d5796928b841c9c69f0ae376660/${BP}.tar.gz \ - file://man-1.5k-confpath.patch;striplevel=0 \ - file://man-1.5h1-make.patch \ - file://man-1.5k-nonascii.patch \ - file://man-1.6e-security.patch \ - file://man-1.6e-mandirs.patch \ - file://man-1.5m2-bug11621.patch \ - file://man-1.5k-sofix.patch \ - file://man-1.5m2-buildroot.patch \ - file://man-1.6e-ro_usr.patch \ - file://man-1.5i2-newline.patch;striplevel=0 \ - file://man-1.5j-utf8.patch \ - file://man-1.5i2-overflow.patch \ - file://man-1.5j-nocache.patch \ - file://man-1.5i2-initial.patch \ - file://man-1.5h1-gencat.patch;striplevel=0 \ - file://man-1.5g-nonrootbuild.patch \ - file://man-1.5j-i18n.patch \ - file://man-1.6e-whatis2.patch \ - file://man-1.6e-use_i18n_vars_in_a_std_way.patch \ - file://man-1.5m2-no-color-for-printing.patch \ - file://man-1.5m2-sigpipe.patch \ - file://man-1.6e-i18n_whatis.patch \ - file://man-1.6e-new_sections.patch \ - file://man.1.gz;unpack=false \ - file://man.7.gz;unpack=false \ - file://man.conf \ - file://manpath.5.gz;unpack=false \ - file://man-1.6g-whatis3.patch \ - file://configure_sed.patch \ - file://man-1.6g-parallel.patch \ - file://man-1.6g-compile-warnings.patch \ - file://man-1.6g-configure.patch \ -" - -SRC_URI[md5sum] = "ba154d5796928b841c9c69f0ae376660" -SRC_URI[sha256sum] = "ccdcb8c3f4e0080923d7e818f0e4a202db26c46415eaef361387c20995b8959f" - -CFLAGS += "-DSYSV" - -do_configure () { - ${S}/configure -default -confdir /etc +sgid +fhs +lang all -} - - -do_install() { - oe_runmake install DESTDIR=${D} -} - -do_install_append(){ - mkdir -p ${D}${sysconfdir} - mkdir -p ${D}${datadir}/man/man5 - mkdir -p ${D}${datadir}/man/man7 - cp ${WORKDIR}/man.conf ${D}${sysconfdir}/man.config - cp ${WORKDIR}/man.1.gz ${D}${datadir}/man/man1/ - cp ${WORKDIR}/man.7.gz ${D}${datadir}/man/man7/ - cp ${WORKDIR}/manpath.5.gz ${D}${datadir}/man/man5/ -} - - -RDEPENDS_${PN} = "less groff" -FILES_${PN} += "${datadir}/locale ${sysconfdir}/man.config" diff --git a/import-layers/yocto-poky/meta/recipes-extended/mc/files/0002-Ticket-3697-tty_init-unify-curses-initialization.patch b/import-layers/yocto-poky/meta/recipes-extended/mc/files/0002-Ticket-3697-tty_init-unify-curses-initialization.patch deleted file mode 100644 index c54d4d0ea..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/mc/files/0002-Ticket-3697-tty_init-unify-curses-initialization.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 4d46a108629beb66a293672db7b44f863b6598ba Mon Sep 17 00:00:00 2001 -From: Thomas Dickey <dickey@his.com> -Date: Fri, 14 Apr 2017 14:06:13 +0300 -Subject: [PATCH] Ticket #3697: (tty_init): unify curses initialization - -...for various curses implementations. - -Signed-off-by: Andrew Borodin <aborodin@vmail.ru> - -Upstream-Status: Backport [https://github.com/MidnightCommander/mc.git] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - ---- - lib/tty/tty-ncurses.c | 26 +++++++++----------------- - 1 file changed, 9 insertions(+), 17 deletions(-) - -diff --git a/lib/tty/tty-ncurses.c b/lib/tty/tty-ncurses.c -index a7a11f3..8e69b39 100644 ---- a/lib/tty/tty-ncurses.c -+++ b/lib/tty/tty-ncurses.c -@@ -179,6 +179,8 @@ mc_tty_normalize_lines_char (const char *ch) - void - tty_init (gboolean mouse_enable, gboolean is_xterm) - { -+ struct termios mode; -+ - initscr (); - - #ifdef HAVE_ESCDELAY -@@ -194,25 +196,15 @@ tty_init (gboolean mouse_enable, gboolean is_xterm) - ESCDELAY = 200; - #endif /* HAVE_ESCDELAY */ - --#ifdef NCURSES_VERSION -+ tcgetattr (STDIN_FILENO, &mode); - /* use Ctrl-g to generate SIGINT */ -- cur_term->Nttyb.c_cc[VINTR] = CTRL ('g'); /* ^g */ -+ mode.c_cc[VINTR] = CTRL ('g'); /* ^g */ - /* disable SIGQUIT to allow use Ctrl-\ key */ -- cur_term->Nttyb.c_cc[VQUIT] = NULL_VALUE; -- tcsetattr (cur_term->Filedes, TCSANOW, &cur_term->Nttyb); --#else -- /* other curses implementation (bsd curses, ...) */ -- { -- struct termios mode; -- -- tcgetattr (STDIN_FILENO, &mode); -- /* use Ctrl-g to generate SIGINT */ -- mode.c_cc[VINTR] = CTRL ('g'); /* ^g */ -- /* disable SIGQUIT to allow use Ctrl-\ key */ -- mode.c_cc[VQUIT] = NULL_VALUE; -- tcsetattr (STDIN_FILENO, TCSANOW, &mode); -- } --#endif /* NCURSES_VERSION */ -+ mode.c_cc[VQUIT] = NULL_VALUE; -+ tcsetattr (STDIN_FILENO, TCSANOW, &mode); -+ -+ /* curses remembers the "in-program" modes after this call */ -+ def_prog_mode (); - - tty_start_interrupt_key (); - --- -2.7.4 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/mc/mc_4.8.19.bb b/import-layers/yocto-poky/meta/recipes-extended/mc/mc_4.8.20.bb index b3a156cae..70d1b5e0a 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/mc/mc_4.8.19.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/mc/mc_4.8.20.bb @@ -8,10 +8,9 @@ RDEPENDS_${PN} = "ncurses-terminfo" SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-mc-replace-perl-w-with-use-warnings.patch \ - file://0002-Ticket-3697-tty_init-unify-curses-initialization.patch \ " -SRC_URI[md5sum] = "ef423f5b6f80a1a5a5fc53b8324cab70" -SRC_URI[sha256sum] = "d0dddfae7149fac903f74ef55cfcb2a198e0f7004346c7bded43669d61ba436f" +SRC_URI[md5sum] = "dcfc7aa613c62291a0f71f6b698d8267" +SRC_URI[sha256sum] = "2d85daaa6ab26e524946df4823ac2f69802bc16bc967781b5e28d5b86fc3b979" inherit autotools gettext pkgconfig diff --git a/import-layers/yocto-poky/meta/recipes-extended/mdadm/files/gcc-4.9.patch b/import-layers/yocto-poky/meta/recipes-extended/mdadm/files/gcc-4.9.patch index 54bf1d79a..df21399de 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/mdadm/files/gcc-4.9.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/mdadm/files/gcc-4.9.patch @@ -7,13 +7,13 @@ make: *** [super-intel.o] Error 1 Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: mdadm-3.3/super-intel.c +Index: mdadm-4.0/super-intel.c =================================================================== ---- mdadm-3.3.orig/super-intel.c 2014-05-02 15:08:21.154319651 -0700 -+++ mdadm-3.3/super-intel.c 2014-05-02 15:09:31.470985794 -0700 -@@ -5060,7 +5060,7 @@ - spare->cache_size = mpb->cache_size, - spare->pwr_cycle_count = __cpu_to_le32(1), +--- mdadm-4.0.orig/super-intel.c ++++ mdadm-4.0/super-intel.c +@@ -5725,7 +5725,7 @@ static int write_super_imsm_spares(struc + spare->cache_size = mpb->cache_size; + spare->pwr_cycle_count = __cpu_to_le32(1); - snprintf((char *) spare->sig, MAX_SIGNATURE_LENGTH, + (void)snprintf((char *) spare->sig, MAX_SIGNATURE_LENGTH, diff --git a/import-layers/yocto-poky/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch b/import-layers/yocto-poky/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch index c656d073e..00e6657e0 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch @@ -5,13 +5,13 @@ Upstream-Status: Pending Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> -Index: mdadm-3.3.4/monitor.c +Index: mdadm-4.0/monitor.c =================================================================== ---- mdadm-3.3.4.orig/monitor.c -+++ mdadm-3.3.4/monitor.c -@@ -257,9 +257,12 @@ static int read_and_act(struct active_ar - mdi->curr_state = read_dev_state(mdi->state_fd); - } +--- mdadm-4.0.orig/monitor.c ++++ mdadm-4.0/monitor.c +@@ -445,9 +445,12 @@ static int read_and_act(struct active_ar + if (FD_ISSET(mdi->bb_fd, fds)) + check_for_cleared_bb(a, mdi); } - gettimeofday(&tv, NULL); diff --git a/import-layers/yocto-poky/meta/recipes-extended/minicom/minicom_2.7.1.bb b/import-layers/yocto-poky/meta/recipes-extended/minicom/minicom_2.7.1.bb index 1a31a872d..e6afe2b65 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/minicom/minicom_2.7.1.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/minicom/minicom_2.7.1.bb @@ -27,3 +27,4 @@ do_install() { for d in doc extras man lib src; do make -C $d DESTDIR=${D} install; done } +RRECOMMENDS_${PN} += "lrzsz" diff --git a/import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp1.patch b/import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp1.patch index 12eed17af..78daf6c3e 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp1.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp1.patch @@ -11,10 +11,10 @@ Signed-off-by: Li Zhou <li.zhou@windriver.com> statistics.c | 68 +++++++++- 2 files changed, 465 insertions(+), 14 deletions(-) -diff --git a/netstat.c b/netstat.c -index 1fb9e0c..5d1a4a1 100644 ---- a/netstat.c -+++ b/netstat.c +Index: net-tools-1.60/netstat.c +=================================================================== +--- net-tools-1.60.orig/netstat.c ++++ net-tools-1.60/netstat.c @@ -58,6 +58,7 @@ * *990420 {1.38} Tuan Hoang removed a useless assignment from igmp_do_one() @@ -23,7 +23,7 @@ index 1fb9e0c..5d1a4a1 100644 * * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General -@@ -105,7 +106,7 @@ +@@ -106,7 +107,7 @@ #endif /* prototypes for statistics.c */ @@ -32,7 +32,7 @@ index 1fb9e0c..5d1a4a1 100644 void inittab(void); void parsesnmp6(int, int, int); void inittab6(void); -@@ -118,6 +119,28 @@ typedef enum { +@@ -119,6 +120,28 @@ typedef enum { SS_DISCONNECTING /* in process of disconnecting */ } socket_state; @@ -61,7 +61,7 @@ index 1fb9e0c..5d1a4a1 100644 #define SO_ACCEPTCON (1<<16) /* performed a listen */ #define SO_WAITDATA (1<<17) /* wait data to read */ #define SO_NOSPACE (1<<18) /* no space to write */ -@@ -148,6 +171,7 @@ int flag_opt = 0; +@@ -149,6 +172,7 @@ int flag_opt = 0; int flag_raw = 0; int flag_tcp = 0; int flag_udp = 0; @@ -69,7 +69,7 @@ index 1fb9e0c..5d1a4a1 100644 int flag_igmp= 0; int flag_rom = 0; int flag_exp = 1; -@@ -990,6 +1014,365 @@ static int udp_info(void) +@@ -995,6 +1019,365 @@ static int udp_info(void) udp_do_one); } @@ -435,7 +435,7 @@ index 1fb9e0c..5d1a4a1 100644 static void raw_do_one(int lnr, const char *line) { char buffer[8192], local_addr[64], rem_addr[64]; -@@ -1549,7 +1932,7 @@ static void usage(void) +@@ -1558,7 +1941,7 @@ static void usage(void) fprintf(stderr, _(" -F, --fib display Forwarding Information Base (default)\n")); fprintf(stderr, _(" -C, --cache display routing cache instead of FIB\n\n")); @@ -444,7 +444,7 @@ index 1fb9e0c..5d1a4a1 100644 fprintf(stderr, _(" <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF); fprintf(stderr, _(" List of possible address families (which support routing):\n")); print_aflist(1); /* 1 = routeable */ -@@ -1574,6 +1957,7 @@ int main +@@ -1583,6 +1966,7 @@ int main {"protocol", 1, 0, 'A'}, {"tcp", 0, 0, 't'}, {"udp", 0, 0, 'u'}, @@ -452,7 +452,7 @@ index 1fb9e0c..5d1a4a1 100644 {"raw", 0, 0, 'w'}, {"unix", 0, 0, 'x'}, {"listening", 0, 0, 'l'}, -@@ -1604,7 +1988,7 @@ int main +@@ -1613,7 +1997,7 @@ int main getroute_init(); /* Set up AF routing support */ afname[0] = '\0'; @@ -461,7 +461,7 @@ index 1fb9e0c..5d1a4a1 100644 switch (i) { case -1: break; -@@ -1696,10 +2080,12 @@ int main +@@ -1705,10 +2089,12 @@ int main case 't': flag_tcp++; break; @@ -475,7 +475,7 @@ index 1fb9e0c..5d1a4a1 100644 case 'w': flag_raw++; break; -@@ -1717,13 +2103,13 @@ int main +@@ -1726,13 +2112,13 @@ int main if (flag_int + flag_rou + flag_mas + flag_sta > 1) usage(); @@ -493,7 +493,7 @@ index 1fb9e0c..5d1a4a1 100644 + flag_ax25 + flag_netrom + flag_igmp + flag_x25; if (flag_mas) { -@@ -1751,7 +2137,7 @@ int main +@@ -1760,7 +2146,7 @@ int main char buf[256]; if (!afname[0]) { inittab(); @@ -502,7 +502,7 @@ index 1fb9e0c..5d1a4a1 100644 } else { safe_strncpy(buf, afname, sizeof(buf)); tmp1 = buf; -@@ -1804,7 +2190,7 @@ int main +@@ -1815,7 +2201,7 @@ int main return (i); } for (;;) { @@ -511,7 +511,7 @@ index 1fb9e0c..5d1a4a1 100644 #if HAVE_AFINET prg_cache_load(); printf(_("Active Internet connections ")); /* xxx */ -@@ -1843,6 +2229,11 @@ int main +@@ -1854,6 +2240,11 @@ int main if (i) return (i); } @@ -523,10 +523,10 @@ index 1fb9e0c..5d1a4a1 100644 if (!flag_arg || flag_raw) { i = raw_info(); if (i) -diff --git a/statistics.c b/statistics.c -index 03600d7..eb8d7dc 100644 ---- a/statistics.c -+++ b/statistics.c +Index: net-tools-1.60/statistics.c +=================================================================== +--- net-tools-1.60.orig/statistics.c ++++ net-tools-1.60/statistics.c @@ -21,7 +21,7 @@ #define UFWARN(x) #endif @@ -537,7 +537,7 @@ index 03600d7..eb8d7dc 100644 enum State { number = 0, opt_number, i_forward, i_inp_icmp, i_outp_icmp, i_rto_alg, @@ -297,6 +297,27 @@ struct entry Tcpexttab[] = - { "TCPRenoRecoveryFail", N_("%u classic Reno fast retransmits failed"), opt_number }, + { "TCPRenoRecoveryFail", N_("%llu classic Reno fast retransmits failed"), opt_number }, }; +struct entry Sctptab[] = @@ -616,7 +616,7 @@ index 03600d7..eb8d7dc 100644 f = proc_fopen("/proc/net/snmp"); if (!f) { perror(_("cannot open /proc/net/snmp")); -@@ -530,6 +580,16 @@ void parsesnmp(int flag_raw, int flag_tcp, int flag_udp) +@@ -530,6 +580,16 @@ void parsesnmp(int flag_raw, int flag_tc fclose(f); } @@ -633,6 +633,3 @@ index 03600d7..eb8d7dc 100644 return; } --- -1.8.5.2.233.g932f7e4 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/newt/files/cross_ar.patch b/import-layers/yocto-poky/meta/recipes-extended/newt/files/cross_ar.patch index 03007aa4f..86cc0be1d 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/newt/files/cross_ar.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/newt/files/cross_ar.patch @@ -18,18 +18,19 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> configure.ac | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) -diff --git a/Makefile.in b/Makefile.in ---- a/Makefile.in -+++ b/Makefile.in +Index: newt-0.52.20/Makefile.in +=================================================================== +--- newt-0.52.20.orig/Makefile.in ++++ newt-0.52.20/Makefile.in @@ -7,6 +7,7 @@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ - CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ + CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ GNU_LD = @GNU_LD@ +AR = @AR@ VERSION = @VERSION@ TAG = r$(subst .,-,$(VERSION)) -@@ -109,7 +110,7 @@ whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNEWTSH) +@@ -109,7 +110,7 @@ whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNE $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS) $(LIBNEWT): $(LIBOBJS) @@ -38,10 +39,10 @@ diff --git a/Makefile.in b/Makefile.in newt.o $(SHAREDDIR)/newt.o: newt.c Makefile -diff --git a/configure.ac b/configure.ac -index 92e6da8..cd83d57 100644 ---- a/configure.ac -+++ b/configure.ac +Index: newt-0.52.20/configure.ac +=================================================================== +--- newt-0.52.20.orig/configure.ac ++++ newt-0.52.20/configure.ac @@ -15,6 +15,10 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_GREP @@ -51,8 +52,5 @@ index 92e6da8..cd83d57 100644 +AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)]) +AC_PROG_AR - # Are we using GNU ld? - AC_MSG_CHECKING([for GNU ld]) --- -1.8.1.2 - + AC_CHECK_SIZEOF([long]) + AC_CHECK_SIZEOF([long long]) diff --git a/import-layers/yocto-poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/import-layers/yocto-poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb index fdede5954..9002fbc37 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb @@ -89,7 +89,6 @@ RDEPENDS_packagegroup-core-full-cmdline-utils = "\ mktemp \ ncurses \ net-tools \ - pax \ popt \ procps \ psmisc \ @@ -140,19 +139,13 @@ RDEPENDS_packagegroup-core-full-cmdline-sys-services = "\ bzip2 \ cronie \ dbus \ - dbus-glib \ elfutils \ gzip \ less \ - libcap \ - libevent \ logrotate \ nfs-utils \ pciutils \ - libpcre \ rpcbind \ - sysfsutils \ tcp-wrappers \ tzdata \ " - diff --git a/import-layers/yocto-poky/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/import-layers/yocto-poky/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb index 5baaf351e..53d100ce7 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb @@ -14,12 +14,15 @@ REQUIRED_DISTRO_FEATURES = "x11" # libglu needs virtual/libgl, which requires opengl in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES += "opengl" +# libpam, pam-plugin-wheel requires pam in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES += "pam" + # # We will skip parsing this packagegeoup for non-glibc systems # python __anonymous () { if d.getVar('TCLIBC') != "glibc": - raise bb.parse.SkipPackage("incompatible with %s C library" % + raise bb.parse.SkipRecipe("incompatible with %s C library" % d.getVar('TCLIBC')) } @@ -68,7 +71,6 @@ RDEPENDS_packagegroup-core-sys-extended = "\ mc-helpers-perl \ mdadm \ minicom \ - neon \ parted \ quota \ screen \ @@ -159,7 +161,6 @@ RDEPENDS_packagegroup-core-lsb-core = "\ mktemp \ msmtp \ patch \ - pax \ procps \ psmisc \ sed \ diff --git a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/libpam-xtests.patch b/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/libpam-xtests.patch index be687457f..7edf66f91 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/libpam-xtests.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/libpam-xtests.patch @@ -3,18 +3,20 @@ This patch is used to create a new sub package libpam-xtests to do more checks. Upstream-Status: Pending Signed-off-by: Kang Kai <kai.kang@windriver.com> ---- Linux-PAM-1.1.4/xtests/Makefile.am.orig 2011-07-19 17:00:09.619980001 +0800 -+++ Linux-PAM-1.1.4/xtests/Makefile.am 2011-07-19 16:54:00.229979998 +0800 -@@ -7,7 +7,7 @@ - AM_LDFLAGS = -L$(top_builddir)/libpam -lpam \ - -L$(top_builddir)/libpam_misc -lpam_misc +Index: Linux-PAM-1.3.0/xtests/Makefile.am +=================================================================== +--- Linux-PAM-1.3.0.orig/xtests/Makefile.am ++++ Linux-PAM-1.3.0/xtests/Makefile.am +@@ -7,7 +7,7 @@ AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_src + LDADD = $(top_builddir)/libpam/libpam.la \ + $(top_builddir)/libpam_misc/libpam_misc.la -CLEANFILES = *~ $(XTESTS) +CLEANFILES = *~ EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \ tst-pam_dispatch3.pamd tst-pam_dispatch4.pamd \ -@@ -51,3 +51,18 @@ +@@ -51,3 +51,18 @@ EXTRA_PROGRAMS = $(XTESTS) xtests: $(XTESTS) run-xtests.sh "$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS} ${NOSRCTESTS} diff --git a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch b/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch index f1834f6ce..9b8d4c297 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch @@ -5,12 +5,13 @@ Upstream-Status: Pending Signed-off-by: Ming Liu <ming.liu@windriver.com> =================================================================== -diff -urpN a/modules/pam_securetty/Makefile.am b/modules/pam_securetty/Makefile.am ---- a/modules/pam_securetty/Makefile.am 2013-07-05 11:08:23.224483237 +0800 -+++ b/modules/pam_securetty/Makefile.am 2013-07-05 11:15:21.304486456 +0800 +Index: Linux-PAM-1.3.0/modules/pam_securetty/Makefile.am +=================================================================== +--- Linux-PAM-1.3.0.orig/modules/pam_securetty/Makefile.am ++++ Linux-PAM-1.3.0/modules/pam_securetty/Makefile.am @@ -24,6 +24,10 @@ endif securelib_LTLIBRARIES = pam_securetty.la - pam_securetty_la_LIBADD = -L$(top_builddir)/libpam -lpam + pam_securetty_la_LIBADD = $(top_builddir)/libpam/libpam.la +pam_securetty_la_SOURCES = \ + pam_securetty.c \ @@ -19,9 +20,10 @@ diff -urpN a/modules/pam_securetty/Makefile.am b/modules/pam_securetty/Makefile. if ENABLE_REGENERATE_MAN noinst_DATA = README README: pam_securetty.8.xml -diff -urpN a/modules/pam_securetty/pam_securetty.c b/modules/pam_securetty/pam_securetty.c ---- a/modules/pam_securetty/pam_securetty.c 2013-07-05 11:07:50.064483568 +0800 -+++ b/modules/pam_securetty/pam_securetty.c 2013-07-05 11:12:23.994483344 +0800 +Index: Linux-PAM-1.3.0/modules/pam_securetty/pam_securetty.c +=================================================================== +--- Linux-PAM-1.3.0.orig/modules/pam_securetty/pam_securetty.c ++++ Linux-PAM-1.3.0/modules/pam_securetty/pam_securetty.c @@ -1,7 +1,5 @@ /* pam_securetty module */ @@ -104,9 +106,10 @@ diff -urpN a/modules/pam_securetty/pam_securetty.c b/modules/pam_securetty/pam_s if (retval && !(ctrl & PAM_NOCONSOLE_ARG)) { FILE *cmdlinefile; -diff -urpN a/modules/pam_securetty/tty_secure.c b/modules/pam_securetty/tty_secure.c ---- a/modules/pam_securetty/tty_secure.c 1970-01-01 08:30:00.000000000 +0830 -+++ b/modules/pam_securetty/tty_secure.c 2013-07-05 11:14:21.534482900 +0800 +Index: Linux-PAM-1.3.0/modules/pam_securetty/tty_secure.c +=================================================================== +--- /dev/null ++++ Linux-PAM-1.3.0/modules/pam_securetty/tty_secure.c @@ -0,0 +1,90 @@ +/* + * A function to determine if a particular line is in /etc/securetty diff --git a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam_1.3.0.bb b/import-layers/yocto-poky/meta/recipes-extended/pam/libpam_1.3.0.bb index 8f7753d00..92ab72a42 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam_1.3.0.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/pam/libpam_1.3.0.bb @@ -151,11 +151,8 @@ do_install() { fi } -python do_pam_sanity () { - if not bb.utils.contains('DISTRO_FEATURES', 'pam', True, False, d): - bb.warn("Building libpam but 'pam' isn't in DISTRO_FEATURES, PAM won't work correctly") -} -addtask pam_sanity before do_configure +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" BBCLASSEXTEND = "nativesdk native" diff --git a/import-layers/yocto-poky/meta/recipes-extended/parted/files/no_check.patch b/import-layers/yocto-poky/meta/recipes-extended/parted/files/no_check.patch index 58d8db442..e6a26d11a 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/parted/files/no_check.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/parted/files/no_check.patch @@ -5,12 +5,12 @@ it to be disabled. RP - 4/11/08 -Index: parted-1.9.0/configure.ac +Index: parted-3.2/configure.ac =================================================================== ---- parted-1.9.0.orig/configure.ac 2009-07-23 18:52:08.000000000 +0100 -+++ parted-1.9.0/configure.ac 2010-02-02 14:13:56.013905093 +0000 -@@ -477,7 +477,7 @@ - AM_CONDITIONAL([BUILD_LINUX], [test "$OS" = linux]) +--- parted-3.2.orig/configure.ac ++++ parted-3.2/configure.ac +@@ -555,7 +555,7 @@ AC_CHECK_HEADER([execinfo.h], [ + AM_CONDITIONAL([COMPILE_FOR_S390], [test "$host_cpu" = s390 || test "$host_cpu" = s390x]) dnl check for "check", unit testing library/header -PKG_CHECK_MODULES([CHECK], [check >= 0.9.3], have_check=yes, have_check=no) diff --git a/import-layers/yocto-poky/meta/recipes-extended/parted/files/syscalls.patch b/import-layers/yocto-poky/meta/recipes-extended/parted/files/syscalls.patch index e9bbe9a95..93205a0a8 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/parted/files/syscalls.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/parted/files/syscalls.patch @@ -4,10 +4,10 @@ Upstream-Status: Pending libparted/arch/linux.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) -Index: parted-1.9.0/libparted/arch/linux.c +Index: parted-3.2/libparted/arch/linux.c =================================================================== ---- parted-1.9.0.orig/libparted/arch/linux.c 2009-07-23 18:52:08.000000000 +0100 -+++ parted-1.9.0/libparted/arch/linux.c 2010-02-02 14:14:16.523904768 +0000 +--- parted-3.2.orig/libparted/arch/linux.c ++++ parted-3.2/libparted/arch/linux.c @@ -17,6 +17,8 @@ #define PROC_DEVICES_BUFSIZ 16384 @@ -16,8 +16,8 @@ Index: parted-1.9.0/libparted/arch/linux.c + #include <config.h> #include <arch/linux.h> - -@@ -1477,12 +1479,14 @@ + #include <linux/blkpg.h> +@@ -1696,12 +1698,14 @@ linux_refresh_close (PedDevice* dev) #if SIZEOF_OFF_T < 8 @@ -32,7 +32,7 @@ Index: parted-1.9.0/libparted/arch/linux.c loff_t llseek (unsigned int fd, loff_t offset, unsigned int whence) -@@ -1490,11 +1494,20 @@ +@@ -1709,11 +1713,20 @@ llseek (unsigned int fd, loff_t offset, loff_t result; int retval; diff --git a/import-layers/yocto-poky/meta/recipes-extended/pax/pax/0001-Add-a-comment-for-fallthrough.patch b/import-layers/yocto-poky/meta/recipes-extended/pax/pax/0001-Add-a-comment-for-fallthrough.patch deleted file mode 100644 index b76f85aa4..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/pax/pax/0001-Add-a-comment-for-fallthrough.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e67bb3debe582f0e77770b714bd012bb1082fc41 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 19 Apr 2017 11:32:00 -0700 -Subject: [PATCH] Add a comment for fallthrough - -Fixes warnings with gcc7 e.g. - -../../../../../../../workspace/sources/pax/src/options.c: In function 'tar_options': -../../../../../../../workspace/sources/pax/src/options.c:725:7: error: this statement may fall through [-Werror=implicit-fallthrough=] - if (opt_add ("write_opt=nodir") < 0) - ^ -../../../../../../../workspace/sources/pax/src/options.c:730:2: note: here - case 'O': - ^~~~ -cc1: all warnings being treated as errors - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/options.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/options.c b/src/options.c -index c663b4e..b80819a 100644 ---- a/src/options.c -+++ b/src/options.c -@@ -724,6 +724,7 @@ tar_options (int argc, char **argv) - case 'o': - if (opt_add ("write_opt=nodir") < 0) - tar_usage (); -+ /* fallthru */ - case 'O': - Oflag = 1; - break; --- -2.12.2 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/pax/pax/0001-Fix-build-with-musl.patch b/import-layers/yocto-poky/meta/recipes-extended/pax/pax/0001-Fix-build-with-musl.patch deleted file mode 100644 index 61bf2de5e..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/pax/pax/0001-Fix-build-with-musl.patch +++ /dev/null @@ -1,1287 +0,0 @@ -From 47c4db8d37248d968fac7ee4a71ca64398890723 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 6 Jan 2016 11:57:21 -0800 -Subject: [PATCH] Fix build with musl - -Remove BSDisms -Remove fts, and link to libfts thats provided externally - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Inappropriate[musl specific] - - lib/Makefile.am | 4 +- - lib/fts.c | 1025 ------------------------------------------------------- - lib/fts.h | 131 ------- - lib/vis.h | 13 +- - src/Makefile.am | 2 +- - src/extern.h | 2 - - src/file_subs.c | 2 +- - src/tables.c | 2 +- - 8 files changed, 14 insertions(+), 1167 deletions(-) - delete mode 100644 lib/fts.c - delete mode 100644 lib/fts.h - -diff --git a/lib/Makefile.am b/lib/Makefile.am -index 56d0859..7f5045a 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -8,8 +8,8 @@ AUTOMAKE_OPTIONS = 1.7 gnits - CLEANFILES = *~ - - noinst_LIBRARIES = libbsdfunc.a --noinst_HEADERS = vis.h bsdfunc.h fts.h -+noinst_HEADERS = vis.h bsdfunc.h - - AM_CFLAGS = @EXTRA_CFLAGS@ - --libbsdfunc_a_SOURCES = vis.c strlcpy.c strmode.c fts.c -+libbsdfunc_a_SOURCES = vis.c strlcpy.c strmode.c -diff --git a/lib/fts.c b/lib/fts.c -deleted file mode 100644 -index 45e90ca..0000000 ---- a/lib/fts.c -+++ /dev/null -@@ -1,1025 +0,0 @@ --/*- -- * Copyright (c) 1990, 1993, 1994 -- * The Regents of the University of California. 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. -- * 4. Neither the name of the University nor the names of its contributors -- * may be used to endorse or promote products derived from this software -- * without specific prior written permission. -- * -- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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. -- */ -- --#ifdef HAVE_CONFIG_H --#include <config.h> --#endif -- --#include <sys/stat.h> --#include <fcntl.h> --#include <dirent.h> --#include <errno.h> --#include <fts.h> --#include <stdlib.h> --#include <string.h> --#include <unistd.h> -- --/* Largest alignment size needed, minus one. -- Usually long double is the worst case. */ --#ifndef ALIGNBYTES --#define ALIGNBYTES (__alignof__ (long double) - 1) --#endif --/* Align P to that size. */ --#ifndef ALIGN --#define ALIGN(p) (((unsigned long int) (p) + ALIGNBYTES) & ~ALIGNBYTES) --#endif -- -- --static FTSENT *fts_alloc (FTS *, const char *, int); --static FTSENT *fts_build (FTS *, int); --static void fts_lfree (FTSENT *); --static void fts_load (FTS *, FTSENT *); --static size_t fts_maxarglen (char * const *); --static void fts_padjust (FTS *, FTSENT *); --static int fts_palloc (FTS *, size_t); --static FTSENT *fts_sort (FTS *, FTSENT *, int); --static u_short fts_stat (FTS *, FTSENT *, int); --static int fts_safe_changedir (FTS *, FTSENT *, int, const char *); -- --#ifndef MAX --#define MAX(a, b) (a > b ? a : b) --#endif -- --#define ISDOT(a) (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2]))) -- --#define CLR(opt) (sp->fts_options &= ~(opt)) --#define ISSET(opt) (sp->fts_options & (opt)) --#define SET(opt) (sp->fts_options |= (opt)) -- --#define FCHDIR(sp, fd) (!ISSET(FTS_NOCHDIR) && fchdir(fd)) -- --#define BREAD 3 /* fts_read */ -- --FTS * --fts_open(argv, koptions, compar) -- char * const *argv; -- register int koptions; -- int (*compar) (const FTSENT **, const FTSENT **); --{ -- register FTS *sp; -- register FTSENT *p, *root; -- register int nitems; -- FTSENT *parent, *tmp; -- int len; -- --tmp = NULL; /* stop compiler whinging */ -- /* Options check. */ -- if (koptions & ~FTS_OPTIONMASK) { -- errno = EINVAL; -- return (NULL); -- } -- -- /* Allocate/initialize the stream */ -- if ((sp = malloc((u_int)sizeof(FTS))) == NULL) -- return (NULL); -- memset(sp, 0, sizeof(FTS)); -- sp->fts_compar = (int (*) (const void *, const void *)) compar; -- sp->fts_options = koptions; -- -- /* Logical walks turn on NOCHDIR; symbolic links are too hard. */ -- if (ISSET(FTS_LOGICAL)) -- SET(FTS_NOCHDIR); -- -- /* -- * Start out with 1K of path space, and enough, in any case, -- * to hold the user's paths. -- */ --#ifndef MAXPATHLEN --#define MAXPATHLEN 1024 --#endif -- if (fts_palloc(sp, MAX(fts_maxarglen(argv), MAXPATHLEN))) -- goto mem1; -- -- /* Allocate/initialize root's parent. */ -- if ((parent = fts_alloc(sp, "", 0)) == NULL) -- goto mem2; -- parent->fts_level = FTS_ROOTPARENTLEVEL; -- -- /* Allocate/initialize root(s). */ -- for (root = NULL, nitems = 0; *argv != NULL; ++argv, ++nitems) { -- /* Don't allow zero-length paths. */ -- if ((len = strlen(*argv)) == 0) { -- errno = ENOENT; -- goto mem3; -- } -- -- p = fts_alloc(sp, *argv, len); -- p->fts_level = FTS_ROOTLEVEL; -- p->fts_parent = parent; -- p->fts_accpath = p->fts_name; -- p->fts_info = fts_stat(sp, p, ISSET(FTS_COMFOLLOW)); -- -- /* Command-line "." and ".." are real directories. */ -- if (p->fts_info == FTS_DOT) -- p->fts_info = FTS_D; -- -- /* -- * If comparison routine supplied, traverse in sorted -- * order; otherwise traverse in the order specified. -- */ -- if (compar) { -- p->fts_link = root; -- root = p; -- } else { -- p->fts_link = NULL; -- if (root == NULL) -- tmp = root = p; -- else { -- tmp->fts_link = p; -- tmp = p; -- } -- } -- } -- if (compar && nitems > 1) -- root = fts_sort(sp, root, nitems); -- -- /* -- * Allocate a dummy pointer and make fts_read think that we've just -- * finished the node before the root(s); set p->fts_info to FTS_INIT -- * so that everything about the "current" node is ignored. -- */ -- if ((sp->fts_cur = fts_alloc(sp, "", 0)) == NULL) -- goto mem3; -- sp->fts_cur->fts_link = root; -- sp->fts_cur->fts_info = FTS_INIT; -- -- /* -- * If using chdir(2), grab a file descriptor pointing to dot to ensure -- * that we can get back here; this could be avoided for some paths, -- * but almost certainly not worth the effort. Slashes, symbolic links, -- * and ".." are all fairly nasty problems. Note, if we can't get the -- * descriptor we run anyway, just more slowly. -- */ -- if (!ISSET(FTS_NOCHDIR) -- && (sp->fts_rfd = open(".", O_RDONLY, 0)) < 0) -- SET(FTS_NOCHDIR); -- -- return (sp); -- --mem3: fts_lfree(root); -- free(parent); --mem2: free(sp->fts_path); --mem1: free(sp); -- return (NULL); --} -- --static void --fts_load(sp, p) -- FTS *sp; -- register FTSENT *p; --{ -- register int len; -- register char *cp; -- -- /* -- * Load the stream structure for the next traversal. Since we don't -- * actually enter the directory until after the preorder visit, set -- * the fts_accpath field specially so the chdir gets done to the right -- * place and the user can access the first node. From fts_open it's -- * known that the path will fit. -- */ -- len = p->fts_pathlen = p->fts_namelen; -- memmove(sp->fts_path, p->fts_name, len + 1); -- if ((cp = strrchr(p->fts_name, '/')) && (cp != p->fts_name || cp[1])) { -- len = strlen(++cp); -- memmove(p->fts_name, cp, len + 1); -- p->fts_namelen = len; -- } -- p->fts_accpath = p->fts_path = sp->fts_path; -- sp->fts_dev = p->fts_dev; --} -- --int --fts_close(sp) -- FTS *sp; --{ -- register FTSENT *freep, *p; -- int saved_errno; -- -- /* -- * This still works if we haven't read anything -- the dummy structure -- * points to the root list, so we step through to the end of the root -- * list which has a valid parent pointer. -- */ -- if (sp->fts_cur) { -- for (p = sp->fts_cur; p->fts_level >= FTS_ROOTLEVEL;) { -- freep = p; -- p = p->fts_link != NULL ? p->fts_link : p->fts_parent; -- free(freep); -- } -- free(p); -- } -- -- /* Free up child linked list, sort array, path buffer. */ -- if (sp->fts_child) -- fts_lfree(sp->fts_child); -- if (sp->fts_array) -- free(sp->fts_array); -- free(sp->fts_path); -- -- /* Return to original directory, save errno if necessary. */ -- if (!ISSET(FTS_NOCHDIR)) { -- saved_errno = fchdir(sp->fts_rfd) ? errno : 0; -- (void)close(sp->fts_rfd); -- -- /* Set errno and return. */ -- if (saved_errno != 0) { -- /* Free up the stream pointer. */ -- free(sp); -- errno = saved_errno; -- return (-1); -- } -- } -- -- /* Free up the stream pointer. */ -- free(sp); -- return (0); --} -- --/* -- * Special case of "/" at the end of the path so that slashes aren't -- * appended which would cause paths to be written as "....//foo". -- */ --#define NAPPEND(p) \ -- (p->fts_path[p->fts_pathlen - 1] == '/' \ -- ? p->fts_pathlen - 1 : p->fts_pathlen) -- --FTSENT * --fts_read(sp) -- register FTS *sp; --{ -- register FTSENT *p, *tmp; -- register int instr; -- register char *t; -- int saved_errno; -- -- /* If finished or unrecoverable error, return NULL. */ -- if (sp->fts_cur == NULL || ISSET(FTS_STOP)) -- return (NULL); -- -- /* Set current node pointer. */ -- p = sp->fts_cur; -- -- /* Save and zero out user instructions. */ -- instr = p->fts_instr; -- p->fts_instr = FTS_NOINSTR; -- -- /* Any type of file may be re-visited; re-stat and re-turn. */ -- if (instr == FTS_AGAIN) { -- p->fts_info = fts_stat(sp, p, 0); -- return (p); -- } -- -- /* -- * Following a symlink -- SLNONE test allows application to see -- * SLNONE and recover. If indirecting through a symlink, have -- * keep a pointer to current location. If unable to get that -- * pointer, follow fails. -- */ -- if (instr == FTS_FOLLOW && -- (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) { -- p->fts_info = fts_stat(sp, p, 1); -- if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) { -- if ((p->fts_symfd = open(".", O_RDONLY, 0)) < 0) { -- p->fts_errno = errno; -- p->fts_info = FTS_ERR; -- } else -- p->fts_flags |= FTS_SYMFOLLOW; -- } -- return (p); -- } -- -- /* Directory in pre-order. */ -- if (p->fts_info == FTS_D) { -- /* If skipped or crossed mount point, do post-order visit. */ -- if (instr == FTS_SKIP || -- (ISSET(FTS_XDEV) && p->fts_dev != sp->fts_dev)) { -- if (p->fts_flags & FTS_SYMFOLLOW) -- (void)close(p->fts_symfd); -- if (sp->fts_child) { -- fts_lfree(sp->fts_child); -- sp->fts_child = NULL; -- } -- p->fts_info = FTS_DP; -- return (p); -- } -- -- /* Rebuild if only read the names and now traversing. */ -- if (sp->fts_child != NULL && ISSET(FTS_NAMEONLY)) { -- CLR(FTS_NAMEONLY); -- fts_lfree(sp->fts_child); -- sp->fts_child = NULL; -- } -- -- /* -- * Cd to the subdirectory. -- * -- * If have already read and now fail to chdir, whack the list -- * to make the names come out right, and set the parent errno -- * so the application will eventually get an error condition. -- * Set the FTS_DONTCHDIR flag so that when we logically change -- * directories back to the parent we don't do a chdir. -- * -- * If haven't read do so. If the read fails, fts_build sets -- * FTS_STOP or the fts_info field of the node. -- */ -- if (sp->fts_child != NULL) { -- if (fts_safe_changedir(sp, p, -1, p->fts_accpath)) { -- p->fts_errno = errno; -- p->fts_flags |= FTS_DONTCHDIR; -- for (p = sp->fts_child; p != NULL; -- p = p->fts_link) -- p->fts_accpath = -- p->fts_parent->fts_accpath; -- } -- } else if ((sp->fts_child = fts_build(sp, BREAD)) == NULL) { -- if (ISSET(FTS_STOP)) -- return (NULL); -- return (p); -- } -- p = sp->fts_child; -- sp->fts_child = NULL; -- goto name; -- } -- -- /* Move to the next node on this level. */ --next: tmp = p; -- if ((p = p->fts_link) != NULL) { -- free(tmp); -- -- /* -- * If reached the top, return to the original directory (or -- * the root of the tree), and load the paths for the next root. -- */ -- if (p->fts_level == FTS_ROOTLEVEL) { -- if (FCHDIR(sp, sp->fts_rfd)) { -- SET(FTS_STOP); -- return (NULL); -- } -- fts_load(sp, p); -- return (sp->fts_cur = p); -- } -- -- /* -- * User may have called fts_set on the node. If skipped, -- * ignore. If followed, get a file descriptor so we can -- * get back if necessary. -- */ -- if (p->fts_instr == FTS_SKIP) -- goto next; -- if (p->fts_instr == FTS_FOLLOW) { -- p->fts_info = fts_stat(sp, p, 1); -- if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) { -- if ((p->fts_symfd = -- open(".", O_RDONLY, 0)) < 0) { -- p->fts_errno = errno; -- p->fts_info = FTS_ERR; -- } else -- p->fts_flags |= FTS_SYMFOLLOW; -- } -- p->fts_instr = FTS_NOINSTR; -- } -- --name: t = sp->fts_path + NAPPEND(p->fts_parent); -- *t++ = '/'; -- memmove(t, p->fts_name, p->fts_namelen + 1); -- return (sp->fts_cur = p); -- } -- -- /* Move up to the parent node. */ -- p = tmp->fts_parent; -- free(tmp); -- -- if (p->fts_level == FTS_ROOTPARENTLEVEL) { -- /* -- * Done; free everything up and set errno to 0 so the user -- * can distinguish between error and EOF. -- */ -- free(p); -- errno = 0; -- return (sp->fts_cur = NULL); -- } -- -- /* NUL terminate the pathname. */ -- sp->fts_path[p->fts_pathlen] = '\0'; -- -- /* -- * Return to the parent directory. If at a root node or came through -- * a symlink, go back through the file descriptor. Otherwise, cd up -- * one directory. -- */ -- if (p->fts_level == FTS_ROOTLEVEL) { -- if (FCHDIR(sp, sp->fts_rfd)) { -- SET(FTS_STOP); -- return (NULL); -- } -- } else if (p->fts_flags & FTS_SYMFOLLOW) { -- if (FCHDIR(sp, p->fts_symfd)) { -- saved_errno = errno; -- (void)close(p->fts_symfd); -- errno = saved_errno; -- SET(FTS_STOP); -- return (NULL); -- } -- (void)close(p->fts_symfd); -- } else if (!(p->fts_flags & FTS_DONTCHDIR) && -- fts_safe_changedir(sp, p->fts_parent, -1, "..")) { -- SET(FTS_STOP); -- return (NULL); -- } -- p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP; -- return (sp->fts_cur = p); --} -- --/* -- * Fts_set takes the stream as an argument although it's not used in this -- * implementation; it would be necessary if anyone wanted to add global -- * semantics to fts using fts_set. An error return is allowed for similar -- * reasons. -- */ --/* ARGSUSED */ --int --fts_set(sp, p, instr) -- FTS __attribute__((__unused__)) *sp; -- FTSENT *p; -- int instr; --{ --sp = NULL; /* stop compiler whinging */ -- if (instr != 0 && instr != FTS_AGAIN && instr != FTS_FOLLOW && -- instr != FTS_NOINSTR && instr != FTS_SKIP) { -- errno = EINVAL; -- return (1); -- } -- p->fts_instr = instr; -- return (0); --} -- --/* -- * This is the tricky part -- do not casually change *anything* in here. The -- * idea is to build the linked list of entries that are used by fts_children -- * and fts_read. There are lots of special cases. -- * -- * The real slowdown in walking the tree is the stat calls. If FTS_NOSTAT is -- * set and it's a physical walk (so that symbolic links can't be directories), -- * we can do things quickly. First, if it's a 4.4BSD file system, the type -- * of the file is in the directory entry. Otherwise, we assume that the number -- * of subdirectories in a node is equal to the number of links to the parent. -- * The former skips all stat calls. The latter skips stat calls in any leaf -- * directories and for any files after the subdirectories in the directory have -- * been found, cutting the stat calls by about 2/3. -- */ --static FTSENT * --fts_build(sp, type) -- register FTS *sp; -- int type; --{ -- register struct dirent *dp; -- register FTSENT *p, *head; -- register int nitems; -- FTSENT *cur, *tail; -- DIR *dirp; -- void *oldaddr; -- int cderrno, descend, len, level, nlinks, saved_errno, -- nostat, doadjust; -- size_t maxlen; -- char *cp; -- -- /* Set current node pointer. */ -- cur = sp->fts_cur; -- -- /* -- * Open the directory for reading. If this fails, we're done. -- * If being called from fts_read, set the fts_info field. -- */ -- if ((dirp = opendir(cur->fts_accpath)) == NULL) { -- if (type == BREAD) { -- cur->fts_info = FTS_DNR; -- cur->fts_errno = errno; -- } -- return (NULL); -- } -- -- /* -- * Nlinks is the number of possible entries of type directory in the -- * directory if we're cheating on stat calls, 0 if we're not doing -- * any stat calls at all, -1 if we're doing stats on everything. -- */ -- nlinks = -1; -- nostat = 0; -- -- /* -- * If we're going to need to stat anything or we want to descend -- * and stay in the directory, chdir. If this fails we keep going, -- * but set a flag so we don't chdir after the post-order visit. -- * We won't be able to stat anything, but we can still return the -- * names themselves. Note, that since fts_read won't be able to -- * chdir into the directory, it will have to return different path -- * names than before, i.e. "a/b" instead of "b". Since the node -- * has already been visited in pre-order, have to wait until the -- * post-order visit to return the error. There is a special case -- * here, if there was nothing to stat then it's not an error to -- * not be able to stat. This is all fairly nasty. If a program -- * needed sorted entries or stat information, they had better be -- * checking FTS_NS on the returned nodes. -- */ -- cderrno = 0; -- if (nlinks || type == BREAD) { -- if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) { -- if (nlinks && type == BREAD) -- cur->fts_errno = errno; -- cur->fts_flags |= FTS_DONTCHDIR; -- descend = 0; -- cderrno = errno; -- (void)closedir(dirp); -- dirp = NULL; -- } else -- descend = 1; -- } else -- descend = 0; -- -- /* -- * Figure out the max file name length that can be stored in the -- * current path -- the inner loop allocates more path as necessary. -- * We really wouldn't have to do the maxlen calculations here, we -- * could do them in fts_read before returning the path, but it's a -- * lot easier here since the length is part of the dirent structure. -- * -- * If not changing directories set a pointer so that can just append -- * each new name into the path. -- */ -- len = NAPPEND(cur); -- if (ISSET(FTS_NOCHDIR)) { -- cp = sp->fts_path + len; -- *cp++ = '/'; -- } else { -- /* GCC, you're too verbose. */ -- cp = NULL; -- } -- len++; -- maxlen = sp->fts_pathlen - len; -- -- level = cur->fts_level + 1; -- -- /* Read the directory, attaching each entry to the `link' pointer. */ -- doadjust = 0; -- for (head = tail = NULL, nitems = 0; dirp && (dp = readdir(dirp));) { -- if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name)) -- continue; -- -- if ((p = fts_alloc(sp, dp->d_name, (int)_D_EXACT_NAMLEN (dp))) == NULL) -- goto mem1; -- if (_D_EXACT_NAMLEN (dp) >= maxlen) {/* include space for NUL */ -- oldaddr = sp->fts_path; -- if (fts_palloc(sp, _D_EXACT_NAMLEN (dp) + len + 1)) { -- /* -- * No more memory for path or structures. Save -- * errno, free up the current structure and the -- * structures already allocated. -- */ --mem1: saved_errno = errno; -- if (p) -- free(p); -- fts_lfree(head); -- (void)closedir(dirp); -- cur->fts_info = FTS_ERR; -- SET(FTS_STOP); -- errno = saved_errno; -- return (NULL); -- } -- /* Did realloc() change the pointer? */ -- if (oldaddr != sp->fts_path) { -- doadjust = 1; -- if (ISSET(FTS_NOCHDIR)) -- cp = sp->fts_path + len; -- } -- maxlen = sp->fts_pathlen - len; -- } -- -- if (len + _D_EXACT_NAMLEN (dp) >= 0x10000) { -- /* -- * In an FTSENT, fts_pathlen is a u_short so it is -- * possible to wraparound here. If we do, free up -- * the current structure and the structures already -- * allocated, then error out with ENAMETOOLONG. -- */ -- free(p); -- fts_lfree(head); -- (void)closedir(dirp); -- cur->fts_info = FTS_ERR; -- SET(FTS_STOP); -- errno = ENAMETOOLONG; -- return (NULL); -- } -- p->fts_level = level; -- p->fts_parent = sp->fts_cur; -- p->fts_pathlen = len + _D_EXACT_NAMLEN (dp); -- --#if defined FTS_WHITEOUT && 0 -- if (dp->d_type == DT_WHT) -- p->fts_flags |= FTS_ISW; --#endif -- -- if (cderrno) { -- if (nlinks) { -- p->fts_info = FTS_NS; -- p->fts_errno = cderrno; -- } else -- p->fts_info = FTS_NSOK; -- p->fts_accpath = cur->fts_accpath; -- } else if (nlinks == 0 --#if defined DT_DIR && defined _DIRENT_HAVE_D_TYPE -- || (nostat && -- dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN) --#endif -- ) { -- p->fts_accpath = -- ISSET(FTS_NOCHDIR) ? p->fts_path : p->fts_name; -- p->fts_info = FTS_NSOK; -- } else { -- /* Build a file name for fts_stat to stat. */ -- if (ISSET(FTS_NOCHDIR)) { -- p->fts_accpath = p->fts_path; -- memmove(cp, p->fts_name, p->fts_namelen + 1); -- } else -- p->fts_accpath = p->fts_name; -- /* Stat it. */ -- p->fts_info = fts_stat(sp, p, 0); -- -- /* Decrement link count if applicable. */ -- if (nlinks > 0 && (p->fts_info == FTS_D || -- p->fts_info == FTS_DC || p->fts_info == FTS_DOT)) -- --nlinks; -- } -- -- /* We walk in directory order so "ls -f" doesn't get upset. */ -- p->fts_link = NULL; -- if (head == NULL) -- head = tail = p; -- else { -- tail->fts_link = p; -- tail = p; -- } -- ++nitems; -- } -- if (dirp) -- (void)closedir(dirp); -- -- /* -- * If realloc() changed the address of the path, adjust the -- * addresses for the rest of the tree and the dir list. -- */ -- if (doadjust) -- fts_padjust(sp, head); -- -- /* -- * If not changing directories, reset the path back to original -- * state. -- */ -- if (ISSET(FTS_NOCHDIR)) { -- if (len == sp->fts_pathlen || nitems == 0) -- --cp; -- *cp = '\0'; -- } -- -- /* -- * If descended after called from fts_children or after called from -- * fts_read and nothing found, get back. At the root level we use -- * the saved fd; if one of fts_open()'s arguments is a relative path -- * to an empty directory, we wind up here with no other way back. If -- * can't get back, we're done. -- */ -- if (descend && nitems == 0 && -- (cur->fts_level == FTS_ROOTLEVEL ? -- FCHDIR(sp, sp->fts_rfd) : -- fts_safe_changedir(sp, cur->fts_parent, -1, ".."))) { -- cur->fts_info = FTS_ERR; -- SET(FTS_STOP); -- return (NULL); -- } -- -- /* If didn't find anything, return NULL. */ -- if (!nitems) { -- if (type == BREAD) -- cur->fts_info = FTS_DP; -- return (NULL); -- } -- -- /* Sort the entries. */ -- if (sp->fts_compar && nitems > 1) -- head = fts_sort(sp, head, nitems); -- return (head); --} -- --static u_short --fts_stat(sp, p, follow) -- FTS *sp; -- register FTSENT *p; -- int follow; --{ -- register FTSENT *t; -- register dev_t dev; -- register ino_t ino; -- struct stat *sbp; -- int saved_errno; -- -- /* If user needs stat info, stat buffer already allocated. */ -- sbp = p->fts_statp; -- --#if defined FTS_WHITEOUT && 0 -- /* check for whiteout */ -- if (p->fts_flags & FTS_ISW) { -- if (sbp != &sb) { -- memset(sbp, '\0', sizeof (*sbp)); -- sbp->st_mode = S_IFWHT; -- } -- return (FTS_W); -- } --#endif -- -- /* -- * If doing a logical walk, or application requested FTS_FOLLOW, do -- * a stat(2). If that fails, check for a non-existent symlink. If -- * fail, set the errno from the stat call. -- */ -- if (ISSET(FTS_LOGICAL) || follow) { -- if (stat(p->fts_accpath, sbp)) { -- saved_errno = errno; -- if (!lstat(p->fts_accpath, sbp)) { -- errno = 0; -- return (FTS_SLNONE); -- } -- p->fts_errno = saved_errno; -- goto err; -- } -- } else if (lstat(p->fts_accpath, sbp)) { -- p->fts_errno = errno; --err: memset(sbp, 0, sizeof(struct stat)); -- return (FTS_NS); -- } -- -- if (S_ISDIR(sbp->st_mode)) { -- /* -- * Set the device/inode. Used to find cycles and check for -- * crossing mount points. Also remember the link count, used -- * in fts_build to limit the number of stat calls. It is -- * understood that these fields are only referenced if fts_info -- * is set to FTS_D. -- */ -- dev = p->fts_dev = sbp->st_dev; -- ino = p->fts_ino = sbp->st_ino; -- p->fts_nlink = sbp->st_nlink; -- -- if (ISDOT(p->fts_name)) -- return (FTS_DOT); -- -- /* -- * Cycle detection is done by brute force when the directory -- * is first encountered. If the tree gets deep enough or the -- * number of symbolic links to directories is high enough, -- * something faster might be worthwhile. -- */ -- for (t = p->fts_parent; -- t->fts_level >= FTS_ROOTLEVEL; t = t->fts_parent) -- if (ino == t->fts_ino && dev == t->fts_dev) { -- p->fts_cycle = t; -- return (FTS_DC); -- } -- return (FTS_D); -- } -- if (S_ISLNK(sbp->st_mode)) -- return (FTS_SL); -- if (S_ISREG(sbp->st_mode)) -- return (FTS_F); -- return (FTS_DEFAULT); --} -- --static FTSENT * --fts_sort(sp, head, nitems) -- FTS *sp; -- FTSENT *head; -- register int nitems; --{ -- register FTSENT **ap, *p; -- -- /* -- * Construct an array of pointers to the structures and call qsort(3). -- * Reassemble the array in the order returned by qsort. If unable to -- * sort for memory reasons, return the directory entries in their -- * current order. Allocate enough space for the current needs plus -- * 40 so don't realloc one entry at a time. -- */ -- if (nitems > sp->fts_nitems) { -- struct _ftsent **a; -- -- sp->fts_nitems = nitems + 40; -- if ((a = realloc(sp->fts_array, -- (size_t)(sp->fts_nitems * sizeof(FTSENT *)))) == NULL) { -- free(sp->fts_array); -- sp->fts_array = NULL; -- sp->fts_nitems = 0; -- return (head); -- } -- sp->fts_array = a; -- } -- for (ap = sp->fts_array, p = head; p; p = p->fts_link) -- *ap++ = p; -- qsort((void *)sp->fts_array, nitems, sizeof(FTSENT *), sp->fts_compar); -- for (head = *(ap = sp->fts_array); --nitems; ++ap) -- ap[0]->fts_link = ap[1]; -- ap[0]->fts_link = NULL; -- return (head); --} -- --static FTSENT * --fts_alloc(sp, name, namelen) -- FTS *sp; -- const char *name; -- register int namelen; --{ -- register FTSENT *p; -- size_t len; -- -- /* -- * The file name is a variable length array and no stat structure is -- * necessary if the user has set the nostat bit. Allocate the FTSENT -- * structure, the file name and the stat structure in one chunk, but -- * be careful that the stat structure is reasonably aligned. Since the -- * fts_name field is declared to be of size 1, the fts_name pointer is -- * namelen + 2 before the first possible address of the stat structure. -- */ -- len = sizeof(FTSENT) + namelen; -- len += sizeof(struct stat) + ALIGNBYTES; -- if ((p = malloc(len)) == NULL) -- return (NULL); -- -- /* Copy the name and guarantee NUL termination. */ -- memmove(p->fts_name, name, namelen); -- p->fts_name[namelen] = '\0'; -- -- p->fts_statp = (struct stat *)ALIGN(p->fts_name + namelen + 2); -- p->fts_namelen = namelen; -- p->fts_path = sp->fts_path; -- p->fts_errno = 0; -- p->fts_flags = 0; -- p->fts_instr = FTS_NOINSTR; -- p->fts_number = 0; -- p->fts_pointer = NULL; -- return (p); --} -- --static void --fts_lfree(head) -- register FTSENT *head; --{ -- register FTSENT *p; -- -- /* Free a linked list of structures. */ -- while ((p = head)) { -- head = head->fts_link; -- free(p); -- } --} -- --/* -- * Allow essentially unlimited paths; find, rm, ls should all work on any tree. -- * Most systems will allow creation of paths much longer than MAXPATHLEN, even -- * though the kernel won't resolve them. Add the size (not just what's needed) -- * plus 256 bytes so don't realloc the path 2 bytes at a time. -- */ --static int --fts_palloc(sp, more) -- FTS *sp; -- size_t more; --{ -- char *p; -- -- sp->fts_pathlen += more + 256; -- /* -- * Check for possible wraparound. In an FTS, fts_pathlen is -- * a signed int but in an FTSENT it is an unsigned short. -- * We limit fts_pathlen to USHRT_MAX to be safe in both cases. -- */ -- if (sp->fts_pathlen < 0 || sp->fts_pathlen >= 0x10000) { -- if (sp->fts_path) { -- free(sp->fts_path); -- sp->fts_path = NULL; -- } -- sp->fts_path = NULL; -- errno = ENAMETOOLONG; -- return (1); -- } -- p = realloc(sp->fts_path, sp->fts_pathlen); -- if (p == NULL) { -- free(sp->fts_path); -- sp->fts_path = NULL; -- return 1; -- } -- sp->fts_path = p; -- return 0; --} -- --/* -- * When the path is realloc'd, have to fix all of the pointers in structures -- * already returned. -- */ --static void --fts_padjust(sp, head) -- FTS *sp; -- FTSENT *head; --{ -- FTSENT *p; -- char *addr = sp->fts_path; -- --#define ADJUST(p) do { \ -- if ((p)->fts_accpath != (p)->fts_name) { \ -- (p)->fts_accpath = \ -- (char *)addr + ((p)->fts_accpath - (p)->fts_path); \ -- } \ -- (p)->fts_path = addr; \ --} while (0) -- /* Adjust the current set of children. */ -- for (p = sp->fts_child; p; p = p->fts_link) -- ADJUST(p); -- -- /* Adjust the rest of the tree, including the current level. */ -- for (p = head; p->fts_level >= FTS_ROOTLEVEL;) { -- ADJUST(p); -- p = p->fts_link ? p->fts_link : p->fts_parent; -- } --} -- --static size_t --fts_maxarglen(argv) -- char * const *argv; --{ -- size_t len, max; -- -- for (max = 0; *argv; ++argv) -- if ((len = strlen(*argv)) > max) -- max = len; -- return (max + 1); --} -- --/* -- * Change to dir specified by fd or p->fts_accpath without getting -- * tricked by someone changing the world out from underneath us. -- * Assumes p->fts_dev and p->fts_ino are filled in. -- */ --static int --fts_safe_changedir(sp, p, fd, path) -- FTS *sp; -- FTSENT *p; -- int fd; -- const char *path; --{ -- int ret, oerrno, newfd; -- struct stat sb; -- -- newfd = fd; -- if (ISSET(FTS_NOCHDIR)) -- return (0); -- if (fd < 0 && (newfd = open(path, O_RDONLY, 0)) < 0) -- return (-1); -- if (fstat(newfd, &sb)) { -- ret = -1; -- goto bail; -- } -- if (p->fts_dev != sb.st_dev || p->fts_ino != sb.st_ino) { -- errno = ENOENT; /* disinformation */ -- ret = -1; -- goto bail; -- } -- ret = fchdir(newfd); --bail: -- oerrno = errno; -- if (fd < 0) -- (void)close(newfd); -- errno = oerrno; -- return (ret); --} -diff --git a/lib/fts.h b/lib/fts.h -deleted file mode 100644 -index 58846b9..0000000 ---- a/lib/fts.h -+++ /dev/null -@@ -1,131 +0,0 @@ --/* -- * Copyright (c) 1989, 1993 -- * The Regents of the University of California. 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. -- * 4. Neither the name of the University nor the names of its contributors -- * may be used to endorse or promote products derived from this software -- * without specific prior written permission. -- * -- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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. -- * -- * @(#)fts.h 8.3 (Berkeley) 8/14/94 -- */ -- --#ifndef _FTS_H --#define _FTS_H 1 -- --#include <features.h> --#include <sys/types.h> -- --typedef struct { -- struct _ftsent *fts_cur; /* current node */ -- struct _ftsent *fts_child; /* linked list of children */ -- struct _ftsent **fts_array; /* sort array */ -- dev_t fts_dev; /* starting device # */ -- char *fts_path; /* path for this descent */ -- int fts_rfd; /* fd for root */ -- int fts_pathlen; /* sizeof(path) */ -- int fts_nitems; /* elements in the sort array */ -- int (*fts_compar) (const void *, const void *); /* compare fn */ -- --#define FTS_COMFOLLOW 0x0001 /* follow command line symlinks */ --#define FTS_LOGICAL 0x0002 /* logical walk */ --#define FTS_NOCHDIR 0x0004 /* don't change directories */ --#define FTS_NOSTAT 0x0008 /* don't get stat info */ --#define FTS_PHYSICAL 0x0010 /* physical walk */ --#define FTS_SEEDOT 0x0020 /* return dot and dot-dot */ --#define FTS_XDEV 0x0040 /* don't cross devices */ --#define FTS_WHITEOUT 0x0080 /* return whiteout information */ --#define FTS_OPTIONMASK 0x00ff /* valid user option mask */ -- --#define FTS_NAMEONLY 0x0100 /* (private) child names only */ --#define FTS_STOP 0x0200 /* (private) unrecoverable error */ -- int fts_options; /* fts_open options, global flags */ --} FTS; -- --typedef struct _ftsent { -- struct _ftsent *fts_cycle; /* cycle node */ -- struct _ftsent *fts_parent; /* parent directory */ -- struct _ftsent *fts_link; /* next file in directory */ -- long fts_number; /* local numeric value */ -- void *fts_pointer; /* local address value */ -- char *fts_accpath; /* access path */ -- char *fts_path; /* root path */ -- int fts_errno; /* errno for this node */ -- int fts_symfd; /* fd for symlink */ -- u_short fts_pathlen; /* strlen(fts_path) */ -- u_short fts_namelen; /* strlen(fts_name) */ -- -- ino_t fts_ino; /* inode */ -- dev_t fts_dev; /* device */ -- nlink_t fts_nlink; /* link count */ -- --#define FTS_ROOTPARENTLEVEL -1 --#define FTS_ROOTLEVEL 0 -- short fts_level; /* depth (-1 to N) */ -- --#define FTS_D 1 /* preorder directory */ --#define FTS_DC 2 /* directory that causes cycles */ --#define FTS_DEFAULT 3 /* none of the above */ --#define FTS_DNR 4 /* unreadable directory */ --#define FTS_DOT 5 /* dot or dot-dot */ --#define FTS_DP 6 /* postorder directory */ --#define FTS_ERR 7 /* error; errno is set */ --#define FTS_F 8 /* regular file */ --#define FTS_INIT 9 /* initialized only */ --#define FTS_NS 10 /* stat(2) failed */ --#define FTS_NSOK 11 /* no stat(2) requested */ --#define FTS_SL 12 /* symbolic link */ --#define FTS_SLNONE 13 /* symbolic link without target */ --#define FTS_W 14 /* whiteout object */ -- u_short fts_info; /* user flags for FTSENT structure */ -- --#define FTS_DONTCHDIR 0x01 /* don't chdir .. to the parent */ --#define FTS_SYMFOLLOW 0x02 /* followed a symlink to get here */ -- u_short fts_flags; /* private flags for FTSENT structure */ -- --#define FTS_AGAIN 1 /* read node again */ --#define FTS_FOLLOW 2 /* follow symbolic link */ --#define FTS_NOINSTR 3 /* no instructions */ --#define FTS_SKIP 4 /* discard node */ -- u_short fts_instr; /* fts_set() instructions */ -- -- struct stat *fts_statp; /* stat(2) information */ -- char fts_name[1]; /* file name */ --} FTSENT; -- --__BEGIN_DECLS -- --#define fts_children pax_fts_children --#define fts_close pax_fts_close --#define fts_open pax_fts_open --#define fts_read pax_fts_read --#define fts_set pax_fts_set -- --FTSENT *fts_children (FTS *, int); --int fts_close (FTS *); --FTS *fts_open (char * const *, int, -- int (*)(const FTSENT **, const FTSENT **)); --FTSENT *fts_read (FTS *); --int fts_set (FTS *, FTSENT *, int) __THROW; --__END_DECLS -- --#endif /* fts.h */ -diff --git a/lib/vis.h b/lib/vis.h -index d34d342..71fa5f4 100644 ---- a/lib/vis.h -+++ b/lib/vis.h -@@ -73,14 +73,19 @@ - */ - #define UNVIS_END 1 /* no more characters */ - --#include <sys/cdefs.h> -+#ifndef __P -+#define __P(x) x -+#endif - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - char *vis __P((char *, int, int, int)); - int strvis __P((char *, const char *, int)); - int strvisx __P((char *, const char *, size_t, int)); - int strunvis __P((char *, const char *)); - int unvis __P((char *, char, int *, int)); --__END_DECLS -- -+#ifdef __cplusplus -+} -+#endif - #endif /* !_VIS_H_ */ -diff --git a/src/Makefile.am b/src/Makefile.am -index 5ef52a3..227cdef 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -22,4 +22,4 @@ pax_SOURCES = ar_io.c ar_subs.c buf_subs.c cache.c cpio.c\ - file_subs.c ftree.c gen_subs.c getoldopt.c options.c\ - pat_rep.c pax.c sel_subs.c tables.c tar.c tty_subs.c - --pax_LDADD = $(top_builddir)/lib/libbsdfunc.a -+pax_LDADD = $(top_builddir)/lib/libbsdfunc.a -lfts -diff --git a/src/extern.h b/src/extern.h -index 361fa81..3ed365d 100644 ---- a/src/extern.h -+++ b/src/extern.h -@@ -37,8 +37,6 @@ - * External references from each source file - */ - --#include <sys/cdefs.h> -- - /* - * ar_io.c - */ -diff --git a/src/file_subs.c b/src/file_subs.c -index 5590ff1..15bc339 100644 ---- a/src/file_subs.c -+++ b/src/file_subs.c -@@ -52,7 +52,7 @@ - #include "extern.h" - - static int --mk_link __P((register char *,register struct stat *,register char *, int)); -+mk_link (register char *,register struct stat *,register char *, int); - - /* - * routines that deal with file operations such as: creating, removing; -diff --git a/src/tables.c b/src/tables.c -index 2275bf7..8fddca4 100644 ---- a/src/tables.c -+++ b/src/tables.c -@@ -39,7 +39,7 @@ - #include <sys/time.h> - #include <sys/stat.h> - #include <sys/param.h> --#include <sys/fcntl.h> -+#include <fcntl.h> - #include <stdio.h> - #include <string.h> - #include <unistd.h> --- -2.6.4 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/pax/pax/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch b/import-layers/yocto-poky/meta/recipes-extended/pax/pax/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch deleted file mode 100644 index 1d969bc34..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/pax/pax/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 7f4f379f8343c0ce92aa30f3f9037288a089a902 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 18 Dec 2016 08:24:56 +0000 -Subject: [PATCH] include <sys/sysmacros.h> for major/minor definitions - -glibc 2.25 will error out if the applications are expecting -this to come from sys/types.h, it is being removed from -there. - -Fixes - -error: In the GNU C Library, "minor" is defined -| by <sys/sysmacros.h>. For historical compatibility, it is -| currently defined by <sys/types.h> as well, but we plan to -| remove this soon. To use "minor", include <sys/sysmacros.h> -| directly. If you did not intend to use a system-defined macro -| "minor", you should undefine it after including <sys/types.h>. [-Werror] -| ul_oct ((u_long) MINOR (arcn->sb.st_rdev), hd->devminor, -| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - src/cpio.c | 2 +- - src/gen_subs.c | 2 +- - src/tar.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -Index: pax-3.4/src/cpio.c -=================================================================== ---- pax-3.4.orig/src/cpio.c -+++ pax-3.4/src/cpio.c -@@ -36,6 +36,7 @@ - #include "config.h" - #endif - -+#include <sys/sysmacros.h> - #include <sys/types.h> - #include <sys/time.h> - #include <sys/stat.h> -Index: pax-3.4/src/gen_subs.c -=================================================================== ---- pax-3.4.orig/src/gen_subs.c -+++ pax-3.4/src/gen_subs.c -@@ -37,6 +37,7 @@ - #include "config.h" - #endif - -+#include <sys/sysmacros.h> - #include <sys/types.h> - #include <sys/time.h> - #include <sys/stat.h> -Index: pax-3.4/src/tar.c -=================================================================== ---- pax-3.4.orig/src/tar.c -+++ pax-3.4/src/tar.c -@@ -37,6 +37,7 @@ - #include "config.h" - #endif - -+#include <sys/sysmacros.h> - #include <sys/types.h> - #include <sys/time.h> - #include <sys/stat.h> diff --git a/import-layers/yocto-poky/meta/recipes-extended/pax/pax/0001-use-strtoll-instead-of-strtoq.patch b/import-layers/yocto-poky/meta/recipes-extended/pax/pax/0001-use-strtoll-instead-of-strtoq.patch deleted file mode 100644 index 58ac9ce4a..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/pax/pax/0001-use-strtoll-instead-of-strtoq.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b1f50320332c9c90fa33ab136ef0ec2d12cda461 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 6 Jan 2016 12:30:52 -0800 -Subject: [PATCH] use strtoll instead of strtoq - -Use LLONG_MAX instead of LONG_LONG_MAX -LONG_LONG_MAX is GNU specific - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - src/options.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/options.c b/src/options.c -index da8b4cf..c663b4e 100644 ---- a/src/options.c -+++ b/src/options.c -@@ -1547,8 +1547,8 @@ str_offt (char *val) - - #if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \ - || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) -- num = strtoq (val, &expr, 0); -- if ((num == LONG_LONG_MAX) || (num <= 0) || (expr == val)) -+ num = strtoll (val, &expr, 0); -+ if ((num == LLONG_MAX) || (num <= 0) || (expr == val)) - #else - num = strtol (val, &expr, 0); - if ((num == LONG_MAX) || (num <= 0) || (expr == val)) --- -2.6.4 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/pax/pax/fix_for_compile_with_gcc-4.6.0.patch b/import-layers/yocto-poky/meta/recipes-extended/pax/pax/fix_for_compile_with_gcc-4.6.0.patch deleted file mode 100644 index 88779c3bb..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/pax/pax/fix_for_compile_with_gcc-4.6.0.patch +++ /dev/null @@ -1,25 +0,0 @@ -Upstream-Status: Pending - -This patch fixes this compiler error with gcc 4.6.0 - -Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/08 - -| fts.c: In function 'pax_fts_set': -| fts.c:469:7: error: parameter 'sp' set but not used [-Werror=unused-but-set-parameter] -| cc1: all warnings being treated as errors -| -| make[2]: *** [fts.o] Error 1 - -Index: pax-3.4/lib/fts.c -=================================================================== ---- pax-3.4.orig/lib/fts.c -+++ pax-3.4/lib/fts.c -@@ -466,7 +466,7 @@ name: t = sp->fts_path + NAPPEND(p->fts - /* ARGSUSED */ - int - fts_set(sp, p, instr) -- FTS *sp; -+ FTS __attribute__((__unused__)) *sp; - FTSENT *p; - int instr; - { diff --git a/import-layers/yocto-poky/meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch b/import-layers/yocto-poky/meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch deleted file mode 100644 index 7adbd0297..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch +++ /dev/null @@ -1,185 +0,0 @@ -Upstream-Status: Pending - -Author: H.J. Lu <hjl.tools@gmail.com> -Date: Tue Dec 6 10:34:53 2011 -0800 - - Fix pax-3.4 build for x32 - - off_t is 8byte for x32. We need to check both _FILE_OFFSET_BITS and - size of off_t to see if file offset is 64bit. This patch adds - AC_CHECK_SIZEOF(off_t) and checks SIZEOF_OFF_T == 8. - -Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/06 - -Index: pax-3.4/configure.in -=================================================================== ---- pax-3.4.orig/configure.in -+++ pax-3.4/configure.in -@@ -33,4 +33,7 @@ dnl Checks for header files. - dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST - -+AC_CHECK_SIZEOF(off_t) -+AC_CHECK_SIZEOF(long) -+ - AC_OUTPUT([Makefile lib/Makefile src/Makefile]) -Index: pax-3.4/src/ar_io.c -=================================================================== ---- pax-3.4.orig/src/ar_io.c -+++ pax-3.4/src/ar_io.c -@@ -378,7 +378,8 @@ ar_close(void) - * could have written anything yet. - */ - if (frmt == NULL) { --#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 -+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \ -+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) - (void)fprintf(listf, "%s: unknown format, %qu bytes skipped.\n", - #else - (void)fprintf(listf, "%s: unknown format, %lu bytes skipped.\n", -@@ -391,7 +392,8 @@ ar_close(void) - - if (strcmp(NM_CPIO, argv0) == 0) - (void)fprintf(listf, --#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 -+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \ -+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) - "%qu blocks\n", - #else - "%lu blocks\n", -@@ -399,7 +401,8 @@ ar_close(void) - (rdcnt ? rdcnt : wrcnt) / 5120); - else if (strcmp(NM_TAR, argv0) != 0) - (void)fprintf(listf, --#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 -+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \ -+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) - "%s: %s vol %d, %lu files, %qu bytes read, %qu bytes written.\n", - #else - "%s: %s vol %d, %lu files, %lu bytes read, %lu bytes written.\n", -Index: pax-3.4/src/cpio.c -=================================================================== ---- pax-3.4.orig/src/cpio.c -+++ pax-3.4/src/cpio.c -@@ -218,7 +218,8 @@ rd_ln_nm (ARCHD *arcn) - */ - if ((arcn->sb.st_size == 0) || - (arcn->sb.st_size >= (off_t) sizeof(arcn->ln_name))) { --#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 -+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \ -+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) - paxwarn (1, "Cpio link name length is invalid: %qu", - arcn->sb.st_size); - #else -Index: pax-3.4/src/gen_subs.c -=================================================================== ---- pax-3.4.orig/src/gen_subs.c -+++ pax-3.4/src/gen_subs.c -@@ -133,7 +133,8 @@ ls_list (ARCHD *arcn, time_t now, FILE * - * print device id's for devices, or sizes for other nodes - */ - if ((arcn->type == PAX_CHR) || (arcn->type == PAX_BLK)) --#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 -+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \ -+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) - (void) fprintf (fp, "%4lu,%4lu ", (unsigned long) MAJOR (sbp->st_rdev), - (unsigned long) MINOR (sbp->st_rdev)); - #else -@@ -142,7 +143,8 @@ ls_list (ARCHD *arcn, time_t now, FILE * - #endif - else - { --#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 -+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \ -+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) - (void) fprintf (fp, "%9qu ", sbp->st_size); - #else - (void) fprintf (fp, "%9lu ", sbp->st_size); -@@ -334,7 +336,8 @@ ul_asc (u_long val, char *str, int len, - return (0); - } - --#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 -+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \ -+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) - /* - * asc_uqd() - * convert hex/octal character string into a u_quad_t. We do not have to -Index: pax-3.4/src/options.c -=================================================================== ---- pax-3.4.orig/src/options.c -+++ pax-3.4/src/options.c -@@ -1545,7 +1545,8 @@ str_offt (char *val) - char *expr; - off_t num, t; - --#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 -+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \ -+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) - num = strtoq (val, &expr, 0); - if ((num == LONG_LONG_MAX) || (num <= 0) || (expr == val)) - #else -Index: pax-3.4/src/tar.c -=================================================================== ---- pax-3.4.orig/src/tar.c -+++ pax-3.4/src/tar.c -@@ -58,7 +58,8 @@ - static unsigned long tar_chksm (char *, int); - static char *name_split (char *, int); - static int ul_oct (u_long, char *, int, int); --#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 -+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \ -+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) - static int uqd_oct (u_quad_t, char *, int, int); - #endif - -@@ -196,7 +197,8 @@ ul_oct (u_long val, register char *str, - return (0); - } - --#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 -+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \ -+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) - /* - * uqd_oct() - * convert an u_quad_t to an octal string. one of many oddball field -@@ -427,7 +429,8 @@ tar_rd (ARCHD *arcn, char *buf) - 0xfff); - arcn->sb.st_uid = (uid_t) asc_ul (hd->uid, sizeof (hd->uid), OCT); - arcn->sb.st_gid = (gid_t) asc_ul (hd->gid, sizeof (hd->gid), OCT); --#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 -+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \ -+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) - arcn->sb.st_size = (off_t) asc_uqd (hd->size, sizeof (hd->size), OCT); - #else - arcn->sb.st_size = (off_t) asc_ul (hd->size, sizeof (hd->size), OCT); -@@ -659,7 +662,8 @@ tar_wr (register ARCHD * arcn) - * data follows this file, so set the pad - */ - hd->linkflag = AREGTYPE; --#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 -+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \ -+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) - if (uqd_oct ((u_quad_t) arcn->sb.st_size, hd->size, - sizeof (hd->size), 1)) - #else -@@ -834,7 +838,8 @@ ustar_rd (ARCHD *arcn, char *buf) - */ - arcn->sb.st_mode = (mode_t) (asc_ul (hd->mode, sizeof (hd->mode), OCT) & - 0xfff); --#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 -+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \ -+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) - arcn->sb.st_size = (off_t) asc_uqd (hd->size, sizeof (hd->size), OCT); - #else - arcn->sb.st_size = (off_t) asc_ul (hd->size, sizeof (hd->size), OCT); -@@ -1081,7 +1086,8 @@ ustar_wr (register ARCHD * arcn) - else - hd->typeflag = REGTYPE; - arcn->pad = TAR_PAD (arcn->sb.st_size); --#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 -+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \ -+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) - if (uqd_oct ((u_quad_t) arcn->sb.st_size, hd->size, - sizeof (hd->size), 3)) - { diff --git a/import-layers/yocto-poky/meta/recipes-extended/pax/pax_3.4.bb b/import-layers/yocto-poky/meta/recipes-extended/pax/pax_3.4.bb deleted file mode 100644 index 6df9a8186..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/pax/pax_3.4.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Portable Archive eXchange" -DESCRIPTION = "pax (Portable Archive eXchange) is the POSIX standard archive tool" -HOMEPAGE = "http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/bin/pax/" -BUGTRACKER = "http://www.openbsd.org/query-pr.html" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=4b0b674dfdc56daa3832d4069b820ea0 \ - file://src/pax.h;endline=40;md5=309d3e241c1d82069228e5a51e9b8d60 \ - file://src/cpio.h;endline=40;md5=c3b4bbff6133a83387968617bbae8ac4 \ - file://lib/vis.h;endline=40;md5=b283f759abd4a5ad7e014b80f51fc053" - -SECTION = "base" -PR = "r2" - -DEPENDS_append_libc-musl = " fts " - -SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.tar.bz2/fbd9023b590b45ac3ade95870702a0d6/${BP}.tar.bz2 \ - file://fix_for_compile_with_gcc-4.6.0.patch \ - file://pax-3.4_fix_for_x32.patch \ - file://0001-include-sys-sysmacros.h-for-major-minor-definitions.patch \ - file://0001-Add-a-comment-for-fallthrough.patch \ - " - -SRC_URI_append_libc-musl = " file://0001-Fix-build-with-musl.patch \ - file://0001-use-strtoll-instead-of-strtoq.patch \ - " - -SRC_URI[md5sum] = "fbd9023b590b45ac3ade95870702a0d6" -SRC_URI[sha256sum] = "ac3c06048e02828077cf7757d3d142241429238893b91d529af29a2e8cc5623b" - -inherit autotools diff --git a/import-layers/yocto-poky/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb b/import-layers/yocto-poky/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb index 170e7ecde..644d8208e 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb @@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "74a4a78ae0c5e973100ac0a8f203a110f76fb047b79dae4fc1fd7d6814 S = "${WORKDIR}/Convert-ASN1-${PV}" -inherit cpan +inherit cpan ptest-perl EXTRA_PERLFLAGS = "-I ${PERLHOSTLIB}" diff --git a/import-layers/yocto-poky/meta/recipes-extended/perl/libtimedate-perl_2.30.bb b/import-layers/yocto-poky/meta/recipes-extended/perl/libtimedate-perl_2.30.bb index 427613c10..8e1461ceb 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/perl/libtimedate-perl_2.30.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/perl/libtimedate-perl_2.30.bb @@ -9,7 +9,7 @@ SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/TimeDate-${PV}.tar. S = "${WORKDIR}/TimeDate-${PV}" -inherit cpan +inherit cpan ptest-perl BBCLASSEXTEND = "native" diff --git a/import-layers/yocto-poky/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.12.bb b/import-layers/yocto-poky/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.12.bb index 3498a286d..fa9f9954b 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.12.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.12.bb @@ -6,18 +6,22 @@ DESCRIPTION = "XML::NamespaceSupport offers a simple way to process namespace-ba SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0+" -PR = "r3" -LIC_FILES_CHKSUM = "file://META.yml;beginline=22;endline=22;md5=9ca1a4a941496e7feedac72c4fb8b137" +SRCNAME = "XML-NamespaceSupport" -SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-${PV}.tar.gz" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c9d8a117e7620b5adf8d69c29613ceab" + +SRC_URI = "${CPAN_MIRROR}/authors/id/P/PE/PERIGRIN/${SRCNAME}-${PV}.tar.gz" SRC_URI[md5sum] = "a8916c6d095bcf073e1108af02e78c97" SRC_URI[sha256sum] = "47e995859f8dd0413aa3f22d350c4a62da652e854267aa0586ae544ae2bae5ef" +UPSTREAM_CHECK_REGEX = "XML\-NamespaceSupport\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" + +S = "${WORKDIR}/${SRCNAME}-${PV}" -S = "${WORKDIR}/XML-NamespaceSupport-${PV}" +inherit cpan ptest-perl -inherit cpan +RDEPENDS_${PN}-ptest += "perl-module-test-more" BBCLASSEXTEND="native" diff --git a/import-layers/yocto-poky/meta/recipes-extended/perl/libxml-sax-base-perl_1.09.bb b/import-layers/yocto-poky/meta/recipes-extended/perl/libxml-sax-base-perl_1.09.bb index cd3a5806b..b3e01e9ac 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/perl/libxml-sax-base-perl_1.09.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/perl/libxml-sax-base-perl_1.09.bb @@ -19,6 +19,6 @@ SRC_URI[sha256sum] = "66cb355ba4ef47c10ca738bd35999723644386ac853abbeb5132841f5e S = "${WORKDIR}/XML-SAX-Base-${PV}" -inherit cpan +inherit cpan ptest-perl BBCLASSEXTEND = "native" diff --git a/import-layers/yocto-poky/meta/recipes-extended/perl/libxml-sax-perl_0.99.bb b/import-layers/yocto-poky/meta/recipes-extended/perl/libxml-sax-perl_0.99.bb index ad31b9c9d..cdcbebffc 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/perl/libxml-sax-perl_0.99.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/perl/libxml-sax-perl_0.99.bb @@ -23,6 +23,11 @@ SRC_URI[sha256sum] = "32b04b8e36b6cc4cfc486de2d859d87af5386dd930f2383c49347050d6 S = "${WORKDIR}/XML-SAX-${PV}" -inherit cpan +inherit cpan ptest-perl + +do_install_ptest() { + cp -r ${B}/testfiles ${D}${PTEST_PATH} + chown -R root:root ${D}${PTEST_PATH}/testfiles +} BBCLASSEXTEND = "native" diff --git a/import-layers/yocto-poky/meta/recipes-extended/pigz/pigz_2.3.4.bb b/import-layers/yocto-poky/meta/recipes-extended/pigz/pigz_2.3.4.bb deleted file mode 100644 index f4832dffe..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/pigz/pigz_2.3.4.bb +++ /dev/null @@ -1,11 +0,0 @@ -require pigz.inc -LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95" - -UPSTREAM_CHECK_URI = "http://zlib.net/${BPN}/" -UPSTREAM_CHECK_REGEX = "pigz-(?P<pver>.*)\.tar" -SRC_URI = "https://github.com/madler/pigz/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz" -SRC_URI[md5sum] = "c109057050b15edf3eb9bb4d0805235e" -SRC_URI[sha256sum] = "763f2fdb203aa0b7b640e63385e38e5dd4e5aaa041bc8e42aa96f2ef156b06e8" - -BBCLASSEXTEND = "native nativesdk" - diff --git a/import-layers/yocto-poky/meta/recipes-extended/pigz/pigz.inc b/import-layers/yocto-poky/meta/recipes-extended/pigz/pigz_2.4.bb index 978f90532..6e6da9c3c 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/pigz/pigz.inc +++ b/import-layers/yocto-poky/meta/recipes-extended/pigz/pigz_2.4.bb @@ -6,16 +6,20 @@ Adler, and uses the zlib and pthread libraries." HOMEPAGE = "http://zlib.net/pigz/" SECTION = "console/utils" LICENSE = "Zlib & Apache-2.0" +LIC_FILES_CHKSUM = "file://pigz.c;md5=9ae6dee8ceba9610596ed0ada493d142;beginline=7;endline=21" -PROVIDES_class-native += "gzip-native" +SRC_URI = "http://zlib.net/${BPN}/fossils/${BP}.tar.gz" +SRC_URI[md5sum] = "def2f6e19d9d8231445adc1349d346df" +SRC_URI[sha256sum] = "a4f816222a7b4269bd232680590b579ccc72591f1bb5adafcd7208ca77e14f73" +# Point this at the homepage in case /fossils/ isn't updated +UPSTREAM_CHECK_URI = "http://zlib.net/${BPN}/" +UPSTREAM_CHECK_REGEX = "pigz-(?P<pver>.*)\.tar" DEPENDS = "zlib" EXTRA_OEMAKE = "-e MAKEFLAGS=" -inherit update-alternatives - -do_install_class-target() { +do_install() { # Install files into /bin (FHS), which is typical place for gzip install -d ${D}${base_bindir} install ${B}/pigz ${D}${base_bindir}/pigz @@ -23,17 +27,4 @@ do_install_class-target() { ln -nsf pigz ${D}${base_bindir}/pigzcat } -do_install() { - install -d ${D}${bindir} - install ${B}/pigz ${D}${bindir}/gzip - ln -nsf gzip ${D}${bindir}/gunzip - ln -nsf gzip ${D}${bindir}/zcat -} - -ALTERNATIVE_PRIORITY = "80" -ALTERNATIVE_${PN} = "gunzip gzip zcat" -ALTERNATIVE_${PN}_class-nativesdk = "" -ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip" -ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip" -ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat" -ALTERNATIVE_TARGET = "${base_bindir}/pigz" +BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-extended/procps/procps_3.3.12.bb b/import-layers/yocto-poky/meta/recipes-extended/procps/procps_3.3.12.bb index adabd7576..ecf215fec 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/procps/procps_3.3.12.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/procps/procps_3.3.12.bb @@ -1,7 +1,7 @@ SUMMARY = "System and process monitoring utilities" DESCRIPTION = "Procps contains a set of system utilities that provide system information about processes using \ the /proc filesystem. The package includes the programs ps, top, vmstat, w, kill, and skill." -HOMEPAGE = "https://gitorious.org/procps" +HOMEPAGE = "https://gitlab.com/procps-ng/procps" SECTION = "base" LICENSE = "GPLv2+ & LGPLv2+" LIC_FILES_CHKSUM="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ @@ -23,8 +23,6 @@ S = "${WORKDIR}/procps-ng-${PV}" EXTRA_OECONF = "--enable-skill --disable-modern-top" -CPPFLAGS += "-I${S}" - do_install_append () { install -d ${D}${base_bindir} [ "${bindir}" != "${base_bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i; done @@ -44,7 +42,7 @@ do_install_append () { CONFFILES_${PN} = "${sysconfdir}/sysctl.conf" -bindir_progs = "free pkill pmap pgrep pwdx skill snice top uptime" +bindir_progs = "free pkill pmap pgrep pwdx skill snice top uptime w" base_bindir_progs += "kill pidof ps watch" base_sbindir_progs += "sysctl" diff --git a/import-layers/yocto-poky/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch b/import-layers/yocto-poky/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch deleted file mode 100644 index e57d60f6a..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001 -From: Brad Jorsch <anomie@users.sourceforge.net> -Date: Fri, 28 Feb 2014 21:55:02 +1100 -Subject: [PATCH] Typo in fuser makes -M on all the time - -Brad found that fuser had the -M option on all the time. -A simple but significant typo caused this, thanks the the patch. - -Bug-Debian: http://bugs.debian.org/740275 - -Upstream-Status: Backport - -Signed-off-by: Craig Small <csmall@enc.com.au> ---- - ChangeLog | 4 ++++ - src/fuser.c | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index fd1cccf..e5f784c 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,7 @@ -+Changes in 22.22 -+================ -+ * Fixed typo in fuser which has -M on Debian #740275 -+ - Changes in 22.21 - ================ - * Missing comma in fuser(1) added Debian #702391 -diff --git a/src/fuser.c b/src/fuser.c -index b485f65..389b302 100644 ---- a/src/fuser.c -+++ b/src/fuser.c -@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[]) - usage(_("No process specification given")); - - /* Check if -M flag was used and if so check mounts */ -- if (opts * OPT_ISMOUNTPOINT) { -+ if (opts & OPT_ISMOUNTPOINT) { - check_mountpoints(&mounts, &names_head, &names_tail); - } - --- -1.8.4.2 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch b/import-layers/yocto-poky/meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch deleted file mode 100644 index c8afcac8a..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch +++ /dev/null @@ -1,29 +0,0 @@ -From aa66afecd8ba9cc4139f25ab15ec315173413a7d Mon Sep 17 00:00:00 2001 -From: Paul Barker <paul@paulbarker.me.uk> -Date: Wed, 20 Aug 2014 10:31:37 +0000 -Subject: [PATCH] Include <limits.h> for PATH_MAX - -When building against musl libc, PATH_MAX is defined in <limits.h>. - -Signed-off-by: Paul Barker <paul@paulbarker.me.uk> - -Upstream-Status: Accepted (Should be in next release after 22.21) ---- - src/pstree.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/pstree.c b/src/pstree.c -index 071e6c4..0d28260 100644 ---- a/src/pstree.c -+++ b/src/pstree.c -@@ -41,6 +41,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/ioctl.h> -+#include <limits.h> - - #include "i18n.h" - #include "comm.h" --- -2.0.4 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/psmisc/psmisc.inc b/import-layers/yocto-poky/meta/recipes-extended/psmisc/psmisc.inc index 66a784b53..82ef94770 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/psmisc/psmisc.inc +++ b/import-layers/yocto-poky/meta/recipes-extended/psmisc/psmisc.inc @@ -16,6 +16,15 @@ S = "${WORKDIR}/psmisc-${PV}" 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 ) +} + + PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/import-layers/yocto-poky/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch b/import-layers/yocto-poky/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch new file mode 100644 index 000000000..4d44495fd --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch @@ -0,0 +1,30 @@ +From 285877b7761d74736aca2687ed9bef2f78b82c33 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Thu, 2 Nov 2017 16:21:22 +0200 +Subject: [PATCH] Makefile.am: create src directory before attempting to write + there + +Otherwise out of tree builds will fail. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 9f61ab4..b4ced7f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -79,7 +79,7 @@ EXTRA_DIST = src/signames.c README.md + CLEANFILES = src/signames.h + + src/signames.h: src/signames.c Makefile +- export LC_ALL=C ; \ ++ export LC_ALL=C ; mkdir -p src ; \ + @CPP@ -dM $< |\ + tr -s '\t ' ' ' | sort -n -k 3 | sed \ + 's:#define SIG\([A-Z][A-Z]*[0-9]*\) \([0-9][0-9]*\).*$\:{\ \2,"\1" },:p;d' | \ +-- +2.14.2 + diff --git a/import-layers/yocto-poky/meta/recipes-extended/psmisc/psmisc_22.21.bb b/import-layers/yocto-poky/meta/recipes-extended/psmisc/psmisc_22.21.bb deleted file mode 100644 index 1c6473ebf..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/psmisc/psmisc_22.21.bb +++ /dev/null @@ -1,12 +0,0 @@ -require psmisc.inc -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" - -SRC_URI[md5sum] = "935c0fd6eb208288262b385fa656f1bf" -SRC_URI[sha256sum] = "97323cad619210845b696d7d722c383852b2acb5c49b5b0852c4f29c77a8145a" - -SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \ - file://0001-Typo-in-fuser-makes-M-on-all-the-time.patch \ - file://0002-Include-limits.h-for-PATH_MAX.patch \ - file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \ - " diff --git a/import-layers/yocto-poky/meta/recipes-extended/psmisc/psmisc_23.0.bb b/import-layers/yocto-poky/meta/recipes-extended/psmisc/psmisc_23.0.bb new file mode 100644 index 000000000..2b07f4974 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/psmisc/psmisc_23.0.bb @@ -0,0 +1,10 @@ +require psmisc.inc +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" + +SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https \ + file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \ + file://0001-Makefile.am-create-src-directory-before-attempting-t.patch \ + " +SRCREV = "67b1da268f4c0ce6859980e3dfcfaec5b2448e80" +S = "${WORKDIR}/git" diff --git a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch b/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch deleted file mode 100644 index 6add4708a..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 776757a23e9930588950c7fcbc7827ec7a3e51c4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com> -Date: Mon, 4 Jan 2016 15:48:19 +0100 -Subject: [PATCH] Do not accidentaly override commandline passed CFLAGS. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Backport - -Signed-off-by: Tomáš Chvátal <tchvatal@suse.com> -Signed-off-by: Jan Kara <jack@suse.cz> -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3ba1386..1552c15 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -53,7 +53,7 @@ AS_IF([test "x${prefix}" = "xNONE"], [ - # ================ - # Check for cflags - # ================ --CFLAGS="-D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" -+CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" - AC_ARG_ENABLE([werror], - [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])], - [enable_werror="$enableval"], --- -2.4.0 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0001-Fix-build-with-disabled-ldap.patch b/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0001-Fix-build-with-disabled-ldap.patch deleted file mode 100644 index a79e47796..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0001-Fix-build-with-disabled-ldap.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 39fd30ce57e3c34c3649866bf9345a71f0b78667 Mon Sep 17 00:00:00 2001 -From: Jan Kara <jack@suse.cz> -Date: Mon, 4 Jan 2016 15:10:53 +0100 -Subject: [PATCH] Fix build with disabled ldap - -Upstream-Status: Backport - -Reported-by: Tomas Chvatal <tchvatal@suse.com> -Signed-off-by: Jan Kara <jack@suse.cz> -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - warnquota.c | 36 ++++++++++++++++++------------------ - 1 file changed, 18 insertions(+), 18 deletions(-) - -diff --git a/warnquota.c b/warnquota.c -index 3734f0e..e9868c1 100644 ---- a/warnquota.c -+++ b/warnquota.c -@@ -109,13 +109,13 @@ struct configparams { - char *user_signature; - char *group_message; - char *group_signature; -+ time_t cc_before; -+#ifdef USE_LDAP_MAIL_LOOKUP - int use_ldap_mail; /* 0 */ -+ int ldap_is_setup; /* 0 */ - int ldap_starttls; /* 0 */ - int ldap_tls; /* LDAP_OPT_X_TLS_NEVER */ - int ldap_vers; /* LDAP_VERSION3 */ -- time_t cc_before; --#ifdef USE_LDAP_MAIL_LOOKUP -- int ldap_is_setup; /* 0 */ - char ldap_host[CNF_BUFFER]; - int ldap_port; - char ldap_uri[CNF_BUFFER]; -@@ -729,13 +729,13 @@ static int readconfigfile(const char *filename, struct configparams *config) - } - maildev[0] = 0; - config->user_signature = config->user_message = config->group_signature = config->group_message = NULL; -+ config->cc_before = -1; -+ -+#ifdef USE_LDAP_MAIL_LOOKUP - config->use_ldap_mail = 0; - config->ldap_starttls = 0; - config->ldap_tls = LDAP_OPT_X_TLS_NEVER; - config->ldap_vers = LDAP_VERSION3; -- config->cc_before = -1; -- --#ifdef USE_LDAP_MAIL_LOOKUP - config->ldap_port = config->ldap_is_setup = 0; - config->ldap_host[0] = 0; - config->ldap_uri[0] = 0; -@@ -820,6 +820,18 @@ static int readconfigfile(const char *filename, struct configparams *config) - create_eoln(config->group_signature); - verify_format(config->group_signature, "GROUP_SIGNATURE"); - } -+ else if (!strcmp(var, "CC_BEFORE")) { -+ int num; -+ char unit[10]; -+ -+ if (sscanf(value, "%d%s", &num, unit) != 2) -+ goto cc_parse_err; -+ if (str2timeunits(num, unit, &config->cc_before) < 0) { -+cc_parse_err: -+ die(1, _("Cannot parse time at CC_BEFORE variable (line %d).\n"), line); -+ } -+ } -+#ifdef USE_LDAP_MAIL_LOOKUP - else if (!strcmp(var, "LDAP_MAIL")) { - if(strcasecmp(value, "true") == 0) - config->use_ldap_mail = 1; -@@ -846,18 +858,6 @@ static int readconfigfile(const char *filename, struct configparams *config) - else - config->ldap_starttls = 0; - } -- else if (!strcmp(var, "CC_BEFORE")) { -- int num; -- char unit[10]; -- -- if (sscanf(value, "%d%s", &num, unit) != 2) -- goto cc_parse_err; -- if (str2timeunits(num, unit, &config->cc_before) < 0) { --cc_parse_err: -- die(1, _("Cannot parse time at CC_BEFORE variable (line %d).\n"), line); -- } -- } --#ifdef USE_LDAP_MAIL_LOOKUP - else if (!strcmp(var, "LDAP_HOST")) - sstrncpy(config->ldap_host, value, CNF_BUFFER); - else if (!strcmp(var, "LDAP_PORT")) --- -2.4.0 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0001-Use-NGROUPS_MAX-instead-of-NGROUPS.patch b/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0001-Use-NGROUPS_MAX-instead-of-NGROUPS.patch deleted file mode 100644 index 6fb2daf53..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0001-Use-NGROUPS_MAX-instead-of-NGROUPS.patch +++ /dev/null @@ -1,83 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -From feca6d2e55d992bbe176ee8faa734c105eb1b2e1 Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o <tytso@mit.edu> -Date: Tue, 29 Mar 2016 20:48:05 -0400 -Subject: [PATCH] Use NGROUPS_MAX instead of NGROUPS - -NGRROUPS_MAX is what is defined by SuSv3; NGROUPS is not guaranteed by -any standard, but is just an ancient BSD'ism. Since Android's bionic -libc has the former but not the latter, let's use NGROUPS_MAX instead. - -Signed-off-by: Theodore Ts'o <tytso@mit.edu> -Signed-off-by: Jan Kara <jack@suse.cz> ---- - quota.c | 5 +++-- - quotaops.c | 5 +++-- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/quota.c b/quota.c -index 049dac4..e195ead 100644 ---- a/quota.c -+++ b/quota.c -@@ -48,6 +48,7 @@ - #include <errno.h> - #include <string.h> - #include <unistd.h> -+#include <limits.h> - #ifdef RPC - #include <rpc/rpc.h> - #include "rquota.h" -@@ -296,7 +297,7 @@ static int showquotas(int type, qid_t id, int mntcnt, char **mnt) - int main(int argc, char **argv) - { - int ngroups; -- gid_t gidset[NGROUPS], *gidsetp; -+ gid_t gidset[NGROUPS_MAX], *gidsetp; - int i, ret; - struct option long_opts[] = { - { "help", 0, NULL, 'h' }, -@@ -405,7 +406,7 @@ int main(int argc, char **argv) - ret |= showquotas(USRQUOTA, getuid(), argc, argv); - if (flags & FL_GROUP) { - ngroups = sysconf(_SC_NGROUPS_MAX); -- if (ngroups > NGROUPS) { -+ if (ngroups > NGROUPS_MAX) { - gidsetp = malloc(ngroups * sizeof(gid_t)); - if (!gidsetp) - die(1, _("Gid set allocation (%d): %s\n"), ngroups, strerror(errno)); -diff --git a/quotaops.c b/quotaops.c -index 136aec3..590dc1b 100644 ---- a/quotaops.c -+++ b/quotaops.c -@@ -51,6 +51,7 @@ - #include <unistd.h> - #include <time.h> - #include <ctype.h> -+#include <limits.h> - - #if defined(RPC) - #include "rquota.h" -@@ -97,7 +98,7 @@ struct dquot *getprivs(qid_t id, struct quota_handle **handles, int quiet) - #if defined(BSD_BEHAVIOUR) - int j, ngroups; - uid_t euid; -- gid_t gidset[NGROUPS], *gidsetp; -+ gid_t gidset[NGROUPS_MAX], *gidsetp; - #endif - - for (i = 0; handles[i]; i++) { -@@ -115,7 +116,7 @@ struct dquot *getprivs(qid_t id, struct quota_handle **handles, int quiet) - if (geteuid() == 0) - break; - ngroups = sysconf(_SC_NGROUPS_MAX); -- if (ngroups > NGROUPS) { -+ if (ngroups > NGROUPS_MAX) { - gidsetp = malloc(ngroups * sizeof(gid_t)); - if (!gidsetp) { - gid2group(id, name); --- -2.6.1 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0002-Allow-building-on-systems-that-do-not-have-rpc-heade.patch b/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0002-Allow-building-on-systems-that-do-not-have-rpc-heade.patch deleted file mode 100644 index 6cea548ed..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0002-Allow-building-on-systems-that-do-not-have-rpc-heade.patch +++ /dev/null @@ -1,153 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -From f30e1ada8326463cc0af048afa058bc2f1dc9370 Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o <tytso@mit.edu> -Date: Tue, 29 Mar 2016 20:48:04 -0400 -Subject: [PATCH] Allow building on systems that do not have rpc header files - -Android's bionic C library doesn't have Sun RPC support. - -Signed-off-by: Theodore Ts'o <tytso@mit.edu> -Signed-off-by: Jan Kara <jack@suse.cz> ---- - Makefile.am | 30 ++++++++++++++++-------------- - quotaops.c | 2 ++ - setquota.c | 2 ++ - 3 files changed, 20 insertions(+), 14 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 6d7ea0e..82db99f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,7 +1,5 @@ - ACLOCAL_AMFLAGS = -I m4 - --BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c -- - docdir = $(datadir)/doc/@PACKAGE@ - doc_DATA = \ - README.mailserver \ -@@ -12,11 +10,6 @@ doc_DATA = \ - doc/quotas.preformated \ - doc/quotas-1.eps - --rpcsvcdir = $(includedir)/rpcsvc --rpcsvc_DATA = \ -- rquota.h \ -- rquota.x -- - sysconf_DATA = \ - warnquota.conf \ - quotatab \ -@@ -35,15 +28,12 @@ man_MANS = \ - quota.1 \ - quot.8 \ - repquota.8 \ -- rpc.rquotad.8 \ - rquota.3 \ - setquota.8 \ - warnquota.conf.5 \ - warnquota.8 \ - xqmstats.8 - --CLEANFILES = rquota.c rquota.h rquota_clnt.c -- - SUBDIRS = po - - EXTRA_DIST = \ -@@ -55,9 +45,15 @@ EXTRA_DIST = \ - Changelog \ - ldap-scripts - --noinst_LIBRARIES = \ -- libquota.a \ -- librpcclient.a -+noinst_LIBRARIES = libquota.a -+ -+if WITH_RPC -+rpcsvcdir = $(includedir)/rpcsvc -+rpcsvc_DATA = \ -+ rquota.h \ -+ rquota.x -+ -+noinst_LIBRARIES += librpcclient.a - - librpcclient_a_SOURCES = \ - rquota.c \ -@@ -67,8 +63,10 @@ librpcclient_a_SOURCES = \ - rquota_clnt.c - librpcclient_a_CFLAGS = -Wno-unused - --if WITH_RPC - RPCLIBS = librpcclient.a -+BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c -+CLEANFILES = rquota.c rquota.h rquota_clnt.c -+man_MANS += rpc.rquotad.8 - endif - - libquota_a_SOURCES = \ -@@ -217,6 +215,7 @@ convertquota_LDADD = \ - libquota.a \ - $(RPCLIBS) - -+if WITH_RPC - rpc_rquotad_SOURCES = \ - rquota_server.c \ - rquota_svc.c \ -@@ -225,6 +224,7 @@ rpc_rquotad_LDADD = \ - libquota.a \ - $(WRAP_LIBS) \ - $(RPCLIBS) -+endif - - quota_nld_SOURCES = quota_nld.c - quota_nld_CFLAGS = \ -@@ -236,6 +236,7 @@ quota_nld_LDADD = \ - $(DBUS_LIBS) \ - $(LIBNL3_LIBS) - -+if WITH_RPC - # ------------------ - # Rpcgen conversions - # ------------------ -@@ -250,6 +251,7 @@ quota_nld_LDADD = \ - rquota_clnt.c: rquota.x - @rm -f $@ - @$(RPCGEN) -l -o $@ $< -+endif - - # -------- - # Quotaoff -diff --git a/quotaops.c b/quotaops.c -index 47ef9a7..136aec3 100644 ---- a/quotaops.c -+++ b/quotaops.c -@@ -34,7 +34,9 @@ - - #include "config.h" - -+#if defined(RPC) - #include <rpc/rpc.h> -+#endif - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/file.h> -diff --git a/setquota.c b/setquota.c -index 51d7b3c..8ecd9c3 100644 ---- a/setquota.c -+++ b/setquota.c -@@ -7,7 +7,9 @@ - - #include "config.h" - -+#if defined(RPC) - #include <rpc/rpc.h> -+#endif - #include <sys/types.h> - #include <errno.h> - #include <stdio.h> --- -2.6.1 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0003-Don-t-build-rpc.rquotad-when-disable-rpc-was-request.patch b/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0003-Don-t-build-rpc.rquotad-when-disable-rpc-was-request.patch deleted file mode 100644 index 145538412..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0003-Don-t-build-rpc.rquotad-when-disable-rpc-was-request.patch +++ /dev/null @@ -1,62 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -From c7a76237e7a51a69d0236ebfc191e462f805cf4e Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Mon, 15 Feb 2016 14:42:14 +0100 -Subject: [PATCH] Don't build rpc.rquotad when --disable-rpc was requested. - -This fixes a buch of undefined references: - -x86_64-pc-linux-gnu-gcc -march=native -mtune=native -O2 -pipe -D_GNU_SOURCE -Wa -ll -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -pie -Wl,-O1 -Wl,--hash-st -yle=gnu -Wl,--sort-common -Wl,--as-needed -o rpc.rquotad rquota_server.o rquota_ -svc.o svc_socket.o libquota.a -rquota_svc.o: In function `rquotaprog_2': -rquota_svc.c:(.text+0x1d3): undefined reference to `xdr_setquota_rslt' -rquota_svc.c:(.text+0x1da): undefined reference to `xdr_ext_setquota_args' -rquota_svc.c:(.text+0x2b2): undefined reference to `xdr_setquota_rslt' -rquota_svc.c:(.text+0x2b9): undefined reference to `xdr_ext_setquota_args' -rquota_svc.c:(.text+0x2ff): undefined reference to `xdr_getquota_rslt' -rquota_svc.c:(.text+0x306): undefined reference to `xdr_ext_getquota_args' -rquota_svc.c:(.text+0x31a): undefined reference to `xdr_getquota_rslt' -rquota_svc.c:(.text+0x321): undefined reference to `xdr_ext_getquota_args' -rquota_svc.o: In function `rquotaprog_1': -rquota_svc.c:(.text+0x3f3): undefined reference to `xdr_setquota_rslt' -rquota_svc.c:(.text+0x3fa): undefined reference to `xdr_setquota_args' -rquota_svc.c:(.text+0x4d2): undefined reference to `xdr_setquota_rslt' -rquota_svc.c:(.text+0x4d9): undefined reference to `xdr_setquota_args' -rquota_svc.c:(.text+0x51f): undefined reference to `xdr_getquota_rslt' -rquota_svc.c:(.text+0x526): undefined reference to `xdr_getquota_args' -rquota_svc.c:(.text+0x53a): undefined reference to `xdr_getquota_rslt' -rquota_svc.c:(.text+0x541): undefined reference to `xdr_getquota_args' -collect2: error: ld returned 1 exit status -Makefile:901: recipe for target 'rpc.rquotad' failed - -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> -Signed-off-by: Jan Kara <jack@suse.cz> ---- - Makefile.am | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 77f8400..6d7ea0e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -116,8 +116,11 @@ sbin_PROGRAMS = \ - xqmstats \ - edquota \ - setquota \ -- convertquota \ -+ convertquota -+if WITH_RPC -+sbin_PROGRAMS += \ - rpc.rquotad -+endif - if WITH_NETLINK - sbin_PROGRAMS += \ - quota_nld --- -2.6.1 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0004-Fix-warnings-due-to-missing-stdlib.h.patch b/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0004-Fix-warnings-due-to-missing-stdlib.h.patch deleted file mode 100644 index bdb4ceaad..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0004-Fix-warnings-due-to-missing-stdlib.h.patch +++ /dev/null @@ -1,46 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -From c4b56ee58b9b76d2598535cf6109a27b22e60abe Mon Sep 17 00:00:00 2001 -From: Jan Kara <jack@suse.cz> -Date: Wed, 30 Mar 2016 10:21:13 +0200 -Subject: [PATCH] Fix warnings due to missing stdlib.h - -When compiling without RPC, we do not get stdlib.h automatically -included via other includes and thus miss some function definitions. -Include stdlib.h explicitely. - -Signed-off-by: Jan Kara <jack@suse.cz> ---- - quotaops.c | 1 + - setquota.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/quotaops.c b/quotaops.c -index 590dc1b..56cf622 100644 ---- a/quotaops.c -+++ b/quotaops.c -@@ -52,6 +52,7 @@ - #include <time.h> - #include <ctype.h> - #include <limits.h> -+#include <stdlib.h> - - #if defined(RPC) - #include "rquota.h" -diff --git a/setquota.c b/setquota.c -index 8ecd9c3..421631e 100644 ---- a/setquota.c -+++ b/setquota.c -@@ -17,6 +17,7 @@ - #include <getopt.h> - #include <time.h> - #include <ctype.h> -+#include <stdlib.h> - - #if defined(RPC) - #include "rquota.h" --- -2.6.1 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch b/import-layers/yocto-poky/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch index 9ca2ffc0d..4687ca06f 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch @@ -1,20 +1,32 @@ -Replace getrpcbynumber_r with getrpcbynumber +From a3808fd165847298d025971eb3c7be7d11caba9d Mon Sep 17 00:00:00 2001 +From: "Maxin B. John" <maxin.john@intel.com> +Date: Wed, 8 Nov 2017 11:56:55 +0200 +Subject: [PATCH] Replace getrpcbynumber_r with getrpcbynumber + musl and uclibc dont implement it Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: quota-tools/svc_socket.c -=================================================================== ---- quota-tools.orig/svc_socket.c -+++ quota-tools/svc_socket.c -@@ -55,7 +55,8 @@ static int svc_socket (u_long number, in - addr.sin_family = AF_INET; +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- + svc_socket.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/svc_socket.c b/svc_socket.c +index 8a44604..5bdaaa0 100644 +--- a/svc_socket.c ++++ b/svc_socket.c +@@ -36,7 +36,8 @@ static int get_service_port(u_long number, const char *proto) + struct servent servbuf, *servp = NULL; + int ret; - if (!port) { -- ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof(rpcdata), &rpcp); -+ rpcp = getrpcbynumber(number); -+ ret = 0; - if (ret == 0 && rpcp != NULL) { - /* First try name */ - ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata, +- ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof(rpcdata), &rpcp); ++ rpcp = getrpcbynumber(number); ++ ret = 0; + if (ret == 0 && rpcp != NULL) { + /* First try name */ + ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata, +-- +2.4.0 + diff --git a/import-layers/yocto-poky/meta/recipes-extended/quota/quota_4.03.bb b/import-layers/yocto-poky/meta/recipes-extended/quota/quota_4.04.bb index 28b3854a1..93f376286 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/quota/quota_4.03.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/quota/quota_4.04.bb @@ -8,19 +8,13 @@ LIC_FILES_CHKSUM = "file://quota.c;beginline=1;endline=33;md5=331c7d77744bfe0ad2 file://svc_socket.c;beginline=1;endline=17;md5=24d5a8792da45910786eeac750be8ceb" SRC_URI = "${SOURCEFORGE_MIRROR}/project/linuxquota/quota-tools/${PV}/quota-${PV}.tar.gz \ - file://0001-Fix-build-with-disabled-ldap.patch \ - file://0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch \ file://fcntl.patch \ file://remove_non_posix_types.patch \ - file://0001-Use-NGROUPS_MAX-instead-of-NGROUPS.patch \ - file://0002-Allow-building-on-systems-that-do-not-have-rpc-heade.patch \ - file://0003-Don-t-build-rpc.rquotad-when-disable-rpc-was-request.patch \ - file://0004-Fix-warnings-due-to-missing-stdlib.h.patch \ " SRC_URI_append_libc-musl = " file://replace_getrpcbynumber_r.patch" -SRC_URI[md5sum] = "6b09f9c93515c25a528be5754cdfb6f5" -SRC_URI[sha256sum] = "9c6c4d9ae7bf30506dd2aa3d8056c4ff2f8d087930d7c721616f5c093bdc674b" +SRC_URI[md5sum] = "f46f3b0b5141f032f25684005dac49d3" +SRC_URI[sha256sum] = "735be1887e7f51f54165e778ae43fc859c04e44d88834ecb2f470e91d4ef8edf" CVE_PRODUCT = "linux_diskquota" diff --git a/import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch b/import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch new file mode 100644 index 000000000..4c23ee01c --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch @@ -0,0 +1,30 @@ +From c49a7ea639eb700823e174fd605bbbe183e229aa Mon Sep 17 00:00:00 2001 +From: Steve Dickson <steved@redhat.com> +Date: Wed, 17 May 2017 10:52:25 -0400 +Subject: [PATCH] pmapproc_dump: Fixed typo in memory leak patch + +commit 7ea36eee introduce a typo that caused +NIS (aka ypbind) to fail. + +Signed-off-by: Steve Dickson <steved@redhat.com> + +Upstream-Status: Backport + +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +--- + src/pmap_svc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: rpcbind-0.2.4/src/pmap_svc.c +=================================================================== +--- rpcbind-0.2.4.orig/src/pmap_svc.c ++++ rpcbind-0.2.4/src/pmap_svc.c +@@ -384,7 +384,7 @@ pmapproc_dump(struct svc_req *rqstp /*__ + } + + done: +- if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)NULL)) { ++ if (!svc_freeargs(xprt, (xdrproc_t) xdr_void, (char *)NULL)) { + if (debugging) { + /*(void) xlog(LOG_DEBUG, "unable to free arguments\n");*/ + if (doabort) { diff --git a/import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch b/import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch new file mode 100644 index 000000000..9a000d028 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch @@ -0,0 +1,100 @@ +From 7c7590ad536c0e24bef790cb1e65702fc54db566 Mon Sep 17 00:00:00 2001 +From: Steve Dickson <steved@redhat.com> +Date: Tue, 30 May 2017 11:27:22 -0400 +Subject: [PATCH] rpcbproc_callit_com: Stop freeing a static pointer + +commit 7ea36ee introduced a svc_freeargs() call +that ended up freeing static pointer. + +It turns out the allocations for the rmt_args +is not necessary . The xdr routines (xdr_bytes) will +handle the memory management and the largest +possible message size is UDPMSGSIZE (due to UDP only) +which is smaller than RPC_BUF_MAX + +Signed-off-by: Steve Dickson <steved@redhat.com> + +Upstream-Status: Backport + +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +--- + src/rpcb_svc_com.c | 39 ++++++--------------------------------- + 1 file changed, 6 insertions(+), 33 deletions(-) + +diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c +index cb63afd..1fc2229 100644 +--- a/src/rpcb_svc_com.c ++++ b/src/rpcb_svc_com.c +@@ -612,9 +612,9 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp, + struct netconfig *nconf; + struct netbuf *caller; + struct r_rmtcall_args a; +- char *buf_alloc = NULL, *outbufp; ++ char *outbufp; + char *outbuf_alloc = NULL; +- char buf[RPC_BUF_MAX], outbuf[RPC_BUF_MAX]; ++ char outbuf[RPC_BUF_MAX]; + struct netbuf *na = (struct netbuf *) NULL; + struct rpc_msg call_msg; + int outlen; +@@ -635,36 +635,10 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp, + } + if (si.si_socktype != SOCK_DGRAM) + return; /* Only datagram type accepted */ +- sendsz = __rpc_get_t_size(si.si_af, si.si_proto, UDPMSGSIZE); +- if (sendsz == 0) { /* data transfer not supported */ +- if (reply_type == RPCBPROC_INDIRECT) +- svcerr_systemerr(transp); +- return; +- } +- /* +- * Should be multiple of 4 for XDR. +- */ +- sendsz = ((sendsz + 3) / 4) * 4; +- if (sendsz > RPC_BUF_MAX) { +-#ifdef notyet +- buf_alloc = alloca(sendsz); /* not in IDR2? */ +-#else +- buf_alloc = malloc(sendsz); +-#endif /* notyet */ +- if (buf_alloc == NULL) { +- if (debugging) +- xlog(LOG_DEBUG, +- "rpcbproc_callit_com: No Memory!\n"); +- if (reply_type == RPCBPROC_INDIRECT) +- svcerr_systemerr(transp); +- return; +- } +- a.rmt_args.args = buf_alloc; +- } else { +- a.rmt_args.args = buf; +- } ++ sendsz = UDPMSGSIZE; + + call_msg.rm_xid = 0; /* For error checking purposes */ ++ memset(&a, 0, sizeof(a)); /* Zero out the input buffer */ + if (!svc_getargs(transp, (xdrproc_t) xdr_rmtcall_args, (char *) &a)) { + if (reply_type == RPCBPROC_INDIRECT) + svcerr_decode(transp); +@@ -704,7 +678,8 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp, + if (rbl == (rpcblist_ptr)NULL) { + #ifdef RPCBIND_DEBUG + if (debugging) +- xlog(LOG_DEBUG, "not found\n"); ++ xlog(LOG_DEBUG, "prog %lu vers %lu: not found\n", ++ a.rmt_prog, a.rmt_vers); + #endif + if (reply_type == RPCBPROC_INDIRECT) + svcerr_noprog(transp); +@@ -937,8 +912,6 @@ out: + } + if (local_uaddr) + free(local_uaddr); +- if (buf_alloc) +- free(buf_alloc); + if (outbuf_alloc) + free(outbuf_alloc); + if (na) { +-- +2.7.4 + diff --git a/import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb b/import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb index 60e46edd5..dcdee6c46 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb @@ -16,6 +16,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \ file://rpcbind.socket \ file://rpcbind.service \ file://0001-rpcbind-pair-all-svc_getargs-calls-with-svc_freeargs.patch \ + file://pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch \ + file://rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch \ " SRC_URI[md5sum] = "cf10cd41ed8228fc54c316191c1f07fe" SRC_URI[sha256sum] = "074a9a530dc7c11e0d905aa59bcb0847c009313f02e98d3d798aa9568f414c66" diff --git a/import-layers/yocto-poky/meta/recipes-extended/screen/screen/0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch b/import-layers/yocto-poky/meta/recipes-extended/screen/screen/0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch index e8db12c58..1274b2794 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/screen/screen/0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/screen/screen/0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch @@ -9,7 +9,8 @@ test always return true. We rarely use "yes;" to name build dir, so s/yes/yes;/g could fix the issue -Upstream-Status: Pending +Upstream-Status: Accepted +https://git.savannah.gnu.org/cgit/screen.git/commit/?h=screen-v4&id=8c2b4061d16756ee2ed37f08db063b8215656943 Signed-off-by: Jian Kang <jian.kang@windriver.com> --- diff --git a/import-layers/yocto-poky/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch b/import-layers/yocto-poky/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch index b5d71cc1b..a01dc2475 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch @@ -15,19 +15,16 @@ Subject: [PATCH] comm.h now depends on term.h src/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/Makefile.in b/src/Makefile.in -index e791e79..d4f7c0b 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -113,7 +113,7 @@ term.h: term.c term.sh - - kmapdef.c: term.h +Index: screen-4.6.1/Makefile.in +=================================================================== +--- screen-4.6.1.orig/Makefile.in ++++ screen-4.6.1/Makefile.in +@@ -133,7 +133,7 @@ kmapdef.c: term.h + tty.c: tty.sh + sh $(srcdir)/tty.sh tty.c -comm.h: comm.c comm.sh config.h +comm.h: comm.c comm.sh config.h term.h AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh - docs: --- -2.4.1 - + osdef.h: osdef.sh config.h osdef.h.in diff --git a/import-layers/yocto-poky/meta/recipes-extended/screen/screen_4.6.1.bb b/import-layers/yocto-poky/meta/recipes-extended/screen/screen_4.6.2.bb index bcd83a241..7a33c31d8 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/screen/screen_4.6.1.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/screen/screen_4.6.2.bb @@ -26,8 +26,8 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ file://0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch \ " -SRC_URI[md5sum] = "132c893aabfaf2020074790215c8cacd" -SRC_URI[sha256sum] = "aba9af66cb626155d6abce4703f45cce0e30a5114a368bd6387c966cbbbb7c64" +SRC_URI[md5sum] = "a0f529d3333b128dfaa324d978ba73a8" +SRC_URI[sha256sum] = "1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a" inherit autotools texinfo diff --git a/import-layers/yocto-poky/meta/recipes-extended/sed/sed_4.2.2.bb b/import-layers/yocto-poky/meta/recipes-extended/sed/sed_4.2.2.bb index e31bec289..f10e365ea 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/sed/sed_4.2.2.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/sed/sed_4.2.2.bb @@ -42,6 +42,12 @@ do_compile_ptest() { do_install_ptest() { oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR} + sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ + -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ + -i ${D}${PTEST_PATH}/${TESTDIR}/Makefile } RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sed', '', d)}" diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/shadow.inc b/import-layers/yocto-poky/meta/recipes-extended/shadow/shadow.inc index cc189649b..673207fc9 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/shadow/shadow.inc +++ b/import-layers/yocto-poky/meta/recipes-extended/shadow/shadow.inc @@ -6,8 +6,7 @@ LICENSE = "BSD | Artistic-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=ed80ff1c2b40843cf5768e5229cf16e5 \ file://src/passwd.c;beginline=8;endline=30;md5=d83888ea14ae61951982d77125947661" -DEPENDS_class-native = "" -DEPENDS_class-nativesdk = "" +DEPENDS = "virtual/crypt" SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.xz \ file://shadow-4.1.3-dots-in-usernames.patch \ @@ -190,7 +189,7 @@ ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" PACKAGE_WRITE_DEPS += "shadow-native" -pkg_postinst_${PN} () { +pkg_postinst_${PN}_class-target () { if [ "x$D" != "x" ]; then rootarg="--root $D" else diff --git a/import-layers/yocto-poky/meta/recipes-extended/slang/slang_2.3.1a.bb b/import-layers/yocto-poky/meta/recipes-extended/slang/slang_2.3.2.bb index 0585c14da..87fd41af8 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/slang/slang_2.3.1a.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/slang/slang_2.3.2.bb @@ -22,8 +22,8 @@ SRC_URI = "http://www.jedsoft.org/releases/${BPN}/${BP}.tar.bz2 \ file://run-ptest \ " -SRC_URI[md5sum] = "c5235313042ed0e71ec708f7b85ec241" -SRC_URI[sha256sum] = "54f0c3007fde918039c058965dffdfd6c5aec0bad0f4227192cc486021f08c36" +SRC_URI[md5sum] = "c2d5a7aa0246627da490be4e399c87cb" +SRC_URI[sha256sum] = "fc9e3b0fc4f67c3c1f6d43c90c16a5c42d117b8e28457c5b46831b8b5d3ae31a" UPSTREAM_CHECK_URI = "http://www.jedsoft.org/releases/slang/" PREMIRRORS_append = "\n http://www.jedsoft.org/releases/slang/.* http://www.jedsoft.org/releases/slang/old/ \n" diff --git a/import-layers/yocto-poky/meta/recipes-extended/stat/stat-3.3/fix-error-return.patch b/import-layers/yocto-poky/meta/recipes-extended/stat/stat-3.3/fix-error-return.patch deleted file mode 100644 index 032995db8..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/stat/stat-3.3/fix-error-return.patch +++ /dev/null @@ -1,16 +0,0 @@ -This patch fixies the wrong return code of stat -h. - -Upstream-Status: Pending -Signed-off-by: Zhangle Yang <zhangle.yang@windriver.com> - ---- stat-3.3/stat.c.orig 2013-08-22 10:49:45.000000000 +0800 -+++ stat-3.3/stat.c 2013-08-22 10:50:31.000000000 +0800 -@@ -845,7 +845,7 @@ - fprintf(stderr, "\t\t%%S - Security ID in SE-Linux\n"); - fprintf(stderr, "\t\t%%C - Security context in SE-Linux\n"); - fprintf(stderr, "\t\t%%d - Free file nodes in file system\n"); -- exit(1); -+ exit(0); - } - - diff --git a/import-layers/yocto-poky/meta/recipes-extended/stat/stat-3.3/fix-security-format.patch b/import-layers/yocto-poky/meta/recipes-extended/stat/stat-3.3/fix-security-format.patch deleted file mode 100644 index 0c01ed038..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/stat/stat-3.3/fix-security-format.patch +++ /dev/null @@ -1,68 +0,0 @@ -stat: Fixing security formatting issues - -Fix security formatting issues related to printf without NULL argument - -stat.c: In function 'print_human_access': -stat.c:292:13: error: format not a string literal and no format arguments [-Werror=format-security] - printf (access); - ^ -stat.c: In function 'print_human_time': -stat.c:299:57: error: format not a string literal and no format arguments [-Werror=format-security] - if (strftime(str, 40, "%c", localtime(t)) > 0) printf(str); - ^ -stat.c: In function 'print_it': -stat.c:613:6: error: format not a string literal and no format arguments [-Werror=format-security] - printf(b); - ^ -stat.c:642:6: error: format not a string literal and no format arguments [-Werror=format-security] - printf(b); - ^ - -[YOCTO #9550] -[https://bugzilla.yoctoproject.org/show_bug.cgi?id=9550] - -Upstream-Status: Pending - -Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com> - -diff --git a/stat.c b/stat.c -index 1ed07a9..2be6f62 100644 ---- a/stat.c -+++ b/stat.c -@@ -289,15 +289,15 @@ void print_human_access(struct stat *statbuf) - default: - access[0] = '?'; - } -- printf (access); -+ fputs(access,stdout); - } - - void print_human_time(time_t *t) - { - char str[40]; - -- if (strftime(str, 40, "%c", localtime(t)) > 0) printf(str); -- else printf("Cannot calculate human readable time, sorry"); -+ if (strftime(str, 40, "%c", localtime(t)) > 0) fputs(str,stdout); -+ else fputs("Cannot calculate human readable time, sorry",stdout); - } - - /* print statfs info */ -@@ -610,7 +610,7 @@ void print_it(char *masterformat, char *filename, - { - strcpy (pformat, "%"); - *m++ = '\0'; -- printf(b); -+ fputs(b,stdout); - - /* copy all format specifiers to our format string */ - while (isdigit(*m) || strchr("#0-+. I", *m)) -@@ -639,7 +639,7 @@ void print_it(char *masterformat, char *filename, - } - else - { -- printf(b); -+ fputs(b,stdout); - b = NULL; - } - } diff --git a/import-layers/yocto-poky/meta/recipes-extended/stat/stat_3.3.bb b/import-layers/yocto-poky/meta/recipes-extended/stat/stat_3.3.bb deleted file mode 100644 index 8ac8e89a2..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/stat/stat_3.3.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Command line file status display utility" -HOMEPAGE = "http://www.ibiblio.org/pub/Linux/utils/file/" -DESCRIPTION = "Displays all information about a file that the stat() call provides and all information about a filesystem that statfs() provides." -SECTION = "console/utils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=39886b077fd072e876e5c4c16310b631 \ - file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f" - -SRC_URI = "http://www.ibiblio.org/pub/Linux/utils/file/${BP}.tar.gz \ - file://fix-security-format.patch \ - file://fix-error-return.patch" - -SRC_URI[md5sum] = "37e247e8e400ad9205f1b0500b728fd3" -SRC_URI[sha256sum] = "7071f0384a423a938dd542c1f08547a02824f6359acd3ef3f944b2c4c2d1ee09" - -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -do_install() { - install -d ${D}${base_bindir} ${D}${mandir}/man1 - install -m 755 stat ${D}${base_bindir}/stat.stat - install -m 644 stat.1 ${D}${mandir}/man1 -} - -inherit update-alternatives - -ALTERNATIVE_${PN} = "stat" -ALTERNATIVE_PRIORITY[stat] = "200" -ALTERNATIVE_LINK_NAME[stat] = "${base_bindir}/stat" -ALTERNATIVE_TARGET[stat] = "${base_bindir}/stat.stat" - -ALTERNATIVE_${PN}-doc = "stat.1" -ALTERNATIVE_LINK_NAME[stat.1] = "${mandir}/man1/stat.1" - -BBCLASSEXTEND = "native" - diff --git a/import-layers/yocto-poky/meta/recipes-extended/sudo/sudo.inc b/import-layers/yocto-poky/meta/recipes-extended/sudo/sudo.inc index 80ec0ae85..362bd3a2e 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/sudo/sudo.inc +++ b/import-layers/yocto-poky/meta/recipes-extended/sudo/sudo.inc @@ -4,8 +4,8 @@ HOMEPAGE = "http://www.sudo.ws" BUGTRACKER = "http://www.sudo.ws/bugs/" SECTION = "admin" LICENSE = "ISC & BSD & Zlib" -LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=652fb4334c13b511597d7940ef8b3323 \ - file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=cfe41112f96c19a074934d128f45c693 \ +LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=7765a3d787cb4fed3ccc3c9cee030af9 \ + file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=805782a8466975716f8376b2be9aedde \ file://lib/util/reallocarray.c;beginline=3;endline=16;md5=85b0905b795d4d58bf2e00635649eec6 \ file://lib/util/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \ file://lib/util/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \ diff --git a/import-layers/yocto-poky/meta/recipes-extended/sudo/sudo_1.8.20p2.bb b/import-layers/yocto-poky/meta/recipes-extended/sudo/sudo_1.8.22.bb index 4f24b3cce..91501781b 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/sudo/sudo_1.8.20p2.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/sudo/sudo_1.8.22.bb @@ -7,8 +7,8 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[md5sum] = "03da8e711caca6fd93e57751bfb74adc" -SRC_URI[sha256sum] = "bd42ae1059e935f795c69ea97b3de09fe9410a58a74b5d5e6836eb5067a445d9" +SRC_URI[md5sum] = "24abdea48db4c5abcd410167c801cc8c" +SRC_URI[sha256sum] = "7256cb27c20883b14360eddbd17f98922073d104b214cf65aeacf1d9c9b9fd02" DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" diff --git a/import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/no-strip-install.patch b/import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/no-strip-install.patch index 00fba7101..d426c83bf 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/no-strip-install.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/no-strip-install.patch @@ -1,10 +1,10 @@ Upstream-Status: Inappropriate [configuration] -Index: sysklogd-1.5/Makefile +Index: sysklogd-1.5.1/Makefile =================================================================== ---- sysklogd-1.5.orig/Makefile 2009-06-09 13:02:41.000000000 +0200 -+++ sysklogd-1.5/Makefile 2009-06-09 13:03:06.000000000 +0200 -@@ -127,8 +127,8 @@ +--- 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 @@ -14,4 +14,4 @@ Index: sysklogd-1.5/Makefile + ${INSTALL} -m 500 klogd ${BINDIR}/klogd install_man: - ${INSTALL} -m ${MAN_PERMS} sysklogd.8 ${MANDIR}/man8/sysklogd.8 + ${INSTALL} -o ${MAN_USER} -g ${MAN_GROUP} -m ${MAN_PERMS} sysklogd.8 ${MANDIR}/man8/sysklogd.8 diff --git a/import-layers/yocto-poky/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch b/import-layers/yocto-poky/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch index c12652307..1b63299aa 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch @@ -21,10 +21,10 @@ Upstream-Status: Pending sa_common.c | 1 + 3 files changed, 3 insertions(+) -diff --git a/common.c b/common.c -index a23155b..ad86446 100644 ---- a/common.c -+++ b/common.c +Index: sysstat-11.7.1/common.c +=================================================================== +--- sysstat-11.7.1.orig/common.c ++++ sysstat-11.7.1/common.c @@ -20,6 +20,7 @@ */ @@ -32,11 +32,11 @@ index a23155b..ad86446 100644 +#include <limits.h> #include <string.h> #include <stdlib.h> - #include <time.h> -diff --git a/ioconf.c b/ioconf.c -index 7d88c5d..6d67691 100644 ---- a/ioconf.c -+++ b/ioconf.c + #include <stdarg.h> +Index: sysstat-11.7.1/ioconf.c +=================================================================== +--- sysstat-11.7.1.orig/ioconf.c ++++ sysstat-11.7.1/ioconf.c @@ -27,6 +27,7 @@ #include <errno.h> #include <dirent.h> @@ -45,10 +45,10 @@ index 7d88c5d..6d67691 100644 #include "ioconf.h" #include "common.h" -diff --git a/sa_common.c b/sa_common.c -index b7351d9..c9e3299 100644 ---- a/sa_common.c -+++ b/sa_common.c +Index: sysstat-11.7.1/sa_common.c +=================================================================== +--- sysstat-11.7.1.orig/sa_common.c ++++ sysstat-11.7.1/sa_common.c @@ -20,6 +20,7 @@ */ @@ -56,7 +56,4 @@ index b7351d9..c9e3299 100644 +#include <limits.h> #include <string.h> #include <stdlib.h> - #include <time.h> --- -2.5.2 - + #include <stdint.h> diff --git a/import-layers/yocto-poky/meta/recipes-extended/sysstat/sysstat_11.5.7.bb b/import-layers/yocto-poky/meta/recipes-extended/sysstat/sysstat_11.7.1.bb index 72af93134..86738e7b7 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/sysstat/sysstat_11.5.7.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/sysstat/sysstat_11.7.1.bb @@ -4,5 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" SRC_URI += "file://0001-Include-needed-headers-explicitly.patch" -SRC_URI[md5sum] = "8f4a5d0de29f1056153e25e7a9c518d2" -SRC_URI[sha256sum] = "4a38efaa0ca85ee5484d046bd427012979264fef17f07fd7855860e592819482" +SRC_URI[md5sum] = "bdcda7c9048c7c22fb1f30f75285d13d" +SRC_URI[sha256sum] = "303a595b1af0330b183a0f1febfccf89f183b9575ae0562b91fdb876f3ef1feb" diff --git a/import-layers/yocto-poky/meta/recipes-extended/tar/tar/CVE-2016-6321.patch b/import-layers/yocto-poky/meta/recipes-extended/tar/tar/CVE-2016-6321.patch deleted file mode 100644 index 6d35bcc51..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/tar/tar/CVE-2016-6321.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 7340f67b9860ea0531c1450e5aa261c50f67165d Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@Penguin.CS.UCLA.EDU> -Date: Sat, 29 Oct 2016 21:04:40 -0700 -Subject: [PATCH] When extracting, skip ".." members - -* NEWS: Document this. -* src/extract.c (extract_archive): Skip members whose names -contain "..". - -CVE: CVE-2016-6321 -Upstream-Status: Backport - -Cherry picked from commit: 7340f67 When extracting, skip ".." members - -Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> ---- - NEWS | 8 +++++++- - src/extract.c | 8 ++++++++ - 2 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/NEWS b/NEWS -index 501164a..fc97cfc 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,6 +1,12 @@ --GNU tar NEWS - User visible changes. 2016-05-16 -+GNU tar NEWS - User visible changes. 2016-10-29 - Please send GNU tar bug reports to <bug-tar@gnu.org> - -+* Member names containing '..' components are now skipped when extracting. -+ -+This fixes tar's behavior to match its documentation, and is a bit -+safer when extracting untrusted archives over old files (an unsafe -+practice that the tar manual has long recommended against). -+ - - version 1.29 - Sergey Poznyakoff, 2016-05-16 - -diff --git a/src/extract.c b/src/extract.c -index f982433..7904148 100644 ---- a/src/extract.c -+++ b/src/extract.c -@@ -1629,12 +1629,20 @@ extract_archive (void) - { - char typeflag; - tar_extractor_t fun; -+ bool skip_dotdot_name; - - fatal_exit_hook = extract_finish; - - set_next_block_after (current_header); - -+ skip_dotdot_name = (!absolute_names_option -+ && contains_dot_dot (current_stat_info.orig_file_name)); -+ if (skip_dotdot_name) -+ ERROR ((0, 0, _("%s: Member name contains '..'"), -+ quotearg_colon (current_stat_info.orig_file_name))); -+ - if (!current_stat_info.file_name[0] -+ || skip_dotdot_name - || (interactive_option - && !confirm ("extract", current_stat_info.file_name))) - { --- -1.9.1 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/tar/tar/musl_dirent.patch b/import-layers/yocto-poky/meta/recipes-extended/tar/tar/musl_dirent.patch index b0dc16c3d..2d98ed131 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/tar/tar/musl_dirent.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/tar/tar/musl_dirent.patch @@ -14,6 +14,6 @@ Index: tar-1.28/m4/d-ino.m4 - linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;; + linux*-gnu*|linux*-musl*) + gl_cv_struct_dirent_d_ino="guessing yes" ;; + # Guess no on native Windows. + mingw*) gl_cv_struct_dirent_d_ino="guessing no" ;; # If we don't know, assume the worst. - *) gl_cv_struct_dirent_d_ino="guessing no" ;; - esac diff --git a/import-layers/yocto-poky/meta/recipes-extended/tar/tar_1.29.bb b/import-layers/yocto-poky/meta/recipes-extended/tar/tar_1.30.bb index f22d9c938..e743a6d0d 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/tar/tar_1.29.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/tar/tar_1.30.bb @@ -8,10 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI += "file://remove-gets.patch \ file://musl_dirent.patch \ - file://CVE-2016-6321.patch \ " -SRC_URI[md5sum] = "955cd533955acb1804b83fd70218da51" -SRC_URI[sha256sum] = "236b11190c0a3a6885bdb8d61424f2b36a5872869aa3f7f695dea4b4843ae2f2" +SRC_URI[md5sum] = "8404e4c1fc5a3000228ab2b8ad674a65" +SRC_URI[sha256sum] = "87592b86cb037c554375f5868bdd3cc57748aef38d6cb741c81065f0beac63b7" do_install_append_libc-musl() { rm -f ${D}${libdir}/charset.alias diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-build-with-clang.patch b/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-build-with-clang.patch new file mode 100644 index 000000000..9d1e05d7f --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-build-with-clang.patch @@ -0,0 +1,65 @@ +From 7f8878ac1aaf4a19992d39379797c151301bedb1 Mon Sep 17 00:00:00 2001 +From: Oleksiy Obitotskyy <oobitots@cisco.com> +Date: Mon, 5 Feb 2018 08:29:10 -0800 +Subject: [PATCH] Fix build with clang + +Fix "error: non-void function 'fix_options' should return a value". +Add function prototype to tcpd.c and miscd.c. + +Upstream-Status: Pending + +Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> +--- + v2 - add function prototypes + + fix_options.c | 2 +- + miscd.c | 4 ++++ + tcpd.c | 4 ++++ + 3 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/fix_options.c b/fix_options.c +index b5e81b8..9958ff4 100644 +--- a/fix_options.c ++++ b/fix_options.c +@@ -29,7 +29,7 @@ static char sccsid[] = "@(#) fix_options.c 1.6 97/04/08 02:29:19"; + + /* fix_options - get rid of IP-level socket options */ + +-fix_options(request) ++void fix_options(request) + struct request_info *request; + { + #ifdef IP_OPTIONS +diff --git a/miscd.c b/miscd.c +index 1ab835c..723b83a 100644 +--- a/miscd.c ++++ b/miscd.c +@@ -40,6 +40,10 @@ static char sccsid[] = "@(#) miscd.c 1.10 96/02/11 17:01:30"; + #include "patchlevel.h" + #include "tcpd.h" + ++#ifdef KILL_IP_OPTIONS ++void fix_options(struct request_info *); ++#endif ++ + int allow_severity = SEVERITY; /* run-time adjustable */ + int deny_severity = LOG_WARNING; /* ditto */ + +diff --git a/tcpd.c b/tcpd.c +index d865b9c..a179891 100644 +--- a/tcpd.c ++++ b/tcpd.c +@@ -38,6 +38,10 @@ static char sccsid[] = "@(#) tcpd.c 1.10 96/02/11 17:01:32"; + #include "patchlevel.h" + #include "tcpd.h" + ++#ifdef KILL_IP_OPTIONS ++void fix_options(struct request_info *); ++#endif ++ + int allow_severity = SEVERITY; /* run-time adjustable */ + int deny_severity = LOG_WARNING; /* ditto */ + +-- +2.10.3.dirty + diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch b/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch index e8289e44d..d473fb634 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch @@ -1,9 +1,10 @@ Upstream-Status: Backport -diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile ---- tcp_wrappers_7.6.orig/Makefile 2003-08-21 01:43:39.000000000 +0200 -+++ tcp_wrappers_7.6/Makefile 2003-08-21 01:43:35.000000000 +0200 -@@ -45,7 +45,7 @@ +Index: tcp_wrappers_7.6/Makefile +=================================================================== +--- tcp_wrappers_7.6.orig/Makefile ++++ tcp_wrappers_7.6/Makefile +@@ -45,7 +45,7 @@ what: # # SysV.4 Solaris 2.x OSF AIX #REAL_DAEMON_DIR=/usr/sbin @@ -12,7 +13,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile # BSD 4.4 #REAL_DAEMON_DIR=/usr/libexec # -@@ -512,6 +519,7 @@ +@@ -513,6 +513,7 @@ VSYSLOG = -Dvsyslog=myvsyslog # (examples: allow, deny, banners, twist and spawn). # #STYLE = -DPROCESS_OPTIONS # Enable language extensions. @@ -20,7 +21,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile ################################################################ # Optional: Changing the default disposition of logfile records -@@ -535,6 +543,7 @@ +@@ -536,6 +537,7 @@ VSYSLOG = -Dvsyslog=myvsyslog # The LOG_XXX names below are taken from the /usr/include/syslog.h file. FACILITY= LOG_MAIL # LOG_MAIL is what most sendmail daemons use @@ -28,7 +29,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile # The syslog priority at which successful connections are logged. -@@ -631,6 +640,7 @@ +@@ -632,6 +634,7 @@ TABLES = -DHOSTS_DENY=\"/etc/hosts.deny\ # lookups altogether, see the next section. PARANOID= -DPARANOID @@ -36,7 +37,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile ######################################## # Optional: turning off hostname lookups -@@ -644,6 +654,7 @@ +@@ -645,6 +648,7 @@ PARANOID= -DPARANOID # mode (see previous section) and comment out the following definition. HOSTNAME= -DALWAYS_HOSTNAME @@ -44,7 +45,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile ############################################# # Optional: Turning on host ADDRESS checking -@@ -670,6 +681,7 @@ +@@ -671,6 +675,7 @@ HOSTNAME= -DALWAYS_HOSTNAME # Solaris 2.x, and Linux. See your system documentation for details. # # KILL_OPT= -DKILL_IP_OPTIONS @@ -52,7 +53,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile ## End configuration options ############################ -@@ -677,9 +689,10 @@ +@@ -678,9 +683,10 @@ HOSTNAME= -DALWAYS_HOSTNAME # Protection against weird shells or weird make programs. SHELL = /bin/sh @@ -65,7 +66,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile $(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \ -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \ -DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \ -@@ -712,10 +725,11 @@ +@@ -713,11 +719,12 @@ all other: config-check tcpd tcpdmatch t config-check: @set +e; test -n "$(REAL_DAEMON_DIR)" || { make; exit 1; } @@ -81,3 +82,4 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile + @if [ ! -d shared ]; then mkdir shared; fi $(LIB): $(LIB_OBJ) + rm -f $(LIB) diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb index 1effef149..3ece8c301 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb @@ -45,6 +45,7 @@ SRC_URI = "ftp://ftp.porcupine.org/pub/security/tcp_wrappers_${PV}.tar.gz \ file://safe_finger.8 \ file://makefile-fix-parallel.patch \ file://musl-decls.patch \ + file://0001-Fix-build-with-clang.patch \ " SRC_URI[md5sum] = "e6fa25f71226d090f34de3f6b122fb5a" diff --git a/import-layers/yocto-poky/meta/recipes-extended/texinfo/texinfo_6.3.bb b/import-layers/yocto-poky/meta/recipes-extended/texinfo/texinfo_6.5.bb index f58df928a..f966457f8 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/texinfo/texinfo_6.3.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/texinfo/texinfo_6.5.bb @@ -37,13 +37,15 @@ SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ ${TARGET_PATCH} \ " -SRC_URI[md5sum] = "9b08daca9bf8eccae9b0f884aba41f9e" -SRC_URI[sha256sum] = "300a6ba4958c2dd4a6d5ce60f0a335daf7e379f5374f276f6ba31a221f02f606" +SRC_URI[md5sum] = "94e8f7149876793030e5518dd8d6e956" +SRC_URI[sha256sum] = "d34272e4042c46186ddcd66bd5d980c0ca14ff734444686ccf8131f6ec8b1427" tex_texinfo = "texmf/tex/texinfo" inherit gettext autotools +EXTRA_AUTORECONF += "-I ${S}/gnulib/m4" + do_configure_prepend () { # autotools_do_configure updates po/Makefile.in.in, we also need # update po_document. diff --git a/import-layers/yocto-poky/meta/recipes-extended/time/time-1.7/debian.patch b/import-layers/yocto-poky/meta/recipes-extended/time/time-1.7/debian.patch deleted file mode 100644 index 23ea0e3eb..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/time/time-1.7/debian.patch +++ /dev/null @@ -1,1301 +0,0 @@ -Upstream-Status: Backport - ---- time-1.7.orig/configure.in -+++ time-1.7/configure.in -@@ -1,11 +1,8 @@ - dnl Process this file with autoconf to produce a configure script. - AC_INIT(time.c) --VERSION=1.7 --AC_SUBST(VERSION) --PACKAGE=time --AC_SUBST(PACKAGE) -+AM_INIT_AUTOMAKE(time, 1.7) - --AC_ARG_PROGRAM -+AM_MAINTAINER_MODE - - dnl Checks for programs. - AC_PROG_CC -@@ -15,7 +12,7 @@ - dnl Checks for header files. - AC_HEADER_STDC - AC_HEADER_SYS_WAIT --AC_CHECK_HEADERS(unistd.h string.h sys/rusage.h) -+AC_CHECK_HEADERS(unistd.h string.h sys/rusage.h sys/resource.h) - - dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST ---- time-1.7.orig/version.texi -+++ time-1.7/version.texi -@@ -1,3 +1,3 @@ --@set UPDATED 12 June 1996 -+@set UPDATED 9 May 2002 - @set EDITION 1.7 - @set VERSION 1.7 ---- time-1.7.orig/time.c -+++ time-1.7/time.c -@@ -147,6 +147,10 @@ - NULL - }; - -+ -+/* If true, do not show the exit message */ -+static boolean quiet; -+ - /* If true, show an English description next to each statistic. */ - static boolean verbose; - -@@ -172,6 +176,7 @@ - {"help", no_argument, NULL, 'h'}, - {"output-file", required_argument, NULL, 'o'}, - {"portability", no_argument, NULL, 'p'}, -+ {"quiet", no_argument,NULL, 'q'}, - {"verbose", no_argument, NULL, 'v'}, - {"version", no_argument, NULL, 'V'}, - {NULL, no_argument, NULL, 0} -@@ -333,7 +338,8 @@ - else if (WIFSIGNALED (resp->waitstatus)) - fprintf (fp, "Command terminated by signal %d\n", - WTERMSIG (resp->waitstatus)); -- else if (WIFEXITED (resp->waitstatus) && WEXITSTATUS (resp->waitstatus)) -+ else if (WIFEXITED (resp->waitstatus) && WEXITSTATUS (resp->waitstatus) -+ && !quiet) - fprintf (fp, "Command exited with non-zero status %d\n", - WEXITSTATUS (resp->waitstatus)); - -@@ -523,6 +529,7 @@ - char *format; /* Format found in environment. */ - - /* Initialize the option flags. */ -+ quiet = false; - verbose = false; - outfile = NULL; - outfp = stderr; -@@ -536,7 +543,7 @@ - if (format) - output_format = format; - -- while ((optc = getopt_long (argc, argv, "+af:o:pvV", longopts, (int *) 0)) -+ while ((optc = getopt_long (argc, argv, "+af:o:pqvV", longopts, (int *) 0)) - != EOF) - { - switch (optc) -@@ -555,6 +562,9 @@ - case 'p': - output_format = posix_format; - break; -+ case 'q': -+ quiet = true; -+ break; - case 'v': - verbose = true; - break; -@@ -642,9 +652,9 @@ - fflush (outfp); - - if (WIFSTOPPED (res.waitstatus)) -- exit (WSTOPSIG (res.waitstatus)); -+ exit (WSTOPSIG (res.waitstatus) + 128); - else if (WIFSIGNALED (res.waitstatus)) -- exit (WTERMSIG (res.waitstatus)); -+ exit (WTERMSIG (res.waitstatus) + 128); - else if (WIFEXITED (res.waitstatus)) - exit (WEXITSTATUS (res.waitstatus)); - } -@@ -657,7 +667,7 @@ - fprintf (stream, "\ - Usage: %s [-apvV] [-f format] [-o file] [--append] [--verbose]\n\ - [--portability] [--format=format] [--output=file] [--version]\n\ -- [--help] command [arg...]\n", -+ [--quiet] [--help] command [arg...]\n", - program_name); - exit (status); - } ---- time-1.7.orig/resuse.h -+++ time-1.7/resuse.h -@@ -36,19 +36,8 @@ - # include <sys/rusage.h> - #else - # define TV_MSEC tv_usec / 1000 --# if HAVE_WAIT3 -+# if HAVE_SYS_RESOURCE_H - # include <sys/resource.h> --# else --/* Process resource usage structure. */ --struct rusage --{ -- struct timeval ru_utime; /* User time used. */ -- struct timeval ru_stime; /* System time used. */ -- int ru_maxrss, ru_ixrss, ru_idrss, ru_isrss, -- ru_minflt, ru_majflt, ru_nswap, ru_inblock, -- ru_oublock, ru_msgsnd, ru_msgrcv, ru_nsignals, -- ru_nvcsw, ru_nivcsw; --}; - # endif - #endif - ---- time-1.7.orig/time.texi -+++ time-1.7/time.texi -@@ -11,6 +11,12 @@ - @finalout - @end iftex - -+@dircategory Individual utilities -+@direntry -+* time: (time). Run programs and summarize -+ system resource usage. -+@end direntry -+ - @ifinfo - This file documents the the GNU @code{time} command for running programs - and summarizing the system resources they use. -@@ -185,6 +191,10 @@ - sys %S - @end example - -+@item -q -+@itemx --quiet -+Suppress non-zero error code from the executed program. -+ - @item -v - @itemx --verbose - @cindex format ---- time-1.7.orig/time.info -+++ time-1.7/time.info -@@ -1,5 +1,10 @@ --This is Info file ./time.info, produced by Makeinfo-1.55 from the input --file time.texi. -+This is time.info, produced by makeinfo version 4.1 from time.texi. -+ -+INFO-DIR-SECTION Individual utilities -+START-INFO-DIR-ENTRY -+* time: (time). Run programs and summarize -+ system resource usage. -+END-INFO-DIR-ENTRY - - This file documents the the GNU `time' command for running programs - and summarizing the system resources they use. -@@ -31,7 +36,7 @@ - - * Resource Measurement:: Measuring program resource use. - -- -- The Detailed Node Listing -- -+ --- The Detailed Node Listing --- - - Measuring Program Resource Use - -@@ -58,14 +63,14 @@ - The `time' command runs another program, then displays information - about the resources used by that program, collected by the system while - the program was running. You can select which information is reported --and the format in which it is shown (*note Setting Format::.), or have -+and the format in which it is shown (*note Setting Format::), or have - `time' save the information in a file instead of displaying it on the --screen (*note Redirecting::.). -+screen (*note Redirecting::). - - The resources that `time' can report on fall into the general - categories of time, memory, and I/O and IPC calls. Some systems do not - provide much information about program resource use; `time' reports --unavailable information as zero values (*note Accuracy::.). -+unavailable information as zero values (*note Accuracy::). - - The format of the `time' command is: - -@@ -132,6 +137,10 @@ - user %U - sys %S - -+`-q' -+`--quiet' -+ Suppress non-zero error code from the executed program. -+ - `-v' - `--verbose' - Use the built-in verbose format, which displays each available -@@ -174,7 +183,7 @@ - The resource specifiers, which are a superset of those recognized by - the `tcsh' builtin `time' command, are listed below. Not all resources - are measured by all versions of Unix, so some of the values might be --reported as zero (*note Accuracy::.). -+reported as zero (*note Accuracy::). - - * Menu: - -@@ -308,11 +317,11 @@ - `-o FILE' - `--output=FILE' - Write the resource use statistics to FILE. By default, this -- *overwrites* the file, destroying the file's previous contents. -+ _overwrites_ the file, destroying the file's previous contents. - - `-a' - `--append' -- *Append* the resource use information to the output file instead -+ _Append_ the resource use information to the output file instead - of overwriting it. This option is only useful with the `-o' or - `--output' option. - -@@ -437,7 +446,7 @@ - - `-a' - `--append' -- *Append* the resource use information to the output file instead -+ _Append_ the resource use information to the output file instead - of overwriting it. - - `-f FORMAT' -@@ -462,17 +471,17 @@ - - - Tag Table: --Node: Top934 --Node: Resource Measurement1725 --Node: Setting Format3678 --Node: Format String4907 --Node: Time Resources6214 --Node: Memory Resources6844 --Node: I/O Resources7549 --Node: Command Info8747 --Node: Redirecting8964 --Node: Examples9754 --Node: Accuracy12064 --Node: Invoking time13586 -+Node: Top1115 -+Node: Resource Measurement1908 -+Node: Setting Format3858 -+Node: Format String5164 -+Node: Time Resources6470 -+Node: Memory Resources7100 -+Node: I/O Resources7805 -+Node: Command Info9003 -+Node: Redirecting9220 -+Node: Examples10010 -+Node: Accuracy12320 -+Node: Invoking time13842 - - End Tag Table ---- time-1.7.orig/time.html -+++ time-1.7/time.html -@@ -0,0 +1,1021 @@ -+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" -+ "http://www.w3.org/TR/html40/loose.dtd"> -+<HTML> -+<!-- Created on September, 1 2003 by texi2html 1.66 --> -+<!-- -+Written by: Lionel Cons <Lionel.Cons@cern.ch> (original author) -+ Karl Berry <karl@freefriends.org> -+ Olaf Bachmann <obachman@mathematik.uni-kl.de> -+ and many others. -+Maintained by: Many creative people <dev@texi2html.cvshome.org> -+Send bugs and suggestions to <users@texi2html.cvshome.org> -+ -+--> -+<HEAD> -+<TITLE>Measuring Program Resource Use</TITLE> -+ -+<META NAME="description" CONTENT="Measuring Program Resource Use"> -+<META NAME="keywords" CONTENT="Measuring Program Resource Use"> -+<META NAME="resource-type" CONTENT="document"> -+<META NAME="distribution" CONTENT="global"> -+<META NAME="Generator" CONTENT="texi2html 1.66"> -+ -+</HEAD> -+ -+<BODY LANG="en" BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#0000FF" VLINK="#800080" ALINK="#FF0000"> -+ -+<A NAME="SEC_Top"></A> -+<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> -+<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> -+</TR></TABLE> -+<H1>Measuring Program Resource Use</H1> -+ -+<P> -+ -+This file documents the the GNU <CODE>time</CODE> command for running programs -+and summarizing the system resources they use. -+This is edition 1.7, for version 1.7. -+</P> -+<P> -+ -+</P> -+<TABLE BORDER="0" CELLSPACING="0"> -+<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC1">1. Measuring Program Resource Use</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Measuring program resource use.</TD></TR> -+<TR><TH COLSPAN="3" ALIGN="left" VALIGN="TOP"> -+</TH></TR> -+<TR><TH COLSPAN="3" ALIGN="left" VALIGN="TOP"> -- The Detailed Node Listing --- -+</TH></TR> -+<TR><TH COLSPAN="3" ALIGN="left" VALIGN="TOP"> -+</TH></TR> -+<TR><TH COLSPAN="3" ALIGN="left" VALIGN="TOP">Measuring Program Resource Use -+</TH></TR> -+<TR><TH COLSPAN="3" ALIGN="left" VALIGN="TOP"> -+</TH></TR> -+<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC2">1.1 Setting the Output Format</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Selecting the information reported by <CODE>time</CODE>.</TD></TR> -+<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC3">1.2 The Format String</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">The information <CODE>time</CODE> can report.</TD></TR> -+<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC8">1.3 Redirecting Output</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Writing the information to a file.</TD></TR> -+<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC9">1.4 Examples</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Examples of using <CODE>time</CODE>.</TD></TR> -+<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC10">1.5 Accuracy</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Limitations on the accuracy of <CODE>time</CODE> output.</TD></TR> -+<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC11">1.6 Running the <CODE>time</CODE> Command</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Summary of the options to the <CODE>time</CODE> command.</TD></TR> -+<TR><TH COLSPAN="3" ALIGN="left" VALIGN="TOP"> -+</TH></TR> -+<TR><TH COLSPAN="3" ALIGN="left" VALIGN="TOP">The Format String -+</TH></TR> -+<TR><TH COLSPAN="3" ALIGN="left" VALIGN="TOP"> -+</TH></TR> -+<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC4">1.2.1 Time Resources</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP"></TD></TR> -+<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC5">1.2.2 Memory Resources</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP"></TD></TR> -+<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC6">1.2.3 I/O Resources</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP"></TD></TR> -+<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC7">1.2.4 Command Info</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP"></TD></TR> -+</TABLE> -+<P> -+ -+<HR SIZE=1> -+<A NAME="SEC1"></A> -+<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> -+<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> < </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC2"> > </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[ << ]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> -+</TR></TABLE> -+<A NAME="Resource Measurement"></A> -+<H1> 1. Measuring Program Resource Use </H1> -+<!--docid::SEC1::--> -+<P> -+ -+The <CODE>time</CODE> command runs another program, then displays information -+about the resources used by that program, collected by the system while -+the program was running. You can select which information is reported -+and the format in which it is shown (see section <A HREF="time.html#SEC2">1.1 Setting the Output Format</A>), or have -+<CODE>time</CODE> save the information in a file instead of displaying it on the -+screen (see section <A HREF="time.html#SEC8">1.3 Redirecting Output</A>). -+</P> -+<P> -+ -+The resources that <CODE>time</CODE> can report on fall into the general -+categories of time, memory, and I/O and IPC calls. Some systems do not -+provide much information about program resource use; <CODE>time</CODE> -+reports unavailable information as zero values (see section <A HREF="time.html#SEC10">1.5 Accuracy</A>). -+</P> -+<P> -+ -+The format of the <CODE>time</CODE> command is: -+</P> -+<P> -+ -+<TABLE><tr><td> </td><td class=example><pre>time [option<small>...</small>] <VAR>command</VAR> [<VAR>arg</VAR><small>...</small>] -+</pre></td></tr></table><P> -+ -+<A NAME="IDX1"></A> -+<CODE>time</CODE> runs the program <VAR>command</VAR>, with any given arguments -+<VAR>arg</VAR><small>...</small>. When <VAR>command</VAR> finishes, <CODE>time</CODE> displays -+information about resources used by <VAR>command</VAR>. -+</P> -+<P> -+ -+Here is an example of using <CODE>time</CODE> to measure the time and other -+resources used by running the program <CODE>grep</CODE>: -+</P> -+<P> -+ -+<TABLE><tr><td> </td><td class=example><pre>eg$ time grep nobody /etc/aliases -+nobody:/dev/null -+etc-files:nobody -+misc-group:nobody -+0.07user 0.50system 0:06.69elapsed 8%CPU (0avgtext+489avgdata 324maxresident)k -+46inputs+7outputs (43major+251minor)pagefaults 0swaps -+</pre></td></tr></table><P> -+ -+Mail suggestions and bug reports for GNU <CODE>time</CODE> to -+<CODE>bug-gnu-utils@prep.ai.mit.edu</CODE>. Please include the version of -+<CODE>time</CODE>, which you can get by running `<SAMP>time --version</SAMP>', and the -+operating system and C compiler you used. -+</P> -+<P> -+ -+<TABLE BORDER="0" CELLSPACING="0"> -+<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC2">1.1 Setting the Output Format</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Selecting the information reported by <CODE>time</CODE>.</TD></TR> -+<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC3">1.2 The Format String</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">The information <CODE>time</CODE> can report.</TD></TR> -+<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC8">1.3 Redirecting Output</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Writing the information to a file.</TD></TR> -+<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC9">1.4 Examples</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Examples of using <CODE>time</CODE>.</TD></TR> -+<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC10">1.5 Accuracy</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Limitations on the accuracy of <CODE>time</CODE> output.</TD></TR> -+<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC11">1.6 Running the <CODE>time</CODE> Command</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP">Summary of the options to the <CODE>time</CODE> command.</TD></TR> -+</TABLE> -+<P> -+ -+<A NAME="Setting Format"></A> -+<HR SIZE="6"> -+<A NAME="SEC2"></A> -+<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> -+<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> < </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC3"> > </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> << </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> -+</TR></TABLE> -+<H2> 1.1 Setting the Output Format </H2> -+<!--docid::SEC2::--> -+<P> -+ -+<CODE>time</CODE> uses a <EM>format string</EM> to determine which information to -+display about the resources used by the command it runs. See section <A HREF="time.html#SEC3">1.2 The Format String</A>, for the interpretation of the format string contents. -+</P> -+<P> -+ -+You can specify a format string with the command line options listed -+below. If no format is specified on the command line, but the -+<CODE>TIME</CODE> environment variable is set, its value is used as the format -+string. Otherwise, the default format built into <CODE>time</CODE> is used: -+</P> -+<P> -+ -+<TABLE><tr><td> </td><td class=example><pre>%Uuser %Ssystem %Eelapsed %PCPU (%Xtext+%Ddata %Mmax)k -+%Iinputs+%Ooutputs (%Fmajor+%Rminor)pagefaults %Wswaps -+</pre></td></tr></table><P> -+ -+The command line options to set the format are: -+</P> -+<P> -+ -+</P> -+<DL COMPACT> -+<DT><CODE>-f <VAR>format</VAR></CODE> -+<DD><DT><CODE>--format=<VAR>format</VAR></CODE> -+<DD>Use <VAR>format</VAR> as the format string. -+<P> -+ -+</P> -+<DT><CODE>-p</CODE> -+<DD><DT><CODE>--portability</CODE> -+<DD>Use the following format string, for conformance with POSIX standard -+1003.2: -+<P> -+ -+<TABLE><tr><td> </td><td class=example><pre>real %e -+user %U -+sys %S -+</pre></td></tr></table><P> -+ -+</P> -+<DT><CODE>-q</CODE> -+<DD><DT><CODE>--quiet</CODE> -+<DD>Suppress non-zero error code from the executed program. -+<P> -+ -+</P> -+<DT><CODE>-v</CODE> -+<DD><DT><CODE>--verbose</CODE> -+<DD><A NAME="IDX2"></A> -+Use the built-in verbose format, which displays each available piece of -+information on the program's resource use on its own line, with an -+English description of its meaning. -+</DL> -+<P> -+ -+<A NAME="Format String"></A> -+<HR SIZE="6"> -+<A NAME="SEC3"></A> -+<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> -+<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC2"> < </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC4"> > </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> << </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> -+</TR></TABLE> -+<H2> 1.2 The Format String </H2> -+<!--docid::SEC3::--> -+<P> -+ -+<A NAME="IDX3"></A> -+<A NAME="IDX4"></A> -+The <EM>format string</EM> controls the contents of the <CODE>time</CODE> output. -+It consists of <EM>resource specifiers</EM> and <EM>escapes</EM>, interspersed -+with plain text. -+</P> -+<P> -+ -+A backslash introduces an <EM>escape</EM>, which is translated -+into a single printing character upon output. The valid escapes are -+listed below. An invalid escape is output as a question mark followed -+by a backslash. -+</P> -+<P> -+ -+</P> -+<DL COMPACT> -+<DT><CODE>\t</CODE> -+<DD>a tab character -+<P> -+ -+</P> -+<DT><CODE>\n</CODE> -+<DD>a newline -+<P> -+ -+</P> -+<DT><CODE>\\</CODE> -+<DD>a literal backslash -+</DL> -+<P> -+ -+<CODE>time</CODE> always prints a newline after printing the resource use -+information, so normally format strings do not end with a newline -+character (or `<SAMP>\n</SAMP>'). -+</P> -+<P> -+ -+A resource specifier consists of a percent sign followed by another -+character. An invalid resource specifier is output as a question mark -+followed by the invalid character. Use `<SAMP>%%</SAMP>' to output a literal -+percent sign. -+</P> -+<P> -+ -+The resource specifiers, which are a superset of those recognized by the -+<CODE>tcsh</CODE> builtin <CODE>time</CODE> command, are listed below. Not all -+resources are measured by all versions of Unix, so some of the values -+might be reported as zero (see section <A HREF="time.html#SEC10">1.5 Accuracy</A>). -+</P> -+<P> -+ -+<TABLE BORDER="0" CELLSPACING="0"> -+<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC4">1.2.1 Time Resources</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP"></TD></TR> -+<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC5">1.2.2 Memory Resources</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP"></TD></TR> -+<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC6">1.2.3 I/O Resources</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP"></TD></TR> -+<TR><TD ALIGN="left" VALIGN="TOP"><A HREF="time.html#SEC7">1.2.4 Command Info</A></TD><TD> </TD><TD ALIGN="left" VALIGN="TOP"></TD></TR> -+</TABLE> -+<P> -+ -+<A NAME="Time Resources"></A> -+<HR SIZE="6"> -+<A NAME="SEC4"></A> -+<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> -+<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC3"> < </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC5"> > </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> << </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> -+</TR></TABLE> -+<H3> 1.2.1 Time Resources </H3> -+<!--docid::SEC4::--> -+<P> -+ -+</P> -+<DL COMPACT> -+<DT><CODE>E</CODE> -+<DD>Elapsed real (wall clock) time used by the process, in -+[hours:]minutes:seconds. -+<P> -+ -+</P> -+<DT><CODE>e</CODE> -+<DD>Elapsed real (wall clock) time used by the process, in -+seconds. -+<P> -+ -+</P> -+<DT><CODE>S</CODE> -+<DD>Total number of CPU-seconds used by the system on behalf of the process -+(in kernel mode), in seconds. -+<P> -+ -+</P> -+<DT><CODE>U</CODE> -+<DD>Total number of CPU-seconds that the process used directly (in user -+mode), in seconds. -+<P> -+ -+</P> -+<DT><CODE>P</CODE> -+<DD>Percentage of the CPU that this job got. This is just user + system -+times divied by the total running time. -+</DL> -+<P> -+ -+<A NAME="Memory Resources"></A> -+<HR SIZE="6"> -+<A NAME="SEC5"></A> -+<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> -+<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC4"> < </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC6"> > </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> << </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> -+</TR></TABLE> -+<H3> 1.2.2 Memory Resources </H3> -+<!--docid::SEC5::--> -+<P> -+ -+</P> -+<DL COMPACT> -+<DT><CODE>M</CODE> -+<DD>Maximum resident set size of the process during its lifetime, in -+Kilobytes. -+<P> -+ -+</P> -+<DT><CODE>t</CODE> -+<DD>Average resident set size of the process, in Kilobytes. -+<P> -+ -+</P> -+<DT><CODE>K</CODE> -+<DD>Average total (data+stack+text) memory use of the process, in Kilobytes. -+<P> -+ -+</P> -+<DT><CODE>D</CODE> -+<DD>Average size of the process's unshared data area, in Kilobytes. -+<P> -+ -+</P> -+<DT><CODE>p</CODE> -+<DD>Average size of the process's unshared stack, in Kilobytes. -+<P> -+ -+</P> -+<DT><CODE>X</CODE> -+<DD>Average size of the process's shared text, in Kilobytes. -+<P> -+ -+</P> -+<DT><CODE>Z</CODE> -+<DD>System's page size, in bytes. This is a per-system constant, but -+varies between systems. -+</DL> -+<P> -+ -+<A NAME="I/O Resources"></A> -+<HR SIZE="6"> -+<A NAME="SEC6"></A> -+<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> -+<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC5"> < </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC7"> > </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> << </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> -+</TR></TABLE> -+<H3> 1.2.3 I/O Resources </H3> -+<!--docid::SEC6::--> -+<P> -+ -+</P> -+<DL COMPACT> -+<DT><CODE>F</CODE> -+<DD>Number of major, or I/O-requiring, page faults that occurred while the -+process was running. These are faults where the page has actually -+migrated out of primary memory. -+<P> -+ -+</P> -+<DT><CODE>R</CODE> -+<DD>Number of minor, or recoverable, page faults. These are pages that are -+not valid (so they fault) but which have not yet been claimed by other -+virtual pages. Thus the data in the page is still valid but the system -+tables must be updated. -+<P> -+ -+</P> -+<DT><CODE>W</CODE> -+<DD>Number of times the process was swapped out of main memory. -+<P> -+ -+</P> -+<DT><CODE>c</CODE> -+<DD>Number of times the process was context-switched involuntarily (because -+the time slice expired). -+<P> -+ -+</P> -+<DT><CODE>w</CODE> -+<DD>Number of times that the program was context-switched voluntarily, for -+instance while waiting for an I/O operation to complete. -+<P> -+ -+</P> -+<DT><CODE>I</CODE> -+<DD>Number of file system inputs by the process. -+<P> -+ -+</P> -+<DT><CODE>O</CODE> -+<DD>Number of file system outputs by the process. -+<P> -+ -+</P> -+<DT><CODE>r</CODE> -+<DD>Number of socket messages received by the process. -+<P> -+ -+</P> -+<DT><CODE>s</CODE> -+<DD>Number of socket messages sent by the process. -+<P> -+ -+</P> -+<DT><CODE>k</CODE> -+<DD>Number of signals delivered to the process. -+</DL> -+<P> -+ -+<A NAME="Command Info"></A> -+<HR SIZE="6"> -+<A NAME="SEC7"></A> -+<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> -+<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC6"> < </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC8"> > </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> << </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> -+</TR></TABLE> -+<H3> 1.2.4 Command Info </H3> -+<!--docid::SEC7::--> -+<P> -+ -+</P> -+<DL COMPACT> -+<DT><CODE>C</CODE> -+<DD>Name and command line arguments of the command being timed. -+<P> -+ -+</P> -+<DT><CODE>x</CODE> -+<DD>Exit status of the command. -+</DL> -+<P> -+ -+<A NAME="Redirecting"></A> -+<HR SIZE="6"> -+<A NAME="SEC8"></A> -+<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> -+<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC7"> < </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC9"> > </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> << </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> -+</TR></TABLE> -+<H2> 1.3 Redirecting Output </H2> -+<!--docid::SEC8::--> -+<P> -+ -+By default, <CODE>time</CODE> writes the resource use statistics to the -+standard error stream. The options below make it write the statistics -+to a file instead. Doing this can be useful if the program you're -+running writes to the standard error or you're running <CODE>time</CODE> -+noninteractively or in the background. -+</P> -+<P> -+ -+</P> -+<DL COMPACT> -+<DT><CODE>-o <VAR>file</VAR></CODE> -+<DD><DT><CODE>--output=<VAR>file</VAR></CODE> -+<DD>Write the resource use statistics to <VAR>file</VAR>. By default, this -+<EM>overwrites</EM> the file, destroying the file's previous contents. -+<P> -+ -+</P> -+<DT><CODE>-a</CODE> -+<DD><DT><CODE>--append</CODE> -+<DD><EM>Append</EM> the resource use information to the output file instead -+of overwriting it. This option is only useful with the `<SAMP>-o</SAMP>' or -+`<SAMP>--output</SAMP>' option. -+</DL> -+<P> -+ -+<A NAME="Examples"></A> -+<HR SIZE="6"> -+<A NAME="SEC9"></A> -+<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> -+<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC8"> < </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC10"> > </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> << </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> -+</TR></TABLE> -+<H2> 1.4 Examples </H2> -+<!--docid::SEC9::--> -+<P> -+ -+Run the command `<SAMP>wc /etc/hosts</SAMP>' and show the default information: -+</P> -+<P> -+ -+<TABLE><tr><td> </td><td class=example><pre>eg$ time wc /etc/hosts -+ 35 111 1134 /etc/hosts -+0.00user 0.01system 0:00.04elapsed 25%CPU (0avgtext+0avgdata 0maxresident)k -+1inputs+1outputs (0major+0minor)pagefaults 0swaps -+</pre></td></tr></table><P> -+ -+Run the command `<SAMP>ls -Fs</SAMP>' and show just the user, system, and -+wall-clock time: -+</P> -+<P> -+ -+<TABLE><tr><td> </td><td class=example><pre>eg$ time -f "\t%E real,\t%U user,\t%S sys" ls -Fs -+total 16 -+1 account/ 1 db/ 1 mail/ 1 run/ -+1 backups/ 1 emacs/ 1 msgs/ 1 rwho/ -+1 crash/ 1 games/ 1 preserve/ 1 spool/ -+1 cron/ 1 log/ 1 quotas/ 1 tmp/ -+ 0:00.03 real, 0.00 user, 0.01 sys -+</pre></td></tr></table><P> -+ -+Edit the file `<TT>.bashrc</TT>' and have <CODE>time</CODE> append the elapsed time -+and number of signals to the file `<TT>log</TT>', reading the format string -+from the environment variable <CODE>TIME</CODE>: -+</P> -+<P> -+ -+<TABLE><tr><td> </td><td class=example><pre>eg$ export TIME="\t%E,\t%k" # If using bash or ksh -+eg$ setenv TIME "\t%E,\t%k" # If using csh or tcsh -+eg$ time -a -o log emacs .bashrc -+eg$ cat log -+ 0:16.55, 726 -+</pre></td></tr></table><P> -+ -+Run the command `<SAMP>sleep 4</SAMP>' and show all of the information about it -+verbosely: -+</P> -+<P> -+ -+<TABLE><tr><td> </td><td class=example><pre>eg$ time -v sleep 4 -+ Command being timed: "sleep 4" -+ User time (seconds): 0.00 -+ System time (seconds): 0.05 -+ Percent of CPU this job got: 1% -+ Elapsed (wall clock) time (h:mm:ss or m:ss): 0:04.26 -+ Average shared text size (kbytes): 36 -+ Average unshared data size (kbytes): 24 -+ Average stack size (kbytes): 0 -+ Average total size (kbytes): 60 -+ Maximum resident set size (kbytes): 32 -+ Average resident set size (kbytes): 24 -+ Major (requiring I/O) page faults: 3 -+ Minor (reclaiming a frame) page faults: 0 -+ Voluntary context switches: 11 -+ Involuntary context switches: 0 -+ Swaps: 0 -+ File system inputs: 3 -+ File system outputs: 1 -+ Socket messages sent: 0 -+ Socket messages received: 0 -+ Signals delivered: 1 -+ Page size (bytes): 4096 -+ Exit status: 0 -+</pre></td></tr></table><P> -+ -+<A NAME="Accuracy"></A> -+<HR SIZE="6"> -+<A NAME="SEC10"></A> -+<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> -+<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC9"> < </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC11"> > </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> << </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> -+</TR></TABLE> -+<H2> 1.5 Accuracy </H2> -+<!--docid::SEC10::--> -+<P> -+ -+The elapsed time is not collected atomically with the execution of the -+program; as a result, in bizarre circumstances (if the <CODE>time</CODE> -+command gets stopped or swapped out in between when the program being -+timed exits and when <CODE>time</CODE> calculates how long it took to run), it -+could be much larger than the actual execution time. -+</P> -+<P> -+ -+When the running time of a command is very nearly zero, some values -+(e.g., the percentage of CPU used) may be reported as either zero (which -+is wrong) or a question mark. -+</P> -+<P> -+ -+Most information shown by <CODE>time</CODE> is derived from the <CODE>wait3</CODE> -+system call. The numbers are only as good as those returned by -+<CODE>wait3</CODE>. Many systems do not measure all of the resources that -+<CODE>time</CODE> can report on; those resources are reported as zero. The -+systems that measure most or all of the resources are based on 4.2 or -+4.3BSD. Later BSD releases use different memory management code that -+measures fewer resources. -+</P> -+<P> -+ -+On systems that do not have a <CODE>wait3</CODE> call that returns status -+information, the <CODE>times</CODE> system call is used instead. It provides -+much less information than <CODE>wait3</CODE>, so on those systems <CODE>time</CODE> -+reports most of the resources as zero. -+</P> -+<P> -+ -+The `<SAMP>%I</SAMP>' and `<SAMP>%O</SAMP>' values are allegedly only "real" input -+and output and do not include those supplied by caching devices. The -+meaning of "real" I/O reported by `<SAMP>%I</SAMP>' and `<SAMP>%O</SAMP>' may be -+muddled for workstations, especially diskless ones. -+</P> -+<P> -+ -+<A NAME="Invoking time"></A> -+<HR SIZE="6"> -+<A NAME="SEC11"></A> -+<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> -+<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC10"> < </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[ > ]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC1"> << </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top"> Up </A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[ >> ]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT"> <TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> -+</TR></TABLE> -+<H2> 1.6 Running the <CODE>time</CODE> Command </H2> -+<!--docid::SEC11::--> -+<P> -+ -+The format of the <CODE>time</CODE> command is: -+</P> -+<P> -+ -+<TABLE><tr><td> </td><td class=example><pre>time [option<small>...</small>] <VAR>command</VAR> [<VAR>arg</VAR><small>...</small>] -+</pre></td></tr></table><P> -+ -+<A NAME="IDX5"></A> -+<CODE>time</CODE> runs the program <VAR>command</VAR>, with any given arguments -+<VAR>arg</VAR><small>...</small>. When <VAR>command</VAR> finishes, <CODE>time</CODE> displays -+information about resources used by <VAR>command</VAR> (on the standard error -+output, by default). If <VAR>command</VAR> exits with non-zero status or is -+terminated by a signal, <CODE>time</CODE> displays a warning message and the -+exit status or signal number. -+</P> -+<P> -+ -+Options to <CODE>time</CODE> must appear on the command line before -+<VAR>command</VAR>. Anything on the command line after <VAR>command</VAR> is -+passed as arguments to <VAR>command</VAR>. -+</P> -+<P> -+ -+</P> -+<DL COMPACT> -+<DT><CODE>-o <VAR>file</VAR></CODE> -+<DD><DT><CODE>--output=<VAR>file</VAR></CODE> -+<DD>Write the resource use statistics to <VAR>file</VAR>. -+<P> -+ -+</P> -+<DT><CODE>-a</CODE> -+<DD><DT><CODE>--append</CODE> -+<DD><EM>Append</EM> the resource use information to the output file instead -+of overwriting it. -+<P> -+ -+</P> -+<DT><CODE>-f <VAR>format</VAR></CODE> -+<DD><DT><CODE>--format=<VAR>format</VAR></CODE> -+<DD>Use <VAR>format</VAR> as the format string. -+<P> -+ -+</P> -+<DT><CODE>--help</CODE> -+<DD>Print a summary of the command line options to <CODE>time</CODE> and exit. -+<P> -+ -+</P> -+<DT><CODE>-p</CODE> -+<DD><DT><CODE>--portability</CODE> -+<DD>Use the POSIX format. -+<P> -+ -+</P> -+<DT><CODE>-v</CODE> -+<DD><DT><CODE>--verbose</CODE> -+<DD><A NAME="IDX6"></A> -+Use the built-in verbose format. -+<P> -+ -+</P> -+<DT><CODE>-V</CODE> -+<DD><DT><CODE>--version</CODE> -+<DD><A NAME="IDX7"></A> -+Print the version number of <CODE>time</CODE> and exit. -+</DL> -+<P> -+ -+<HR SIZE="6"> -+<A NAME="SEC_Contents"></A> -+<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> -+<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> -+</TR></TABLE> -+<H1>Table of Contents</H1> -+<BLOCKQUOTE> -+<A NAME="TOC1" HREF="time.html#SEC1">1. Measuring Program Resource Use</A> -+<BR> -+<BLOCKQUOTE> -+<A NAME="TOC2" HREF="time.html#SEC2">1.1 Setting the Output Format</A> -+<BR> -+<A NAME="TOC3" HREF="time.html#SEC3">1.2 The Format String</A> -+<BR> -+<BLOCKQUOTE> -+<A NAME="TOC4" HREF="time.html#SEC4">1.2.1 Time Resources</A> -+<BR> -+<A NAME="TOC5" HREF="time.html#SEC5">1.2.2 Memory Resources</A> -+<BR> -+<A NAME="TOC6" HREF="time.html#SEC6">1.2.3 I/O Resources</A> -+<BR> -+<A NAME="TOC7" HREF="time.html#SEC7">1.2.4 Command Info</A> -+<BR> -+</BLOCKQUOTE> -+<A NAME="TOC8" HREF="time.html#SEC8">1.3 Redirecting Output</A> -+<BR> -+<A NAME="TOC9" HREF="time.html#SEC9">1.4 Examples</A> -+<BR> -+<A NAME="TOC10" HREF="time.html#SEC10">1.5 Accuracy</A> -+<BR> -+<A NAME="TOC11" HREF="time.html#SEC11">1.6 Running the <CODE>time</CODE> Command</A> -+<BR> -+</BLOCKQUOTE> -+</BLOCKQUOTE> -+<HR SIZE=1> -+<A NAME="SEC_OVERVIEW"></A> -+<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> -+<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> -+</TR></TABLE> -+<H1>Short Table of Contents</H1> -+<BLOCKQUOTE> -+<A NAME="TOC1" HREF="time.html#SEC1">1. Measuring Program Resource Use</A> -+<BR> -+ -+</BLOCKQUOTE> -+<HR SIZE=1> -+<A NAME="SEC_About"></A> -+<TABLE CELLPADDING=1 CELLSPACING=1 BORDER=0> -+<TR><TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Top">Top</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_Contents">Contents</A>]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[Index]</TD> -+<TD VALIGN="MIDDLE" ALIGN="LEFT">[<A HREF="time.html#SEC_About"> ? </A>]</TD> -+</TR></TABLE> -+<H1>About this document</H1> -+This document was generated -+by -+using <A HREF="http://texi2html.cvshome.org"><I>texi2html</I></A> -+<P></P> -+The buttons in the navigation panels have the following meaning: -+<P></P> -+<table border = "1"> -+<TR> -+<TH> Button </TH> -+<TH> Name </TH> -+<TH> Go to </TH> -+<TH> From 1.2.3 go to</TH> -+</TR> -+<TR> -+<TD ALIGN="CENTER"> -+ [ < ] </TD> -+<TD ALIGN="CENTER"> -+Back -+</TD> -+<TD> -+previous section in reading order -+</TD> -+<TD> -+1.2.2 -+</TD> -+</TR> -+<TR> -+<TD ALIGN="CENTER"> -+ [ > ] </TD> -+<TD ALIGN="CENTER"> -+Forward -+</TD> -+<TD> -+next section in reading order -+</TD> -+<TD> -+1.2.4 -+</TD> -+</TR> -+<TR> -+<TD ALIGN="CENTER"> -+ [ << ] </TD> -+<TD ALIGN="CENTER"> -+FastBack -+</TD> -+<TD> -+beginning of this chapter or previous chapter -+</TD> -+<TD> -+1 -+</TD> -+</TR> -+<TR> -+<TD ALIGN="CENTER"> -+ [ Up ] </TD> -+<TD ALIGN="CENTER"> -+Up -+</TD> -+<TD> -+up section -+</TD> -+<TD> -+1.2 -+</TD> -+</TR> -+<TR> -+<TD ALIGN="CENTER"> -+ [ >> ] </TD> -+<TD ALIGN="CENTER"> -+FastForward -+</TD> -+<TD> -+next chapter -+</TD> -+<TD> -+2 -+</TD> -+</TR> -+<TR> -+<TD ALIGN="CENTER"> -+ [Top] </TD> -+<TD ALIGN="CENTER"> -+Top -+</TD> -+<TD> -+cover (top) of document -+</TD> -+<TD> -+ -+</TD> -+</TR> -+<TR> -+<TD ALIGN="CENTER"> -+ [Contents] </TD> -+<TD ALIGN="CENTER"> -+Contents -+</TD> -+<TD> -+table of contents -+</TD> -+<TD> -+ -+</TD> -+</TR> -+<TR> -+<TD ALIGN="CENTER"> -+ [Index] </TD> -+<TD ALIGN="CENTER"> -+Index -+</TD> -+<TD> -+concept index -+</TD> -+<TD> -+ -+</TD> -+</TR> -+<TR> -+<TD ALIGN="CENTER"> -+ [ ? ] </TD> -+<TD ALIGN="CENTER"> -+About -+</TD> -+<TD> -+this page -+</TD> -+<TD> -+ -+</TD> -+</TR> -+</TABLE> -+ <P> -+ where the <STRONG> Example </STRONG> assumes that the current position -+ is at <STRONG> Subsubsection One-Two-Three </STRONG> of a document of -+ the following structure:</P> -+ <UL> -+ <LI> 1. Section One -+ <UL> -+ <LI>1.1 Subsection One-One -+ <UL> -+ <LI>...</LI> -+ </UL> -+ <LI>1.2 Subsection One-Two -+ <UL> -+ <LI>1.2.1 Subsubsection One-Two-One</LI> -+ <LI>1.2.2 Subsubsection One-Two-Two</LI> -+ <LI>1.2.3 Subsubsection One-Two-Three -+ <STRONG><== Current Position </STRONG></LI> -+ <LI>1.2.4 Subsubsection One-Two-Four</LI> -+ </UL> -+ </LI> -+ <LI>1.3 Subsection One-Three -+ <UL> -+ <LI>...</LI> -+ </UL> -+ </LI> -+ <LI>1.4 Subsection One-Four</LI> -+ </UL> -+ </LI> -+ </UL> -+ -+<HR SIZE=1> -+<BR> -+<FONT SIZE="-1"> -+This document was generated -+by <I>root</I> on <I>September, 1 2003</I> -+using <A HREF="http://texi2html.cvshome.org"><I>texi2html</I></A> -+</FONT> -+ -+</BODY> -+</HTML> diff --git a/import-layers/yocto-poky/meta/recipes-extended/time/time_1.7.bb b/import-layers/yocto-poky/meta/recipes-extended/time/time_1.7.bb deleted file mode 100644 index 92c5353d0..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/time/time_1.7.bb +++ /dev/null @@ -1,11 +0,0 @@ -require time.inc - -PR = "r2" - -SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz \ - file://debian.patch" - -SRC_URI[md5sum] = "e38d2b8b34b1ca259cf7b053caac32b3" -SRC_URI[sha256sum] = "e37ea79a253bf85a85ada2f7c632c14e481a5fd262a362f6f4fd58e68601496d" - -inherit autotools diff --git a/import-layers/yocto-poky/meta/recipes-extended/time/time.inc b/import-layers/yocto-poky/meta/recipes-extended/time/time_1.8.bb index 6b20d7c52..fb3147a73 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/time/time.inc +++ b/import-layers/yocto-poky/meta/recipes-extended/time/time_1.8.bb @@ -3,8 +3,8 @@ DESCRIPTION = "time measures many of the CPU resources, such as time and \ memory, that other programs use." HOMEPAGE = "http://www.gnu.org/software/time/" SECTION = "utils" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" inherit texinfo update-alternatives @@ -12,3 +12,10 @@ ALTERNATIVE_${PN} = "time" ALTERNATIVE_PRIORITY = "100" BBCLASSEXTEND = "native nativesdk" + +SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz" + +SRC_URI[md5sum] = "4e00dcb8c3ab11c7cf5a0d698828ac96" +SRC_URI[sha256sum] = "8a2f540155961a35ba9b84aec5e77e3ae36c74cecb4484db455960601b7a2e1b" + +inherit autotools diff --git a/import-layers/yocto-poky/meta/recipes-extended/tzcode/files/0001-Fix-Makefile-quoting-bug.patch b/import-layers/yocto-poky/meta/recipes-extended/tzcode/files/0001-Fix-Makefile-quoting-bug.patch deleted file mode 100644 index e49fa0964..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/tzcode/files/0001-Fix-Makefile-quoting-bug.patch +++ /dev/null @@ -1,174 +0,0 @@ -From b520d20b8122a783f99f088758b78d928f70ee34 Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@cs.ucla.edu> -Date: Mon, 23 Oct 2017 11:42:45 -0700 -Subject: [PATCH] Fix Makefile quoting bug - -Problem with INSTALLARGS reported by Zefram in: -https://mm.icann.org/pipermail/tz/2017-October/025360.html -Fix similar problems too. -* Makefile (ZIC_INSTALL, VALIDATE_ENV, CC, install) -(INSTALL, version, INSTALLARGS, right_posix, posix_right) -(check_public): Use apostrophes to prevent undesirable -interpretation of names by the shell. We still do not support -directory names containing apostrophes or newlines, but this is -good enough. - -Upstream-Status: Backport -Signed-off-by: Armin Kuster <akuster@mvista.com> - -* NEWS: Mention this. ---- - Makefile | 64 ++++++++++++++++++++++++++++++++-------------------------------- - NEWS | 8 ++++++++ - 2 files changed, 40 insertions(+), 32 deletions(-) - -diff --git a/Makefile b/Makefile -index c92edc0..97649ca 100644 ---- a/Makefile -+++ b/Makefile -@@ -313,7 +313,7 @@ ZFLAGS= - - # How to use zic to install tz binary files. - --ZIC_INSTALL= $(ZIC) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS) -+ZIC_INSTALL= $(ZIC) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS) - - # The name of a Posix-compliant 'awk' on your system. - AWK= awk -@@ -341,8 +341,8 @@ SGML_CATALOG_FILES= \ - VALIDATE = nsgmls - VALIDATE_FLAGS = -s -B -wall -wno-unused-param - VALIDATE_ENV = \ -- SGML_CATALOG_FILES=$(SGML_CATALOG_FILES) \ -- SGML_SEARCH_PATH=$(SGML_SEARCH_PATH) \ -+ SGML_CATALOG_FILES='$(SGML_CATALOG_FILES)' \ -+ SGML_SEARCH_PATH='$(SGML_SEARCH_PATH)' \ - SP_CHARSET_FIXED=YES \ - SP_ENCODING=UTF-8 - -@@ -396,7 +396,7 @@ GZIPFLAGS= -9n - #MAKE= make - - cc= cc --CC= $(cc) -DTZDIR=\"$(TZDIR)\" -+CC= $(cc) -DTZDIR='"$(TZDIR)"' - - AR= ar - -@@ -473,29 +473,29 @@ all: tzselect yearistype zic zdump libtz.a $(TABDATA) - ALL: all date $(ENCHILADA) - - install: all $(DATA) $(REDO) $(MANS) -- mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \ -- $(DESTDIR)$(LIBDIR) \ -- $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ -- $(DESTDIR)$(MANDIR)/man8 -+ mkdir -p '$(DESTDIR)$(ETCDIR)' '$(DESTDIR)$(TZDIR)' \ -+ '$(DESTDIR)$(LIBDIR)' \ -+ '$(DESTDIR)$(MANDIR)/man3' '$(DESTDIR)$(MANDIR)/man5' \ -+ '$(DESTDIR)$(MANDIR)/man8' - $(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES) -- cp -f $(TABDATA) $(DESTDIR)$(TZDIR)/. -- cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. -- cp libtz.a $(DESTDIR)$(LIBDIR)/. -- $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a -- cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/. -- cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/. -- cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/. -+ cp -f $(TABDATA) '$(DESTDIR)$(TZDIR)/.' -+ cp tzselect zic zdump '$(DESTDIR)$(ETCDIR)/.' -+ cp libtz.a '$(DESTDIR)$(LIBDIR)/.' -+ $(RANLIB) '$(DESTDIR)$(LIBDIR)/libtz.a' -+ cp -f newctime.3 newtzset.3 '$(DESTDIR)$(MANDIR)/man3/.' -+ cp -f tzfile.5 '$(DESTDIR)$(MANDIR)/man5/.' -+ cp -f tzselect.8 zdump.8 zic.8 '$(DESTDIR)$(MANDIR)/man8/.' - - INSTALL: ALL install date.1 -- mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 -- cp date $(DESTDIR)$(BINDIR)/. -- cp -f date.1 $(DESTDIR)$(MANDIR)/man1/. -+ mkdir -p '$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man1' -+ cp date '$(DESTDIR)$(BINDIR)/.' -+ cp -f date.1 '$(DESTDIR)$(MANDIR)/man1/.' - - version: $(VERSION_DEPS) - { (type git) >/dev/null 2>&1 && \ - V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \ - --abbrev=7 --dirty` || \ -- V=$(VERSION); } && \ -+ V='$(VERSION)'; } && \ - printf '%s\n' "$$V" >$@.out - mv $@.out $@ - -@@ -529,12 +529,12 @@ leapseconds: $(LEAP_DEPS) - # Arguments to pass to submakes of install_data. - # They can be overridden by later submake arguments. - INSTALLARGS = \ -- BACKWARD=$(BACKWARD) \ -- DESTDIR=$(DESTDIR) \ -+ BACKWARD='$(BACKWARD)' \ -+ DESTDIR='$(DESTDIR)' \ - LEAPSECONDS='$(LEAPSECONDS)' \ - PACKRATDATA='$(PACKRATDATA)' \ -- TZDIR=$(TZDIR) \ -- YEARISTYPE=$(YEARISTYPE) \ -+ TZDIR='$(TZDIR)' \ -+ YEARISTYPE='$(YEARISTYPE)' \ - ZIC='$(ZIC)' - - # 'make install_data' installs one set of tz binary files. -@@ -558,16 +558,16 @@ right_only: - # You must replace all of $(TZDIR) to switch from not using leap seconds - # to using them, or vice versa. - right_posix: right_only -- rm -fr $(DESTDIR)$(TZDIR)-leaps -- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \ -- $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-leaps right_only -- $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-posix posix_only -+ rm -fr '$(DESTDIR)$(TZDIR)-leaps' -+ ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-leaps' || \ -+ $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only -+ $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only - - posix_right: posix_only -- rm -fr $(DESTDIR)$(TZDIR)-posix -- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \ -- $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-posix posix_only -- $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-leaps right_only -+ rm -fr '$(DESTDIR)$(TZDIR)-posix' -+ ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-posix' || \ -+ $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only -+ $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only - - # This obsolescent rule is present for backwards compatibility with - # tz releases 2014g through 2015g. It should go away eventually. -@@ -764,7 +764,7 @@ set-timestamps.out: $(ENCHILADA) - - check_public: - $(MAKE) maintainer-clean -- $(MAKE) "CFLAGS=$(GCC_DEBUG_FLAGS)" ALL -+ $(MAKE) CFLAGS='$(GCC_DEBUG_FLAGS)' ALL - mkdir -p public.dir - for i in $(TDATA) tzdata.zi; do \ - $(zic) -v -d public.dir $$i 2>&1 || exit; \ -diff --git a/NEWS b/NEWS -index bd2bec2..75ab095 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,5 +1,13 @@ - News for the tz database - -+Unreleased, experimental changes -+ -+ Changes to build procedure -+ -+ The Makefile now quotes values like BACKWARD more carefully when -+ passing them to the shell. (Problem reported by Zefram.) -+ -+ - Release 2017c - 2017-10-20 14:49:34 -0700 - - Briefly: --- -2.7.4 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/tzcode/files/0002-Port-zdump-to-C90-snprintf.patch b/import-layers/yocto-poky/meta/recipes-extended/tzcode/files/0002-Port-zdump-to-C90-snprintf.patch deleted file mode 100644 index 87afe4769..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/tzcode/files/0002-Port-zdump-to-C90-snprintf.patch +++ /dev/null @@ -1,115 +0,0 @@ -From e231da4fb2beb17c60b4b1a5c276366d6a6e433f Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@cs.ucla.edu> -Date: Mon, 23 Oct 2017 17:58:36 -0700 -Subject: [PATCH] Port zdump to C90 + snprintf -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Problem reported by Jon Skeet in: -https://mm.icann.org/pipermail/tz/2017-October/025362.html -* NEWS: Mention this. -* zdump.c (my_snprintf): New macro or function. If a macro, it is -just snprintf. If a function, it is the same as the old snprintf -static function, with an ATTRIBUTE_FORMAT to pacify modern GCC. -All uses of snprintf changed to use my_snprintf. This way, -installers don’t need to specify -DHAVE_SNPRINTF if they are using -a pre-C99 compiler with a library that has snprintf. - -Upstream-Status: Backport -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - NEWS | 4 ++++ - zdump.c | 29 ++++++++++++++++------------- - 2 files changed, 20 insertions(+), 13 deletions(-) - -diff --git a/NEWS b/NEWS -index 75ab095..dea08b8 100644 ---- a/NEWS -+++ b/NEWS -@@ -7,6 +7,10 @@ Unreleased, experimental changes - The Makefile now quotes values like BACKWARD more carefully when - passing them to the shell. (Problem reported by Zefram.) - -+ Builders no longer need to specify -DHAVE_SNPRINTF on platforms -+ that have snprintf and use pre-C99 compilers. (Problem reported -+ by Jon Skeet.) -+ - - Release 2017c - 2017-10-20 14:49:34 -0700 - -diff --git a/zdump.c b/zdump.c -index 8e3bf3e..d4e6084 100644 ---- a/zdump.c -+++ b/zdump.c -@@ -795,12 +795,14 @@ show(timezone_t tz, char *zone, time_t t, bool v) - abbrok(abbr(tmp), zone); - } - --#if !HAVE_SNPRINTF -+#if HAVE_SNPRINTF -+# define my_snprintf snprintf -+#else - # include <stdarg.h> - - /* A substitute for snprintf that is good enough for zdump. */ --static int --snprintf(char *s, size_t size, char const *format, ...) -+static int ATTRIBUTE_FORMAT((printf, 3, 4)) -+my_snprintf(char *s, size_t size, char const *format, ...) - { - int n; - va_list args; -@@ -839,10 +841,10 @@ format_local_time(char *buf, size_t size, struct tm const *tm) - { - int ss = tm->tm_sec, mm = tm->tm_min, hh = tm->tm_hour; - return (ss -- ? snprintf(buf, size, "%02d:%02d:%02d", hh, mm, ss) -+ ? my_snprintf(buf, size, "%02d:%02d:%02d", hh, mm, ss) - : mm -- ? snprintf(buf, size, "%02d:%02d", hh, mm) -- : snprintf(buf, size, "%02d", hh)); -+ ? my_snprintf(buf, size, "%02d:%02d", hh, mm) -+ : my_snprintf(buf, size, "%02d", hh)); - } - - /* Store into BUF, of size SIZE, a formatted UTC offset for the -@@ -877,10 +879,10 @@ format_utc_offset(char *buf, size_t size, struct tm const *tm, time_t t) - mm = off / 60 % 60; - hh = off / 60 / 60; - return (ss || 100 <= hh -- ? snprintf(buf, size, "%c%02ld%02d%02d", sign, hh, mm, ss) -+ ? my_snprintf(buf, size, "%c%02ld%02d%02d", sign, hh, mm, ss) - : mm -- ? snprintf(buf, size, "%c%02ld%02d", sign, hh, mm) -- : snprintf(buf, size, "%c%02ld", sign, hh)); -+ ? my_snprintf(buf, size, "%c%02ld%02d", sign, hh, mm) -+ : my_snprintf(buf, size, "%c%02ld", sign, hh)); - } - - /* Store into BUF (of size SIZE) a quoted string representation of P. -@@ -983,15 +985,16 @@ istrftime(char *buf, size_t size, char const *time_fmt, - for (abp = ab; is_alpha(*abp); abp++) - continue; - len = (!*abp && *ab -- ? snprintf(b, s, "%s", ab) -+ ? my_snprintf(b, s, "%s", ab) - : format_quoted_string(b, s, ab)); - if (s <= len) - return false; - b += len, s -= len; - } -- formatted_len = (tm->tm_isdst -- ? snprintf(b, s, &"\t\t%d"[show_abbr], tm->tm_isdst) -- : 0); -+ formatted_len -+ = (tm->tm_isdst -+ ? my_snprintf(b, s, &"\t\t%d"[show_abbr], tm->tm_isdst) -+ : 0); - } - break; - } --- -2.7.4 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/tzcode/tzcode-native_2018c.bb b/import-layers/yocto-poky/meta/recipes-extended/tzcode/tzcode-native_2018d.bb index 85e9b70ac..7933a5df9 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/tzcode/tzcode-native_2018c.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/tzcode/tzcode-native_2018d.bb @@ -11,10 +11,10 @@ SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" -SRC_URI[tzcode.md5sum] = "e6e0d4b2ce3fa6906f303157bed2612e" -SRC_URI[tzcode.sha256sum] = "31fa7fc0f94a6ff2d6bc878c0a35e8ab8b5aa0e8b01445a1d4a8f14777d0e665" -SRC_URI[tzdata.md5sum] = "c412b1531adef1be7a645ab734f86acc" -SRC_URI[tzdata.sha256sum] = "2825c3e4b7ef520f24d393bcc02942f9762ffd3e7fc9b23850789ed8f22933f6" +SRC_URI[tzcode.md5sum] = "96612b4f5d7e8804fd9a0981c021be90" +SRC_URI[tzcode.sha256sum] = "7de44e85baad748d217e3fd60706f599f9aec68bce6356b163f52b0dbd40a8d9" +SRC_URI[tzdata.md5sum] = "871a7ef808eb42ebc551acdb3d661554" +SRC_URI[tzdata.sha256sum] = "5106eddceb5f1ae3a91dbd3960e1b8b11ba0dc08579a31cf0724a7691b10c054" S = "${WORKDIR}" diff --git a/import-layers/yocto-poky/meta/recipes-extended/tzdata/tzdata_2018c.bb b/import-layers/yocto-poky/meta/recipes-extended/tzdata/tzdata_2018d.bb index ff5ec1cc4..f7fce80b7 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/tzdata/tzdata_2018c.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/tzdata/tzdata_2018d.bb @@ -9,8 +9,8 @@ DEPENDS = "tzcode-native" SRC_URI = "http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata" UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" -SRC_URI[tzdata.md5sum] = "c412b1531adef1be7a645ab734f86acc" -SRC_URI[tzdata.sha256sum] = "2825c3e4b7ef520f24d393bcc02942f9762ffd3e7fc9b23850789ed8f22933f6" +SRC_URI[tzdata.md5sum] = "871a7ef808eb42ebc551acdb3d661554" +SRC_URI[tzdata.sha256sum] = "5106eddceb5f1ae3a91dbd3960e1b8b11ba0dc08579a31cf0724a7691b10c054" inherit allarch @@ -171,7 +171,7 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ ${datadir}/zoneinfo/Asia/Dubai \ ${datadir}/zoneinfo/Asia/Karachi \ ${datadir}/zoneinfo/Asia/Dhaka \ - ${datadir}/zoneinfo/Asia/Bankok \ + ${datadir}/zoneinfo/Asia/Bangkok \ ${datadir}/zoneinfo/Asia/Hong_Kong \ ${datadir}/zoneinfo/Asia/Tokyo \ ${datadir}/zoneinfo/Australia/Darwin \ diff --git a/import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch b/import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch index c989df189..ca4aaadff 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch @@ -9,9 +9,11 @@ CVE: CVE-2014-8140 Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- a/extract.c -+++ b/extract.c -@@ -2232,10 +2232,17 @@ +Index: unzip60/extract.c +=================================================================== +--- unzip60.orig/extract.c ++++ unzip60/extract.c +@@ -2233,10 +2233,17 @@ static int test_compr_eb(__G__ eb, eb_si if (compr_offset < 4) /* field is not compressed: */ return PK_OK; /* do nothing and signal OK */ @@ -30,5 +32,5 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com> + ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN)))) + return IZ_EF_TRUNC; /* no/bad compressed data! */ - if ( - #ifdef INT_16BIT + method = makeword(eb + (EB_HEADSIZE + compr_offset)); + if ((method == STORED) && diff --git a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch b/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch new file mode 100644 index 000000000..338e0cd14 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch @@ -0,0 +1,68 @@ +From c1fe14fa5bd168292cc4670034bc48b954e9dac7 Mon Sep 17 00:00:00 2001 +From: "Maxin B. John" <maxin.john@intel.com> +Date: Tue, 13 Mar 2018 14:49:55 +0200 +Subject: [PATCH] watchdog: remove interdependencies of watchdog and + wd_keepalive services + +Since watchdog and watchdog-keepalive packages can't be installed +together, remove the inter-dependencies of watchdog and wd_keepalive +services + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- + debian/watchdog.service | 9 +++------ + debian/wd_keepalive.service | 10 +++++----- + 2 files changed, 8 insertions(+), 11 deletions(-) + +diff --git a/debian/watchdog.service b/debian/watchdog.service +index 7a2fc36..f31d1fe 100644 +--- a/debian/watchdog.service ++++ b/debian/watchdog.service +@@ -1,16 +1,13 @@ + [Unit] + Description=watchdog daemon +-Conflicts=wd_keepalive.service + After=multi-user.target +-OnFailure=wd_keepalive.service + + [Service] + Type=forking + EnvironmentFile=/etc/default/watchdog + ExecStartPre=/bin/sh -c '[ -z "${watchdog_module}" ] || [ "${watchdog_module}" = "none" ] || /sbin/modprobe $watchdog_module' +-ExecStart=/bin/sh -c '[ $run_watchdog != 1 ] || exec /usr/sbin/watchdog $watchdog_options' +-ExecStopPost=/bin/sh -c '[ $run_wd_keepalive != 1 ] || false' ++ExecStart=/bin/sh -c '[ x$run_watchdog != x1 ] || exec /usr/sbin/watchdog $watchdog_options' ++PIDFile=/var/run/watchdog.pid + + [Install] +-WantedBy=default.target +- ++WantedBy=multi-user.target +diff --git a/debian/wd_keepalive.service b/debian/wd_keepalive.service +index 45b018e..7f8b1dc 100644 +--- a/debian/wd_keepalive.service ++++ b/debian/wd_keepalive.service +@@ -1,13 +1,13 @@ + [Unit] + Description=watchdog keepalive daemon +-Before=watchdog.service shutdown.target +-Conflicts=watchdog.service shutdown.target ++After=multi-user.target + + [Service] + Type=forking + EnvironmentFile=/etc/default/watchdog + ExecStartPre=/bin/sh -c '[ -z "${watchdog_module}" ] || [ "${watchdog_module}" = "none" ] || /sbin/modprobe $watchdog_module' +-ExecStartPre=-/bin/systemctl reset-failed watchdog.service + ExecStart=/usr/sbin/wd_keepalive $watchdog_options +-ExecStartPost=/bin/sh -c 'ln -s /var/run/wd_keepalive.pid /run/sendsigs.omit.d/wd_keepalive.pid' +-ExecStopPost=/bin/sh -c 'rm -f /run/sendsigs.omit.d/wd_keepalive.pid' ++PIDFile=/var/run/wd_keepalive.pid ++ ++[Install] ++WantedBy=multi-user.target +-- +2.4.0 + diff --git a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch b/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch index e68ad545c..ec44c803b 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch @@ -1,14 +1,16 @@ Signed-off-by: Diego Rondini <diego.ml@zoho.com> Upstream-Status: Inappropriate ---- watchdog-5.13.orig/watchdog.conf 2013-02-01 12:15:44.000000000 +0100 -+++ watchdog-5.13/watchdog.conf 2014-11-13 10:59:43.233943000 +0100 -@@ -20,7 +20,7 @@ - #test-binary = - #test-timeout = +Index: watchdog-5.15/watchdog.conf +=================================================================== +--- watchdog-5.15.orig/watchdog.conf ++++ watchdog-5.15/watchdog.conf +@@ -28,7 +28,7 @@ + #retry-timeout = 60 + #repair-maximum = 1 -#watchdog-device = /dev/watchdog +watchdog-device = /dev/watchdog # Defaults compiled into the binary - #temperature-device = + #temperature-sensor = diff --git a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog_5.15.bb b/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog_5.15.bb index 3d0b72e08..37b37ae12 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog_5.15.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog_5.15.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ecc0551bf54ad97f6b541720f84d6569" SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \ file://0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch \ + file://0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch \ file://watchdog-init.patch \ file://watchdog-conf.patch \ file://wd_keepalive.init \ @@ -36,7 +37,9 @@ INITSCRIPT_PARAMS_${PN} = "start 15 1 2 3 4 5 . stop 85 0 6 ." INITSCRIPT_NAME_${PN}-keepalive = "wd_keepalive" INITSCRIPT_PARAMS_${PN}-keepalive = "start 15 1 2 3 4 5 . stop 85 0 6 ." -SYSTEMD_SERVICE_${PN} = "watchdog.service wd_keepalive.service" +SYSTEMD_PACKAGES = "${PN} ${PN}-keepalive" +SYSTEMD_SERVICE_${PN} = "watchdog.service" +SYSTEMD_SERVICE_${PN}-keepalive = "wd_keepalive.service" do_install_append() { install -d ${D}${systemd_system_unitdir} @@ -54,6 +57,7 @@ PACKAGES =+ "${PN}-keepalive" FILES_${PN}-keepalive = " \ ${sysconfdir}/init.d/wd_keepalive \ + ${systemd_system_unitdir}/wd_keepalive.service \ ${sbindir}/wd_keepalive \ " diff --git a/import-layers/yocto-poky/meta/recipes-extended/wget/wget.inc b/import-layers/yocto-poky/meta/recipes-extended/wget/wget.inc index 1299edb72..3cff656a6 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/wget/wget.inc +++ b/import-layers/yocto-poky/meta/recipes-extended/wget/wget.inc @@ -2,7 +2,7 @@ SUMMARY = "Console URL download utility supporting HTTP, FTP, etc" HOMEPAGE = "https://www.gnu.org/software/wget/" SECTION = "console/network" LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" DEPENDS = "gnutls zlib libpcre" inherit autotools gettext texinfo update-alternatives pkgconfig @@ -10,6 +10,9 @@ inherit autotools gettext texinfo update-alternatives pkgconfig EXTRA_OECONF = "--with-ssl=gnutls --disable-rpath --disable-iri \ --without-libgnutls-prefix ac_cv_header_uuid_uuid_h=no" +EXTRA_OEMAKE += 'TOOLCHAIN_OPTIONS="${TOOLCHAIN_OPTIONS}" \ + DEBUG_PREFIX_MAP="${DEBUG_PREFIX_MAP}"' + ALTERNATIVE_${PN} = "wget" ALTERNATIVE_${PN}_class-nativesdk = "" ALTERNATIVE_PRIORITY = "100" diff --git a/import-layers/yocto-poky/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch b/import-layers/yocto-poky/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch new file mode 100644 index 000000000..8781df21c --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch @@ -0,0 +1,61 @@ +From 7f1357529d23b356b45fbb0dd7388588162e4cb8 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Wed, 10 Jan 2018 14:43:20 +0800 +Subject: [PATCH] src/Makefile.am: improve reproducibility + +Remove build host references from the internally +generated file version.c. The references get compiled into +executables, which leads to non-reproducible builds. +The removed references (--sysroot, -fdebug-prefix-map) were +only used as part of the `wget --version' which do not have +side effect. + +... +$ wget --version +GNU Wget 1.14 built on linux-gnu. + ++digest +https +ipv6 +iri +large-file +nls +ntlm +opie +ssl/openssl + +Wgetrc: + /etc/wgetrc (system) +Locale: /usr/share/locale +Compile: gcc -DHAVE_CONFIG_H -DSYSTEM_WGETRC="/etc/wgetrc" + -DLOCALEDIR="/usr/share/locale" -I. -I../lib -I../lib -O2 -g -pipe + -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong + --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic +Link: gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions + -fstack-protector-strong --param=ssp-buffer-size=4 + -grecord-gcc-switches -m64 -mtune=generic -lssl -lcrypto + /usr/lib64/libssl.so /usr/lib64/libcrypto.so /usr/lib64/libz.so + -ldl -lz -lz -lidn -luuid -lpcre ftp-opie.o openssl.o http-ntlm.o + ../lib/libgnu.a +... + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + src/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 28c0be2..44084a3 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -87,9 +87,13 @@ version.c: $(wget_SOURCES) ../lib/libgnu.a + echo '#include "version.h"' >> $@ + echo 'const char *version_string = "@VERSION@";' >> $@ + echo 'const char *compilation_string = "'$(COMPILE)'";' \ ++ | sed -e "s,$(TOOLCHAIN_OPTIONS),,g" \ ++ -e "s,$(DEBUG_PREFIX_MAP),,g" \ + | $(ESCAPEQUOTE) >> $@ + echo 'const char *link_string = "'$(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) $(LIBS) $(wget_LDADD)'";' \ ++ | sed -e "s,$(TOOLCHAIN_OPTIONS),,g" \ ++ -e "s,$(DEBUG_PREFIX_MAP),,g" \ + | $(ESCAPEQUOTE) >> $@ + + css.c: $(srcdir)/css.l +-- +1.8.3.1 + diff --git a/import-layers/yocto-poky/meta/recipes-extended/wget/wget/CVE-2017-6508.patch b/import-layers/yocto-poky/meta/recipes-extended/wget/wget/CVE-2017-6508.patch deleted file mode 100644 index b9c290f65..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/wget/wget/CVE-2017-6508.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4d729e322fae359a1aefaafec1144764a54e8ad4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> -Date: Mon, 6 Mar 2017 10:04:22 +0100 -Subject: [PATCH] Fix CRLF injection in Wget host part - -* src/url.c (url_parse): Reject control characters in host part of URL - -Reported-by: Orange Tsai - -Upstream-Status: Backport -[http://git.savannah.gnu.org/cgit/wget.git/commit/?id=4d729e322fae359a1aefaafec1144764a54e8ad4] - -CVE: CVE-2017-6508 - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - src/url.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/url.c b/src/url.c -index 8f8ff0b..7d36b27 100644 ---- a/src/url.c -+++ b/src/url.c -@@ -925,6 +925,17 @@ url_parse (const char *url, int *error, struct iri *iri, bool percent_encode) - url_unescape (u->host); - host_modified = true; - -+ /* check for invalid control characters in host name */ -+ for (p = u->host; *p; p++) -+ { -+ if (c_iscntrl(*p)) -+ { -+ url_free(u); -+ error_code = PE_INVALID_HOST_NAME; -+ goto error; -+ } -+ } -+ - /* Apply IDNA regardless of iri->utf8_encode status */ - if (opt.enable_iri && iri) - { --- -2.7.4 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/wget/wget_1.19.1.bb b/import-layers/yocto-poky/meta/recipes-extended/wget/wget_1.19.1.bb deleted file mode 100644 index 78bde9595..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/wget/wget_1.19.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ - file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ - file://CVE-2017-6508.patch \ - " - -SRC_URI[md5sum] = "87cea36b7161fd43e3fd51a4e8b89689" -SRC_URI[sha256sum] = "9e4f12da38cc6167d0752d934abe27c7b1599a9af294e73829be7ac7b5b4da40" - -require wget.inc diff --git a/import-layers/yocto-poky/meta/recipes-extended/wget/wget_1.19.5.bb b/import-layers/yocto-poky/meta/recipes-extended/wget/wget_1.19.5.bb new file mode 100644 index 000000000..e37d8c784 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/wget/wget_1.19.5.bb @@ -0,0 +1,9 @@ +SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ + file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ + file://0002-improve-reproducibility.patch \ + " + +SRC_URI[md5sum] = "2db6f03d655041f82eb64b8c8a1fa7da" +SRC_URI[sha256sum] = "b39212abe1a73f2b28f4c6cb223c738559caac91d6e416a6d91d4b9d55c9faee" + +require wget.inc diff --git a/import-layers/yocto-poky/meta/recipes-extended/xdg-utils/xdg-utils_1.1.1.bb b/import-layers/yocto-poky/meta/recipes-extended/xdg-utils/xdg-utils_1.1.2.bb index 34f8d107b..7339289de 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/xdg-utils/xdg-utils_1.1.1.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/xdg-utils/xdg-utils_1.1.2.bb @@ -22,8 +22,8 @@ SRC_URI = "http://portland.freedesktop.org/download/${BPN}-${PV}.tar.gz \ file://0001-Don-t-build-the-in-script-manual.patch \ " -SRC_URI[md5sum] = "2d0aec6037769a5f138ff404b1bb4b15" -SRC_URI[sha256sum] = "b0dd63a2576e0bb16f1aa78d6ddf7d6784784a098d4df17161cd6a17c7bc4125" +SRC_URI[md5sum] = "361e75eb76c94d19f6f4f330d8ee626b" +SRC_URI[sha256sum] = "951952e2c6bb21214e0bb54e0dffa057d30f5563300225c24c16fba846258bcc" UPSTREAM_CHECK_REGEX = "xdg-utils-(?P<pver>((\d+[\.\-_]*)+)((rc|alpha|beta)\d+)?)\.(tar\.gz|tgz)" |
