diff options
Diffstat (limited to 'poky/meta/recipes-extended')
44 files changed, 979 insertions, 87 deletions
diff --git a/poky/meta/recipes-extended/asciidoc/asciidoc/auto-catalogs.patch b/poky/meta/recipes-extended/asciidoc/asciidoc/auto-catalogs.patch deleted file mode 100644 index ca170db00..000000000 --- a/poky/meta/recipes-extended/asciidoc/asciidoc/auto-catalogs.patch +++ /dev/null @@ -1,53 +0,0 @@ -If SGML_CATALOG_FILES is in the environment, pass --catalogs to xmllint and -xsltproc. Also pass --nonet to xsltproc to detect future missing stylesheet -problems. - -An earlier version of this patch was filed upstream at -https://github.com/asciidoc/asciidoc-py3/issues/61 so depending on how that goes -this could get merged. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/a2x.py b/a2x.py -index 2d7699a..582d809 100755 ---- a/a2x.py -+++ b/a2x.py -@@ -57,6 +57,10 @@ LYNX_OPTS = '-dump' - W3M_OPTS = '-dump -cols 70 -T text/html -no-graph' - XSLTPROC_OPTS = '' - -+if "SGML_CATALOG_FILES" in os.environ: -+ XMLLINT += " --catalogs" -+ XSLTPROC += " --catalogs" -+ - ###################################################################### - # End of configuration file parameters. - ###################################################################### -@@ -298,7 +302,7 @@ def exec_xsltproc(xsl_file, xml_file, dst_dir, opts = ''): - cwd = os.getcwd() - shell_cd(dst_dir) - try: -- shell('"%s" %s "%s" "%s"' % (XSLTPROC, opts, xsl_file, xml_file)) -+ shell('%s %s "%s" "%s"' % (XSLTPROC, opts, xsl_file, xml_file)) - finally: - shell_cd(cwd) - -@@ -483,7 +487,7 @@ class A2X(AttrDict): - self.asciidoc_opts += ' --doctype %s' % self.doctype - for attr in self.attributes: - self.asciidoc_opts += ' --attribute "%s"' % attr --# self.xsltproc_opts += ' --nonet' -+ self.xsltproc_opts += ' --nonet' - if self.verbose: - self.asciidoc_opts += ' --verbose' - self.dblatex_opts += ' -V' -@@ -634,7 +638,7 @@ class A2X(AttrDict): - shell('"%s" --backend docbook -a "a2x-format=%s" %s --out-file "%s" "%s"' % - (self.asciidoc, self.format, self.asciidoc_opts, docbook_file, self.asciidoc_file)) - if not self.no_xmllint and XMLLINT: -- shell('"%s" --nonet --noout --valid "%s"' % (XMLLINT, docbook_file)) -+ shell('%s --nonet --noout --valid "%s"' % (XMLLINT, docbook_file)) - - def to_xhtml(self): - self.to_docbook() diff --git a/poky/meta/recipes-extended/asciidoc/asciidoc_9.0.4.bb b/poky/meta/recipes-extended/asciidoc/asciidoc_9.1.0.bb index bb4248a5e..523bf33f4 100644 --- a/poky/meta/recipes-extended/asciidoc/asciidoc_9.0.4.bb +++ b/poky/meta/recipes-extended/asciidoc/asciidoc_9.1.0.bb @@ -8,9 +8,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4e5d1baf6f20559e3bec172226a47e4e \ file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 " -SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https;branch=main \ - file://auto-catalogs.patch" -SRCREV = "8de61a75572b5b8f90c1f87634aa3767472be7a7" +SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https;branch=9.x" +SRCREV = "9705d428439530104ce55d0ba12e8ef9d1b57ad1" DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" diff --git a/poky/meta/recipes-extended/bash/bash.inc b/poky/meta/recipes-extended/bash/bash.inc index db326660e..d3e1dfdb3 100644 --- a/poky/meta/recipes-extended/bash/bash.inc +++ b/poky/meta/recipes-extended/bash/bash.inc @@ -1,5 +1,6 @@ SUMMARY = "An sh-compatible command language interpreter" HOMEPAGE = "http://tiswww.case.edu/php/chet/bash/bashtop.html" +DESCRIPTION = "Bash is the GNU Project's Bourne Again SHell, a complete implementation of the IEEE POSIX and Open Group shell specification with interactive command line editing, job control on architectures that support it, csh-like features such as history substitution and brace expansion, and a slew of other features." SECTION = "base/shell" DEPENDS = "ncurses bison-native virtual/libiconv" diff --git a/poky/meta/recipes-extended/bc/bc_1.07.1.bb b/poky/meta/recipes-extended/bc/bc_1.07.1.bb index 4a5130249..ff3e8f440 100644 --- a/poky/meta/recipes-extended/bc/bc_1.07.1.bb +++ b/poky/meta/recipes-extended/bc/bc_1.07.1.bb @@ -1,5 +1,6 @@ SUMMARY = "Arbitrary precision calculator language" HOMEPAGE = "http://www.gnu.org/software/bc/bc.html" +DESCRIPTION = "bc is an arbitrary precision numeric processing language. Syntax is similar to C, but differs in many substantial areas. It supports interactive execution of statements." LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ diff --git a/poky/meta/recipes-extended/cracklib/cracklib_2.9.5.bb b/poky/meta/recipes-extended/cracklib/cracklib_2.9.5.bb index 82995219d..9cdb71f1a 100644 --- a/poky/meta/recipes-extended/cracklib/cracklib_2.9.5.bb +++ b/poky/meta/recipes-extended/cracklib/cracklib_2.9.5.bb @@ -1,5 +1,6 @@ SUMMARY = "Password strength checker library" -HOMEPAGE = "http://sourceforge.net/projects/cracklib" +HOMEPAGE = "https://github.com/cracklib/cracklib" +DESCRIPTION = "${SUMMARY}" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" diff --git a/poky/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb b/poky/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb index 02b016fdf..e726899c5 100644 --- a/poky/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb +++ b/poky/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb @@ -1,6 +1,7 @@ SUMMARY = "Collection of autoconf m4 macros" SECTION = "base" HOMEPAGE = "http://sourceforge.net/projects/cwautomacros.berlios/" +DESCRIPTION = "A collection of autoconf macros, plus an autogen.sh script that can be used with them." LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" diff --git a/poky/meta/recipes-extended/ed/ed_1.17.bb b/poky/meta/recipes-extended/ed/ed_1.17.bb index e905eed3c..addf652d5 100644 --- a/poky/meta/recipes-extended/ed/ed_1.17.bb +++ b/poky/meta/recipes-extended/ed/ed_1.17.bb @@ -1,5 +1,6 @@ SUMMARY = "Line-oriented text editor" HOMEPAGE = "http://www.gnu.org/software/ed/" +DESCRIPTION = "GNU ed is a line-oriented text editor. It is used to create, display, modify and otherwise manipulate text files, both interactively and via shell scripts. A restricted version of ed, red, can only edit files in the current directory and cannot execute shell commands." LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7 \ diff --git a/poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb b/poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb index d3f7525dc..c51f163e9 100644 --- a/poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb +++ b/poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb @@ -6,14 +6,15 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI = "git://${GO_IMPORT}" -SRCREV = "bcf50bfd7dcd8020c90965747d857ae42802e0c5" +SRCREV = "46695d81d1fae905a270fb7db8a4d11a334562fe" UPSTREAM_CHECK_COMMITS = "1" GO_IMPORT = "github.com/golang/example" GO_INSTALL = "${GO_IMPORT}/hello" GO_WORKDIR = "${GO_INSTALL}" +export GO111MODULE="off" -inherit go-mod +inherit go # This is just to make clear where this example is do_install_append() { diff --git a/poky/meta/recipes-extended/grep/grep_3.6.bb b/poky/meta/recipes-extended/grep/grep_3.6.bb index cb009b913..c17b96d7b 100644 --- a/poky/meta/recipes-extended/grep/grep_3.6.bb +++ b/poky/meta/recipes-extended/grep/grep_3.6.bb @@ -1,5 +1,6 @@ SUMMARY = "GNU grep utility" HOMEPAGE = "http://savannah.gnu.org/projects/grep/" +DESCRIPTION = "Grep searches one or more input files for lines containing a match to a specified pattern. By default, grep prints the matching lines." BUGTRACKER = "http://savannah.gnu.org/bugs/?group=grep" SECTION = "console/utils" LICENSE = "GPLv3" diff --git a/poky/meta/recipes-extended/libsolv/libsolv_0.7.17.bb b/poky/meta/recipes-extended/libsolv/libsolv_0.7.17.bb index 8597ea3ed..fa6e8a3c4 100644 --- a/poky/meta/recipes-extended/libsolv/libsolv_0.7.17.bb +++ b/poky/meta/recipes-extended/libsolv/libsolv_0.7.17.bb @@ -1,4 +1,5 @@ SUMMARY = "Library for solving packages and reading repositories" +DESCRIPTION = "This is libsolv, a free package dependency solver using a satisfiability algorithm for solving packages and reading repositories" HOMEPAGE = "https://github.com/openSUSE/libsolv" BUGTRACKER = "https://github.com/openSUSE/libsolv/issues" SECTION = "devel" diff --git a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb index 705ece8e1..cf7f47891 100644 --- a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb +++ b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb @@ -1,5 +1,6 @@ SUMMARY = "Lightweight high-performance web server" HOMEPAGE = "http://www.lighttpd.net/" +DESCRIPTION = "Lightweight high-performance web server is designed and optimized for high performance environments. With a small memory footprint compared to other web-servers, effective management of the cpu-load, and advanced feature set (FastCGI, SCGI, Auth, Output-Compression, URL-Rewriting and many more)" BUGTRACKER = "http://redmine.lighttpd.net/projects/lighttpd/issues" LICENSE = "BSD-3-Clause" diff --git a/poky/meta/recipes-extended/logrotate/logrotate_3.18.0.bb b/poky/meta/recipes-extended/logrotate/logrotate_3.18.0.bb index 270052f46..55684ac9f 100644 --- a/poky/meta/recipes-extended/logrotate/logrotate_3.18.0.bb +++ b/poky/meta/recipes-extended/logrotate/logrotate_3.18.0.bb @@ -1,6 +1,7 @@ SUMMARY = "Rotates, compresses, removes and mails system log files" SECTION = "console/utils" -HOMEPAGE = "https://github.com/logrotate/logrotate/issues" +HOMEPAGE = "https://github.com/logrotate/logrotate/" +DESCRIPTION = "The logrotate utility is designed to simplify the administration of log files on a system which generates a lot of log files." LICENSE = "GPLv2" # TODO: Document coreutils dependency. Why not RDEPENDS? Why not busybox? diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch b/poky/meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch new file mode 100644 index 000000000..c2a70dcb6 --- /dev/null +++ b/poky/meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch @@ -0,0 +1,40 @@ +From 2d1d6350af1db28ec520e26d0069a0518950b0a1 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Tue, 9 Mar 2021 15:21:11 +0000 +Subject: [PATCH 1/3] open_posix_testsuite/generate-makefiles.sh: Avoid + inconsistencies with make version + +With make 4.1, INSTALL_TARGETS+=<tab> will add a space to the variable whereas +with make 4.3, it will not. This leads to differing run.sh files in installed +in packages which is undesireable. If tests is empty we don't have to add +the line to the makefiles at all which seems like the easiest way to +avoid the differences in make behaviour. + +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2021-March/021386.html] + +--- + .../open_posix_testsuite/scripts/generate-makefiles.sh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh +index 200a631db..4b3aaa4a0 100755 +--- a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh ++++ b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh +@@ -148,8 +148,12 @@ EOF + + fi + +- cat >> "$makefile.2" <<EOF ++ if [ ! -z "${tests}" ]; then ++ cat >> "$makefile.2" <<EOF + INSTALL_TARGETS+= ${tests} ++EOF ++ fi ++ cat >> "$makefile.2" <<EOF + MAKE_TARGETS+= ${targets} + + EOF +-- +2.27.0 + diff --git a/poky/meta/recipes-extended/ltp/ltp/0002-Makefile-Avoid-wildcard-determinism-issues.patch b/poky/meta/recipes-extended/ltp/ltp/0002-Makefile-Avoid-wildcard-determinism-issues.patch new file mode 100644 index 000000000..4859c3eae --- /dev/null +++ b/poky/meta/recipes-extended/ltp/ltp/0002-Makefile-Avoid-wildcard-determinism-issues.patch @@ -0,0 +1,310 @@ +From 4030e28f2c2296ba138cb5e2495202f8aec7ba32 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Tue, 9 Mar 2021 15:21:36 +0000 +Subject: [PATCH 2/3] Makefile: Avoid wildcard determinism issues + +wildcard used in Makefiles preserves the order of the files on disk +which leads to differences in the order the binaries are linked. + +This patch tweaks the usage of wildcard to also have a sort, making +the binaries reproducible. A previous patch massively improved +the situation but wider testing showed that these other changes can +have an effect on some binaries, this patch avoids those issues as +exposed by our wider testing. + +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2021-March/021388.html] + +--- + include/mk/env_post.mk | 2 +- + include/mk/module.mk | 2 +- + runtest/Makefile | 2 +- + scenario_groups/Makefile | 2 +- + testcases/commands/ldd/datafiles/Makefile | 2 +- + testcases/kernel/hotplug/memory_hotplug/Makefile | 3 ++- + testcases/kernel/io/disktest/Makefile | 2 +- + testcases/kernel/io/disktest/Makefile.linux | 4 ++-- + testcases/kernel/sched/hyperthreading/ht_affinity/Makefile | 2 +- + testcases/kernel/sched/hyperthreading/ht_enabled/Makefile | 2 +- + testcases/kernel/sched/sched_stress/Makefile | 2 +- + testcases/kernel/syscalls/lchown/Makefile | 2 +- + testcases/kernel/syscalls/migrate_pages/Makefile | 2 +- + testcases/kernel/syscalls/move_pages/Makefile | 2 +- + testcases/kernel/syscalls/utils/compat_16.mk | 2 +- + testcases/kernel/syscalls/utils/newer_64.mk | 2 +- + testcases/misc/math/float/Makefile | 2 +- + testcases/network/nfs/nfs_stress/nfs05_make_tree.c | 4 ++-- + testcases/network/nfsv4/locks/Makefile | 2 +- + utils/sctp/func_tests/Makefile | 2 +- + 20 files changed, 23 insertions(+), 22 deletions(-) + +diff --git a/include/mk/env_post.mk b/include/mk/env_post.mk +index d52ad9f0b..1d22f9c53 100644 +--- a/include/mk/env_post.mk ++++ b/include/mk/env_post.mk +@@ -47,7 +47,7 @@ LDFLAGS += -L$(top_builddir)/lib/android_libpthread + LDFLAGS += -L$(top_builddir)/lib/android_librt + endif + +-MAKE_TARGETS ?= $(notdir $(patsubst %.c,%,$(wildcard $(abs_srcdir)/*.c))) ++MAKE_TARGETS ?= $(notdir $(patsubst %.c,%,$(sort $(wildcard $(abs_srcdir)/*.c)))) + MAKE_TARGETS := $(filter-out $(FILTER_OUT_MAKE_TARGETS),$(MAKE_TARGETS)) + + # with only *.dwo, .[0-9]+.dwo can not be cleaned +diff --git a/include/mk/module.mk b/include/mk/module.mk +index 95fb8336a..6c8814b96 100644 +--- a/include/mk/module.mk ++++ b/include/mk/module.mk +@@ -42,7 +42,7 @@ endif + + ifneq ($(filter install clean,$(MAKECMDGOALS)),) + MAKE_TARGETS := $(filter-out %.ko, $(MAKE_TARGETS)) +-MAKE_TARGETS += $(wildcard *.ko) ++MAKE_TARGETS += $(sort $(wildcard *.ko)) + endif + + CLEAN_TARGETS += .dep_modules *.mod built-in.a +diff --git a/runtest/Makefile b/runtest/Makefile +index b7caaee06..6a1565b6a 100644 +--- a/runtest/Makefile ++++ b/runtest/Makefile +@@ -36,7 +36,7 @@ ifneq ($(WITH_POWER_MANAGEMENT_TESTSUITE),yes) + UNWANTED_FILES += power_management_tests + endif + +-INSTALL_TARGETS := $(filter-out $(UNWANTED_FILES),$(notdir $(patsubst $(abs_srcdir)/%,%,$(wildcard $(abs_srcdir)/*)))) ++INSTALL_TARGETS := $(filter-out $(UNWANTED_FILES),$(notdir $(patsubst $(abs_srcdir)/%,%,$(sort $(wildcard $(abs_srcdir)/*))))) + + MAKE_TARGETS := + +diff --git a/scenario_groups/Makefile b/scenario_groups/Makefile +index 2978675d9..fcbc92708 100644 +--- a/scenario_groups/Makefile ++++ b/scenario_groups/Makefile +@@ -31,7 +31,7 @@ UNWANTED_FILES := Makefile + + INSTALL_MODE := 00644 + +-INSTALL_TARGETS := $(filter-out $(UNWANTED_FILES),$(notdir $(patsubst $(abs_srcdir)/%,%,$(wildcard $(abs_srcdir)/*)))) ++INSTALL_TARGETS := $(filter-out $(UNWANTED_FILES),$(notdir $(patsubst $(abs_srcdir)/%,%,$(sort $(wildcard $(abs_srcdir)/*))))) + + MAKE_TARGETS := + +diff --git a/testcases/commands/ldd/datafiles/Makefile b/testcases/commands/ldd/datafiles/Makefile +index d8bcf5c06..01c352052 100644 +--- a/testcases/commands/ldd/datafiles/Makefile ++++ b/testcases/commands/ldd/datafiles/Makefile +@@ -21,7 +21,7 @@ CPPFLAGS += -fpic + + INSTALL_TARGETS := ldd*.so lddfile.out + +-LDD_C_FILES := $(wildcard $(abs_srcdir)/lddfile*.c) ++LDD_C_FILES := $(sort $(wildcard $(abs_srcdir)/lddfile*.c)) + LDD_SO_FILES := $(patsubst $(abs_srcdir)/%.c,%.obj.so,$(LDD_C_FILES)) + MAKE_TARGETS := lddfile.out + CLEAN_TARGETS += *.obj $(LDD_SO_FILES) +diff --git a/testcases/kernel/hotplug/memory_hotplug/Makefile b/testcases/kernel/hotplug/memory_hotplug/Makefile +index d1ba65e65..38a77a2ba 100644 +--- a/testcases/kernel/hotplug/memory_hotplug/Makefile ++++ b/testcases/kernel/hotplug/memory_hotplug/Makefile +@@ -31,6 +31,7 @@ LDLIBS := $(filter-out -lltp,$(LDLIBS)) + + MAKE_TARGETS := memtoy + +-memtoy: $(patsubst $(abs_srcdir)/%.c,%.o,$(wildcard $(abs_srcdir)/*.c)) ++memtoy: $(patsubst $(abs_srcdir)/%.c,%.o,$(sort $(wildcard $(abs_srcdir)/*.c))) ++ + + include $(top_srcdir)/include/mk/generic_leaf_target.mk +diff --git a/testcases/kernel/io/disktest/Makefile b/testcases/kernel/io/disktest/Makefile +index d10d98434..3a3a9cbf0 100644 +--- a/testcases/kernel/io/disktest/Makefile ++++ b/testcases/kernel/io/disktest/Makefile +@@ -209,7 +209,7 @@ LDLIBS += -lpthread + + MAKE_TARGETS := disktest + +-OBJS := $(patsubst $(abs_srcdir)/%.c,%.o,$(wildcard $(abs_srcdir)/*.c)) ++OBJS := $(patsubst $(abs_srcdir)/%.c,%.o,$(sort $(wildcard $(abs_srcdir)/*.c))) + + disktest-$(VER): + mkdir -p "$@" +diff --git a/testcases/kernel/io/disktest/Makefile.linux b/testcases/kernel/io/disktest/Makefile.linux +index ea45b5a57..0f3aab622 100644 +--- a/testcases/kernel/io/disktest/Makefile.linux ++++ b/testcases/kernel/io/disktest/Makefile.linux +@@ -167,8 +167,8 @@ mandir=/usr/share/man + + VER=`grep VER_STR main.h | awk -F\" '{print $$2}'` + GBLHDRS=main.h globals.h defs.h +-ALLHDRS=$(wildcard *.h) +-SRCS=$(wildcard *.c) ++ALLHDRS=$(sort $(wildcard *.h)) ++SRCS=$(sort $(wildcard *.c)) + OBJS=$(SRCS:.c=.o) + + CFLAGS += -g -Wall -O -D"LINUX" -D"_THREAD_SAFE" -D"_GNU_SOURCE" -D"_LARGE_FILES" -D"_LARGEFILE64_SOURCE" -D"_FILE_OFFSET_BITS=64" $(RPM_OPT_FLAGS) +diff --git a/testcases/kernel/sched/hyperthreading/ht_affinity/Makefile b/testcases/kernel/sched/hyperthreading/ht_affinity/Makefile +index 10fec96dc..6b64bd261 100644 +--- a/testcases/kernel/sched/hyperthreading/ht_affinity/Makefile ++++ b/testcases/kernel/sched/hyperthreading/ht_affinity/Makefile +@@ -28,6 +28,6 @@ INSTALL_TARGETS := smt_smp_affinity.sh + + MAKE_TARGETS := ht_affinity + +-$(MAKE_TARGETS): $(patsubst $(abs_srcdir)/%.c,%.o,$(wildcard $(abs_srcdir)/*.c)) ++$(MAKE_TARGETS): $(patsubst $(abs_srcdir)/%.c,%.o,$(sort $(wildcard $(abs_srcdir)/*.c))) + + include $(top_srcdir)/include/mk/generic_leaf_target.mk +diff --git a/testcases/kernel/sched/hyperthreading/ht_enabled/Makefile b/testcases/kernel/sched/hyperthreading/ht_enabled/Makefile +index 9c1e139d6..585ff1383 100644 +--- a/testcases/kernel/sched/hyperthreading/ht_enabled/Makefile ++++ b/testcases/kernel/sched/hyperthreading/ht_enabled/Makefile +@@ -28,6 +28,6 @@ INSTALL_TARGETS := smt_smp_enabled.sh + + MAKE_TARGETS := ht_enabled + +-$(MAKE_TARGETS): $(patsubst $(abs_srcdir)/%.c,%.o,$(wildcard $(abs_srcdir)/*.c)) ++$(MAKE_TARGETS): $(patsubst $(abs_srcdir)/%.c,%.o,$(sort $(wildcard $(abs_srcdir)/*.c))) + + include $(top_srcdir)/include/mk/generic_leaf_target.mk +diff --git a/testcases/kernel/sched/sched_stress/Makefile b/testcases/kernel/sched/sched_stress/Makefile +index b76126c73..4dbbf3477 100644 +--- a/testcases/kernel/sched/sched_stress/Makefile ++++ b/testcases/kernel/sched/sched_stress/Makefile +@@ -10,7 +10,7 @@ INSTALL_TARGETS := sched_stress.sh + + LDLIBS += -lpthread + +-MAKE_TARGETS := $(filter-out sched,$(patsubst $(abs_srcdir)/%.c,%,$(wildcard $(abs_srcdir)/*.c))) ++MAKE_TARGETS := $(filter-out sched,$(patsubst $(abs_srcdir)/%.c,%,$(sort $(wildcard $(abs_srcdir)/*.c)))) + + RM += -r + +diff --git a/testcases/kernel/syscalls/lchown/Makefile b/testcases/kernel/syscalls/lchown/Makefile +index 13d39cb81..305fee281 100644 +--- a/testcases/kernel/syscalls/lchown/Makefile ++++ b/testcases/kernel/syscalls/lchown/Makefile +@@ -5,7 +5,7 @@ top_srcdir ?= ../../../.. + + include $(top_srcdir)/include/mk/testcases.mk + +-SRCS := $(wildcard $(abs_srcdir)/lchown*.c) ++SRCS := $(sort $(wildcard $(abs_srcdir)/lchown*.c)) + + include $(abs_srcdir)/../utils/compat_16.mk + +diff --git a/testcases/kernel/syscalls/migrate_pages/Makefile b/testcases/kernel/syscalls/migrate_pages/Makefile +index 46912b025..9cf3ce526 100644 +--- a/testcases/kernel/syscalls/migrate_pages/Makefile ++++ b/testcases/kernel/syscalls/migrate_pages/Makefile +@@ -5,7 +5,7 @@ top_srcdir ?= ../../../.. + + include $(top_srcdir)/include/mk/testcases.mk + +-MAKE_TARGETS := $(patsubst $(abs_srcdir)/%.c,%,$(wildcard $(abs_srcdir)/*[0-9].c)) ++MAKE_TARGETS := $(patsubst $(abs_srcdir)/%.c,%,$(sort $(wildcard $(abs_srcdir)/*[0-9].c))) + $(MAKE_TARGETS): %: migrate_pages_common.o + + CPPFLAGS += -I$(abs_srcdir)/../utils/ +diff --git a/testcases/kernel/syscalls/move_pages/Makefile b/testcases/kernel/syscalls/move_pages/Makefile +index cd7ff6349..4b22160ed 100644 +--- a/testcases/kernel/syscalls/move_pages/Makefile ++++ b/testcases/kernel/syscalls/move_pages/Makefile +@@ -7,7 +7,7 @@ include $(top_srcdir)/include/mk/testcases.mk + + CPPFLAGS += -I$(abs_srcdir)/../utils + +-MAKE_TARGETS := $(patsubst $(abs_srcdir)/%.c,%,$(wildcard $(abs_srcdir)/*[0-9].c)) ++MAKE_TARGETS := $(patsubst $(abs_srcdir)/%.c,%,$(sort $(wildcard $(abs_srcdir)/*[0-9].c))) + + $(MAKE_TARGETS): %: move_pages_support.o + +diff --git a/testcases/kernel/syscalls/utils/compat_16.mk b/testcases/kernel/syscalls/utils/compat_16.mk +index a0ff8f558..e81a00c40 100644 +--- a/testcases/kernel/syscalls/utils/compat_16.mk ++++ b/testcases/kernel/syscalls/utils/compat_16.mk +@@ -50,7 +50,7 @@ + + CPPFLAGS += -I$(abs_srcdir) -I$(abs_srcdir)/../utils + +-SRCS ?= $(wildcard $(abs_srcdir)/*.c) ++SRCS ?= $(sort $(wildcard $(abs_srcdir)/*.c)) + + MAKE_TARGETS := $(notdir $(patsubst %.c,%,$(SRCS))) + MAKE_TARGETS_OBJS_WO_COMPAT_16 := $(addsuffix .o,$(MAKE_TARGETS)) +diff --git a/testcases/kernel/syscalls/utils/newer_64.mk b/testcases/kernel/syscalls/utils/newer_64.mk +index 8cd7e03c8..5e798057a 100644 +--- a/testcases/kernel/syscalls/utils/newer_64.mk ++++ b/testcases/kernel/syscalls/utils/newer_64.mk +@@ -25,7 +25,7 @@ + + CPPFLAGS += -I$(abs_srcdir) -I$(abs_srcdir)/../utils + +-SRCS ?= $(wildcard $(abs_srcdir)/*.c) ++SRCS ?= $(sort $(wildcard $(abs_srcdir)/*.c)) + + MAKE_TARGETS := $(notdir $(patsubst %.c,%,$(SRCS))) + +diff --git a/testcases/misc/math/float/Makefile b/testcases/misc/math/float/Makefile +index 79dda35d6..5f4cb0f6c 100644 +--- a/testcases/misc/math/float/Makefile ++++ b/testcases/misc/math/float/Makefile +@@ -27,6 +27,6 @@ include $(top_srcdir)/include/mk/testcases.mk + LDLIBS += -lpthread -lm + + # main.c doesn't compile... +-MAKE_TARGETS := $(patsubst $(abs_srcdir)/%.c,%,$(wildcard $(abs_srcdir)/float*.c)) ++MAKE_TARGETS := $(patsubst $(abs_srcdir)/%.c,%,$(sort $(wildcard $(abs_srcdir)/float*.c))) + + include $(top_srcdir)/include/mk/generic_trunk_target.mk +diff --git a/testcases/network/nfs/nfs_stress/nfs05_make_tree.c b/testcases/network/nfs/nfs_stress/nfs05_make_tree.c +index 12c86799d..23c520d9d 100644 +--- a/testcases/network/nfs/nfs_stress/nfs05_make_tree.c ++++ b/testcases/network/nfs/nfs_stress/nfs05_make_tree.c +@@ -104,7 +104,7 @@ static void *thread_fn(LTP_ATTRIBUTE_UNUSED void *args) + "\treturn 0;\n}\n"; + + const char make_buf_n[] = "CFLAGS := -O -w -g\n" +- "SRCS=$(wildcard *.c)\n" ++ "SRCS=$(sort $(wildcard *.c))\n" + "TARGETS=$(SRCS:.c=)\n" + "all: $(TARGETS)\n" + "$(TARGETS): %: %.c\n" +@@ -114,7 +114,7 @@ static void *thread_fn(LTP_ATTRIBUTE_UNUSED void *args) + + const char make_buf[] = "CFLAGS := -O -w -g\n" + "SUBDIR = dir\n" +- "SRCS=$(wildcard *.c)\n" ++ "SRCS=$(sort $(wildcard *.c))\n" + "TARGETS=$(SRCS:.c=)\n" + "all: $(SUBDIR) $(TARGETS)\n" + "$(TARGETS): %: %.c\n" +diff --git a/testcases/network/nfsv4/locks/Makefile b/testcases/network/nfsv4/locks/Makefile +index 5812dea3a..05941c892 100644 +--- a/testcases/network/nfsv4/locks/Makefile ++++ b/testcases/network/nfsv4/locks/Makefile +@@ -28,6 +28,6 @@ MAKE_TARGETS := locktests + + LDLIBS += -lpthread + +-$(MAKE_TARGETS): $(patsubst $(abs_srcdir)/%.c,%.o,$(wildcard $(abs_srcdir)/*.c)) ++$(MAKE_TARGETS): $(patsubst $(abs_srcdir)/%.c,%.o,$(sort $(wildcard $(abs_srcdir)/*.c))) + + include $(top_srcdir)/include/mk/generic_leaf_target.mk +diff --git a/utils/sctp/func_tests/Makefile b/utils/sctp/func_tests/Makefile +index d296c652a..a17107853 100644 +--- a/utils/sctp/func_tests/Makefile ++++ b/utils/sctp/func_tests/Makefile +@@ -30,7 +30,7 @@ LDFLAGS += $(addprefix -L$(abs_builddir)/../,lib testlib) + + LDLIBS += -lsctputil -lsctp -lpthread + +-V4_TARGETS := $(patsubst $(abs_srcdir)/%.c,%,$(wildcard $(abs_srcdir)/*.c)) ++V4_TARGETS := $(patsubst $(abs_srcdir)/%.c,%,$(sort $(wildcard $(abs_srcdir)/*.c))) + + V6_TARGETS := test_basic_v6 test_fragments_v6 test_getname_v6 \ + test_inaddr_any_v6 test_peeloff_v6 \ +-- +2.27.0 + diff --git a/poky/meta/recipes-extended/ltp/ltp/0003-syscalls-swapon-swapoff-Move-common-library-to-libs.patch b/poky/meta/recipes-extended/ltp/ltp/0003-syscalls-swapon-swapoff-Move-common-library-to-libs.patch new file mode 100644 index 000000000..5ace82dba --- /dev/null +++ b/poky/meta/recipes-extended/ltp/ltp/0003-syscalls-swapon-swapoff-Move-common-library-to-libs.patch @@ -0,0 +1,133 @@ +From 0653f1d809d0cc13f84facb9d2d82d984ac4d0ac Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Tue, 9 Mar 2021 15:25:16 +0000 +Subject: [PATCH 3/3] syscalls/swapon/swapoff: Move common library to libs/ + +There is a race/determinism issue with libswapon currently as depending on +which makefile path builds it, the debug paths may be "../swapon/libswapon.c" +or "libswapon.c". To avoid the determinism issue, move libswapon to libs/ +and use it from the shared location. + +The header is moved to the common includes directory to match and +the Makefile.inc fragment can be dropped. + +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2021-March/021387.html] + +--- + .../kernel/syscalls/swapon => include}/libswapon.h | 0 + libs/libltpswapon/Makefile | 12 ++++++++++++ + .../swapon => libs/libltpswapon}/libswapon.c | 0 + testcases/kernel/syscalls/swapoff/Makefile | 7 +++++-- + testcases/kernel/syscalls/swapoff/Makefile.inc | 6 ------ + testcases/kernel/syscalls/swapoff/swapoff01.c | 2 +- + testcases/kernel/syscalls/swapoff/swapoff02.c | 2 +- + testcases/kernel/syscalls/swapon/Makefile | 6 +++--- + 8 files changed, 22 insertions(+), 13 deletions(-) + rename {testcases/kernel/syscalls/swapon => include}/libswapon.h (100%) + create mode 100644 libs/libltpswapon/Makefile + rename {testcases/kernel/syscalls/swapon => libs/libltpswapon}/libswapon.c (100%) + delete mode 100644 testcases/kernel/syscalls/swapoff/Makefile.inc + +diff --git a/testcases/kernel/syscalls/swapon/libswapon.h b/include/libswapon.h +similarity index 100% +rename from testcases/kernel/syscalls/swapon/libswapon.h +rename to include/libswapon.h +diff --git a/libs/libltpswapon/Makefile b/libs/libltpswapon/Makefile +new file mode 100644 +index 000000000..8f738338b +--- /dev/null ++++ b/libs/libltpswapon/Makefile +@@ -0,0 +1,12 @@ ++# SPDX-License-Identifier: GPL-2.0-or-later ++# ++# Copyright (C) Richard Purdie <richard.purdie@linuxfoundation.org> ++ ++top_srcdir ?= ../.. ++ ++include $(top_srcdir)/include/mk/env_pre.mk ++ ++INTERNAL_LIB := libltpswapon.a ++ ++include $(top_srcdir)/include/mk/lib.mk ++include $(top_srcdir)/include/mk/generic_leaf_target.mk +diff --git a/testcases/kernel/syscalls/swapon/libswapon.c b/libs/libltpswapon/libswapon.c +similarity index 100% +rename from testcases/kernel/syscalls/swapon/libswapon.c +rename to libs/libltpswapon/libswapon.c +diff --git a/testcases/kernel/syscalls/swapoff/Makefile b/testcases/kernel/syscalls/swapoff/Makefile +index fbfbe0441..a74374605 100644 +--- a/testcases/kernel/syscalls/swapoff/Makefile ++++ b/testcases/kernel/syscalls/swapoff/Makefile +@@ -3,7 +3,10 @@ + + top_srcdir ?= ../../../.. + ++LTPLIBS = ltpswapon ++ + include $(top_srcdir)/include/mk/testcases.mk +-include $(abs_srcdir)/./Makefile.inc ++ ++LTPLDLIBS = -lltpswapon ++ + include $(top_srcdir)/include/mk/generic_leaf_target.mk +-$(MAKE_TARGETS): %: ../swapon/libswapon.o +diff --git a/testcases/kernel/syscalls/swapoff/Makefile.inc b/testcases/kernel/syscalls/swapoff/Makefile.inc +deleted file mode 100644 +index 65350cbeb..000000000 +--- a/testcases/kernel/syscalls/swapoff/Makefile.inc ++++ /dev/null +@@ -1,6 +0,0 @@ +-LIBDIR += ../swapon/ +-LIBSWAPON := $(LIBDIR)/libswapon.o +-$(LIBSWAPON): +- $(MAKE) -C $(LIBDIR) +-CPPFLAGS += -I$(abs_srcdir)/$(LIBDIR) +-LDFLAGS += -L$(abs_builddir)/$(LIBDIR) +diff --git a/testcases/kernel/syscalls/swapoff/swapoff01.c b/testcases/kernel/syscalls/swapoff/swapoff01.c +index e115269c0..87a217a89 100644 +--- a/testcases/kernel/syscalls/swapoff/swapoff01.c ++++ b/testcases/kernel/syscalls/swapoff/swapoff01.c +@@ -25,7 +25,7 @@ + #include <stdlib.h> + #include "config.h" + #include "lapi/syscalls.h" +-#include "../swapon/libswapon.h" ++#include "libswapon.h" + + static void setup(void); + static void cleanup(void); +diff --git a/testcases/kernel/syscalls/swapoff/swapoff02.c b/testcases/kernel/syscalls/swapoff/swapoff02.c +index 8954f975f..60cd66c26 100644 +--- a/testcases/kernel/syscalls/swapoff/swapoff02.c ++++ b/testcases/kernel/syscalls/swapoff/swapoff02.c +@@ -33,7 +33,7 @@ + #include "test.h" + #include "lapi/syscalls.h" + #include "safe_macros.h" +-#include "../swapon/libswapon.h" ++#include "libswapon.h" + + static void setup(void); + static void cleanup(void); +diff --git a/testcases/kernel/syscalls/swapon/Makefile b/testcases/kernel/syscalls/swapon/Makefile +index 97113a447..57ec45d48 100644 +--- a/testcases/kernel/syscalls/swapon/Makefile ++++ b/testcases/kernel/syscalls/swapon/Makefile +@@ -8,10 +8,10 @@ endif + + top_srcdir ?= ../../../.. + ++LTPLIBS = ltpswapon ++ + include $(top_srcdir)/include/mk/testcases.mk + +-FILTER_OUT_MAKE_TARGETS := libswapon ++LTPLDLIBS = -lltpswapon + + include $(top_srcdir)/include/mk/generic_leaf_target.mk +- +-$(MAKE_TARGETS): %: libswapon.o +-- +2.27.0 + diff --git a/poky/meta/recipes-extended/ltp/ltp/libswapon.patch b/poky/meta/recipes-extended/ltp/ltp/libswapon.patch new file mode 100644 index 000000000..07b0dcefc --- /dev/null +++ b/poky/meta/recipes-extended/ltp/ltp/libswapon.patch @@ -0,0 +1,368 @@ +Index: git/libs/libltpswapon/Makefile +=================================================================== +--- /dev/null ++++ git/libs/libltpswapon/Makefile +@@ -0,0 +1,12 @@ ++# SPDX-License-Identifier: GPL-2.0-or-later ++# ++# Copyright (C) Richard Purdie <richard.purdie@linuxfoundation.org> ++ ++top_srcdir ?= ../.. ++ ++include $(top_srcdir)/include/mk/env_pre.mk ++ ++INTERNAL_LIB := libltpswapon.a ++ ++include $(top_srcdir)/include/mk/lib.mk ++include $(top_srcdir)/include/mk/generic_leaf_target.mk +Index: git/libs/libltpswapon/libswapon.c +=================================================================== +--- /dev/null ++++ git/libs/libltpswapon/libswapon.c +@@ -0,0 +1,90 @@ ++/* ++ * Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it would be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ * Author: Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com> ++ * ++ */ ++ ++#include <errno.h> ++#include "lapi/syscalls.h" ++#include "test.h" ++#include "libswapon.h" ++ ++/* ++ * Make a swap file ++ */ ++int make_swapfile(void (cleanup)(void), const char *swapfile, int safe) ++{ ++ if (!tst_fs_has_free(NULL, ".", sysconf(_SC_PAGESIZE) * 10, ++ TST_BYTES)) { ++ tst_brkm(TBROK, cleanup, ++ "Insufficient disk space to create swap file"); ++ } ++ ++ /* create file */ ++ if (tst_fill_file(swapfile, 0, ++ sysconf(_SC_PAGESIZE), 10) != 0) { ++ tst_brkm(TBROK, cleanup, "Failed to create swapfile"); ++ } ++ ++ /* make the file swapfile */ ++ const char *argv[2 + 1]; ++ argv[0] = "mkswap"; ++ argv[1] = swapfile; ++ argv[2] = NULL; ++ ++ return tst_cmd(cleanup, argv, "/dev/null", "/dev/null", safe); ++} ++ ++/* ++ * Check swapon/swapoff support status of filesystems or files ++ * we are testing on. ++ */ ++void is_swap_supported(void (cleanup)(void), const char *filename) ++{ ++ int fibmap = tst_fibmap(filename); ++ long fs_type = tst_fs_type(cleanup, filename); ++ const char *fstype = tst_fs_type_name(fs_type); ++ ++ int ret = make_swapfile(NULL, filename, 1); ++ if (ret != 0) { ++ if (fibmap == 1) { ++ tst_brkm(TCONF, cleanup, ++ "mkswap on %s not supported", fstype); ++ } else { ++ tst_brkm(TFAIL, cleanup, ++ "mkswap on %s failed", fstype); ++ } ++ } ++ ++ TEST(ltp_syscall(__NR_swapon, filename, 0)); ++ if (TEST_RETURN == -1) { ++ if (fibmap == 1 && errno == EINVAL) { ++ tst_brkm(TCONF, cleanup, ++ "Swapfile on %s not implemented", fstype); ++ } else { ++ tst_brkm(TFAIL | TERRNO, cleanup, ++ "swapon on %s failed", fstype); ++ } ++ } ++ ++ TEST(ltp_syscall(__NR_swapoff, filename, 0)); ++ if (TEST_RETURN == -1) { ++ tst_brkm(TFAIL | TERRNO, cleanup, ++ "swapoff on %s failed", fstype); ++ } ++} +Index: git/testcases/kernel/syscalls/swapoff/Makefile +=================================================================== +--- git.orig/testcases/kernel/syscalls/swapoff/Makefile ++++ git/testcases/kernel/syscalls/swapoff/Makefile +@@ -3,7 +3,11 @@ + + top_srcdir ?= ../../../.. + ++LTPLIBS = ltpswapon ++ + include $(top_srcdir)/include/mk/testcases.mk +-include $(abs_srcdir)/./Makefile.inc ++ ++LTPLDLIBS = -lltpswapon ++ + include $(top_srcdir)/include/mk/generic_leaf_target.mk +-$(MAKE_TARGETS): %: ../swapon/libswapon.o ++ +Index: git/testcases/kernel/syscalls/swapoff/Makefile.inc +=================================================================== +--- git.orig/testcases/kernel/syscalls/swapoff/Makefile.inc ++++ /dev/null +@@ -1,6 +0,0 @@ +-LIBDIR += ../swapon/ +-LIBSWAPON := $(LIBDIR)/libswapon.o +-$(LIBSWAPON): +- $(MAKE) -C $(LIBDIR) +-CPPFLAGS += -I$(abs_srcdir)/$(LIBDIR) +-LDFLAGS += -L$(abs_builddir)/$(LIBDIR) +Index: git/testcases/kernel/syscalls/swapon/Makefile +=================================================================== +--- git.orig/testcases/kernel/syscalls/swapon/Makefile ++++ git/testcases/kernel/syscalls/swapon/Makefile +@@ -8,10 +8,10 @@ endif + + top_srcdir ?= ../../../.. + ++LTPLIBS = ltpswapon ++ + include $(top_srcdir)/include/mk/testcases.mk + +-FILTER_OUT_MAKE_TARGETS := libswapon ++LTPLDLIBS = -lltpswapon + + include $(top_srcdir)/include/mk/generic_leaf_target.mk +- +-$(MAKE_TARGETS): %: libswapon.o +Index: git/testcases/kernel/syscalls/swapon/libswapon.c +=================================================================== +--- git.orig/testcases/kernel/syscalls/swapon/libswapon.c ++++ /dev/null +@@ -1,90 +0,0 @@ +-/* +- * Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved. +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public License as +- * published by the Free Software Foundation; either version 2 of +- * the License, or (at your option) any later version. +- * +- * This program is distributed in the hope that it would be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program; if not, write the Free Software Foundation, +- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +- * +- * Author: Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com> +- * +- */ +- +-#include <errno.h> +-#include "lapi/syscalls.h" +-#include "test.h" +-#include "libswapon.h" +- +-/* +- * Make a swap file +- */ +-int make_swapfile(void (cleanup)(void), const char *swapfile, int safe) +-{ +- if (!tst_fs_has_free(NULL, ".", sysconf(_SC_PAGESIZE) * 10, +- TST_BYTES)) { +- tst_brkm(TBROK, cleanup, +- "Insufficient disk space to create swap file"); +- } +- +- /* create file */ +- if (tst_fill_file(swapfile, 0, +- sysconf(_SC_PAGESIZE), 10) != 0) { +- tst_brkm(TBROK, cleanup, "Failed to create swapfile"); +- } +- +- /* make the file swapfile */ +- const char *argv[2 + 1]; +- argv[0] = "mkswap"; +- argv[1] = swapfile; +- argv[2] = NULL; +- +- return tst_cmd(cleanup, argv, "/dev/null", "/dev/null", safe); +-} +- +-/* +- * Check swapon/swapoff support status of filesystems or files +- * we are testing on. +- */ +-void is_swap_supported(void (cleanup)(void), const char *filename) +-{ +- int fibmap = tst_fibmap(filename); +- long fs_type = tst_fs_type(cleanup, filename); +- const char *fstype = tst_fs_type_name(fs_type); +- +- int ret = make_swapfile(NULL, filename, 1); +- if (ret != 0) { +- if (fibmap == 1) { +- tst_brkm(TCONF, cleanup, +- "mkswap on %s not supported", fstype); +- } else { +- tst_brkm(TFAIL, cleanup, +- "mkswap on %s failed", fstype); +- } +- } +- +- TEST(ltp_syscall(__NR_swapon, filename, 0)); +- if (TEST_RETURN == -1) { +- if (fibmap == 1 && errno == EINVAL) { +- tst_brkm(TCONF, cleanup, +- "Swapfile on %s not implemented", fstype); +- } else { +- tst_brkm(TFAIL | TERRNO, cleanup, +- "swapon on %s failed", fstype); +- } +- } +- +- TEST(ltp_syscall(__NR_swapoff, filename, 0)); +- if (TEST_RETURN == -1) { +- tst_brkm(TFAIL | TERRNO, cleanup, +- "swapoff on %s failed", fstype); +- } +-} +Index: git/testcases/kernel/syscalls/swapon/libswapon.h +=================================================================== +--- git.orig/testcases/kernel/syscalls/swapon/libswapon.h ++++ /dev/null +@@ -1,39 +0,0 @@ +-/* +- * Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved. +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public License as +- * published by the Free Software Foundation; either version 2 of +- * the License, or (at your option) any later version. +- * +- * This program is distributed in the hope that it would be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program; if not, write the Free Software Foundation, +- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +- * +- * Author: Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com> +- * +- */ +- +-/* +- * Contains common content for all swapon tests +- */ +- +-#ifndef __LIBSWAPON_H__ +-#define __LIBSWAPON_H__ +- +-/* +- * Make a swap file +- */ +-int make_swapfile(void (cleanup)(void), const char *swapfile, int safe); +- +-/* +- * Check swapon/swapoff support status of filesystems or files +- * we are testing on. +- */ +-void is_swap_supported(void (cleanup)(void), const char *filename); +-#endif /* __LIBSWAPON_H__ */ +Index: git/testcases/kernel/syscalls/swapoff/swapoff01.c +=================================================================== +--- git.orig/testcases/kernel/syscalls/swapoff/swapoff01.c ++++ git/testcases/kernel/syscalls/swapoff/swapoff01.c +@@ -25,7 +25,7 @@ + #include <stdlib.h> + #include "config.h" + #include "lapi/syscalls.h" +-#include "../swapon/libswapon.h" ++#include "libswapon.h" + + static void setup(void); + static void cleanup(void); +Index: git/testcases/kernel/syscalls/swapoff/swapoff02.c +=================================================================== +--- git.orig/testcases/kernel/syscalls/swapoff/swapoff02.c ++++ git/testcases/kernel/syscalls/swapoff/swapoff02.c +@@ -33,7 +33,7 @@ + #include "test.h" + #include "lapi/syscalls.h" + #include "safe_macros.h" +-#include "../swapon/libswapon.h" ++#include "libswapon.h" + + static void setup(void); + static void cleanup(void); +Index: git/include/libswapon.h +=================================================================== +--- /dev/null ++++ git/include/libswapon.h +@@ -0,0 +1,39 @@ ++/* ++ * Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it would be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ * Author: Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com> ++ * ++ */ ++ ++/* ++ * Contains common content for all swapon tests ++ */ ++ ++#ifndef __LIBSWAPON_H__ ++#define __LIBSWAPON_H__ ++ ++/* ++ * Make a swap file ++ */ ++int make_swapfile(void (cleanup)(void), const char *swapfile, int safe); ++ ++/* ++ * Check swapon/swapoff support status of filesystems or files ++ * we are testing on. ++ */ ++void is_swap_supported(void (cleanup)(void), const char *filename); ++#endif /* __LIBSWAPON_H__ */ diff --git a/poky/meta/recipes-extended/ltp/ltp_20210121.bb b/poky/meta/recipes-extended/ltp/ltp_20210121.bb index 593f07087..f58ca2eb2 100644 --- a/poky/meta/recipes-extended/ltp/ltp_20210121.bb +++ b/poky/meta/recipes-extended/ltp/ltp_20210121.bb @@ -30,8 +30,8 @@ CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" SRCREV = "4d005621edd109d119627eb9210b224a63bf22cb" # remove at next version upgrade or when output changes -PR = "r1" -HASHEQUIV_HASH_VERSION .= ".1" +PR = "r4" +HASHEQUIV_HASH_VERSION .= ".4" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-build-Add-option-to-select-libc-implementation.patch \ @@ -39,6 +39,9 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-Add-more-musl-exclusions.patch \ file://0001-Remove-OOM-tests-from-runtest-mm.patch \ file://determinism.patch \ + file://0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch \ + file://0002-Makefile-Avoid-wildcard-determinism-issues.patch \ + file://0003-syscalls-swapon-swapoff-Move-common-library-to-libs.patch \ " S = "${WORKDIR}/git" @@ -56,14 +59,6 @@ EXTRA_OECONF = " --with-realtime-testsuite --with-open-posix-testsuite " # ltp network/rpc test cases ftbfs when libtirpc is found EXTRA_OECONF += " --without-tirpc " -do_compile_prepend() { - # Reported at http://lists.linux.it/pipermail/ltp/2021-March/021274.html - # Avoid a race over construction of libswapon.o which is built by swapon and swapoff - # but the object differs depending upon which one built it - # ("../swapon/libswapon.c" vs "libswapon.c" references) - make -C ${B}/testcases/kernel/syscalls/swapon/ -} - do_install(){ install -d ${D}${prefix}/ oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install diff --git a/poky/meta/recipes-extended/lzip/lzip_1.22.bb b/poky/meta/recipes-extended/lzip/lzip_1.22.bb index d21c36a3f..336026945 100644 --- a/poky/meta/recipes-extended/lzip/lzip_1.22.bb +++ b/poky/meta/recipes-extended/lzip/lzip_1.22.bb @@ -1,5 +1,6 @@ SUMMARY = "Lossless data compressor based on the LZMA algorithm" HOMEPAGE = "http://lzip.nongnu.org/lzip.html" +DESCRIPTION = "Lzip is a lossless data compressor with a user interface similar to the one of gzip or bzip2. Lzip uses a simplified form of the Lempel-Ziv-Markov chain-Algorithm (LZMA) stream format, chosen to maximize safety and interoperability." SECTION = "console/utils" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \ diff --git a/poky/meta/recipes-extended/man-db/man-db_2.9.4.bb b/poky/meta/recipes-extended/man-db/man-db_2.9.4.bb index 432953a1b..cfa656176 100644 --- a/poky/meta/recipes-extended/man-db/man-db_2.9.4.bb +++ b/poky/meta/recipes-extended/man-db/man-db_2.9.4.bb @@ -1,5 +1,6 @@ SUMMARY = "An implementation of the standard Unix documentation system accessed using the man command" HOMEPAGE = "http://man-db.nongnu.org/" +DESCRIPTION = "man-db is an implementation of the standard Unix documentation system accessed using the man command. It uses a Berkeley DB database in place of the traditional flat-text whatis databases." LICENSE = "LGPLv2.1 & GPLv2" LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://docs/COPYING;md5=eb723b61539feef013de476e68b5c50a" diff --git a/poky/meta/recipes-extended/mc/mc_4.8.26.bb b/poky/meta/recipes-extended/mc/mc_4.8.26.bb index 3eb19309b..5c5e6790d 100644 --- a/poky/meta/recipes-extended/mc/mc_4.8.26.bb +++ b/poky/meta/recipes-extended/mc/mc_4.8.26.bb @@ -1,5 +1,6 @@ SUMMARY = "Midnight Commander is an ncurses based file manager" HOMEPAGE = "http://www.midnight-commander.org/" +DESCRIPTION = "GNU Midnight Commander is a visual file manager, licensed under GNU General Public License and therefore qualifies as Free Software. It's a feature rich full-screen text mode application that allows you to copy, move and delete files and whole directory trees, search for files and run commands in the subshell. Internal viewer and editor are included." LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=270bbafe360e73f9840bd7981621f9c2" SECTION = "console/utils" diff --git a/poky/meta/recipes-extended/mdadm/mdadm_4.1.bb b/poky/meta/recipes-extended/mdadm/mdadm_4.1.bb index 001d3331a..bb77759cf 100644 --- a/poky/meta/recipes-extended/mdadm/mdadm_4.1.bb +++ b/poky/meta/recipes-extended/mdadm/mdadm_4.1.bb @@ -1,5 +1,6 @@ SUMMARY = "Tool for managing software RAID under Linux" HOMEPAGE = "http://www.kernel.org/pub/linux/utils/raid/mdadm/" +DESCRIPTION = "mdadm is a Linux utility used to manage and monitor software RAID devices." # Some files are GPLv2+ while others are GPLv2. LICENSE = "GPLv2 & GPLv2+" diff --git a/poky/meta/recipes-extended/mingetty/mingetty_1.08.bb b/poky/meta/recipes-extended/mingetty/mingetty_1.08.bb index 491b89209..9822e86b0 100644 --- a/poky/meta/recipes-extended/mingetty/mingetty_1.08.bb +++ b/poky/meta/recipes-extended/mingetty/mingetty_1.08.bb @@ -1,6 +1,7 @@ SUMMARY = "Compact getty terminal handler for virtual consoles only" SECTION = "console/utils" HOMEPAGE = "http://sourceforge.net/projects/mingetty/" +DESCRIPTION = "This is a small Linux console getty that is started on the Linux text console, asks for a login name and then tranfers over to login directory. Is extended to allow automatic login and starting any app." LICENSE = "GPLv2" PR = "r3" diff --git a/poky/meta/recipes-extended/msmtp/msmtp_1.8.14.bb b/poky/meta/recipes-extended/msmtp/msmtp_1.8.15.bb index 3bd5f9ede..e85873e90 100644 --- a/poky/meta/recipes-extended/msmtp/msmtp_1.8.14.bb +++ b/poky/meta/recipes-extended/msmtp/msmtp_1.8.15.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" UPSTREAM_CHECK_URI = "https://marlam.de/msmtp/download/" SRC_URI = "https://marlam.de/${BPN}/releases/${BP}.tar.xz" -SRC_URI[sha256sum] = "d56f065d711486e9c234618515a02a48a48dab4051b34f3e108fbecb6fb773b4" +SRC_URI[sha256sum] = "2265dc639ebf2edf3069fffe0a3bd76749f8b58f4001d5cdeae19873949099ce" inherit gettext autotools update-alternatives pkgconfig diff --git a/poky/meta/recipes-extended/parted/parted_3.4.bb b/poky/meta/recipes-extended/parted/parted_3.4.bb index 79dad5468..c15f5aeb0 100644 --- a/poky/meta/recipes-extended/parted/parted_3.4.bb +++ b/poky/meta/recipes-extended/parted/parted_3.4.bb @@ -1,5 +1,6 @@ SUMMARY = "Disk partition editing/resizing utility" HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" +DESCRIPTION = "GNU Parted manipulates partition tables. This is useful for creating space for new operating systems, reorganizing disk usage, copying data on hard disks and disk imaging." LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c" SECTION = "console/tools" diff --git a/poky/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb b/poky/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb index 9f992d3e8..409a8f389 100644 --- a/poky/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb +++ b/poky/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb @@ -1,5 +1,7 @@ SUMMARY = "Convert::ASN1 - Perl ASN.1 Encode/Decode library" SECTION = "libs" +HOMEPAGE = "https://metacpan.org/source/GBARR/Convert-ASN1-0.27" +DESCRIPTION = "Convert::ASN1 is a perl library for encoding/decoding data using ASN.1 definitions." LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://README.md;beginline=91;endline=97;md5=ceff7fd286eb6d8e8e0d3d23e096a63f" diff --git a/poky/meta/recipes-extended/perl/libtimedate-perl_2.30.bb b/poky/meta/recipes-extended/perl/libtimedate-perl_2.30.bb index d42eadb58..46843bfc8 100644 --- a/poky/meta/recipes-extended/perl/libtimedate-perl_2.30.bb +++ b/poky/meta/recipes-extended/perl/libtimedate-perl_2.30.bb @@ -1,5 +1,6 @@ SUMMARY = "Perl modules useful for manipulating date and time information" HOMEPAGE = "https://metacpan.org/release/TimeDate" +DESCRIPTION = "This is the perl5 TimeDate distribution. It requires perl version 5.003 or later." SECTION = "libs" # You can redistribute it and/or modify it under the same terms as Perl itself. LICENSE = "Artistic-1.0 | GPL-1.0+" diff --git a/poky/meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch b/poky/meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch new file mode 100644 index 000000000..c92ad28e4 --- /dev/null +++ b/poky/meta/recipes-extended/procps/procps/0001-w.c-correct-musl-builds.patch @@ -0,0 +1,44 @@ +From 22f8d25567b8d64bdbab0fb0b4915b4362561d9b Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 24 Feb 2021 21:14:31 +0000 +Subject: [PATCH] w.c: correct musl builds + +No need to redefine UT_ stuff to something that does not exist. + +UT_ is already provided in musl but via utmp.h header, so include +it always. + +Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/126] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + w.c | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/w.c b/w.c +index 9d07ac9..d10639b 100644 +--- a/w.c ++++ b/w.c +@@ -57,9 +57,8 @@ + #include <unistd.h> + #ifdef HAVE_UTMPX_H + # include <utmpx.h> +-#else +-# include <utmp.h> + #endif ++#include <utmp.h> + #include <arpa/inet.h> + + static int ignoreuser = 0; /* for '-u' */ +@@ -72,12 +71,6 @@ typedef struct utmpx utmp_t; + typedef struct utmp utmp_t; + #endif + +-#if !defined(UT_HOSTSIZE) || defined(__UT_HOSTSIZE) +-# define UT_HOSTSIZE __UT_HOSTSIZE +-# define UT_LINESIZE __UT_LINESIZE +-# define UT_NAMESIZE __UT_NAMESIZE +-#endif +- + #ifdef W_SHOWFROM + # define FROM_STRING "on" + #else diff --git a/poky/meta/recipes-extended/procps/procps/0002-proc-escape.c-add-missing-include.patch b/poky/meta/recipes-extended/procps/procps/0002-proc-escape.c-add-missing-include.patch new file mode 100644 index 000000000..5fa1ac9d7 --- /dev/null +++ b/poky/meta/recipes-extended/procps/procps/0002-proc-escape.c-add-missing-include.patch @@ -0,0 +1,23 @@ +From 4f964821398dff7ab21fec63da15e1e00b2e9277 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 24 Feb 2021 21:16:14 +0000 +Subject: [PATCH] proc/escape.c: add missing include + +Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/126] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + proc/escape.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/proc/escape.c b/proc/escape.c +index 2e8fb7d..e1f4612 100644 +--- a/proc/escape.c ++++ b/proc/escape.c +@@ -21,6 +21,7 @@ + #include <sys/types.h> + #include <string.h> + #include <limits.h> ++#include <langinfo.h> + #include "procps.h" + #include "escape.h" + #include "readproc.h" diff --git a/poky/meta/recipes-extended/procps/procps_3.3.16.bb b/poky/meta/recipes-extended/procps/procps_3.3.17.bb index ef3ac86e9..c74a901d9 100644 --- a/poky/meta/recipes-extended/procps/procps_3.3.16.bb +++ b/poky/meta/recipes-extended/procps/procps_3.3.17.bb @@ -14,8 +14,10 @@ inherit autotools gettext pkgconfig update-alternatives SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https \ file://sysctl.conf \ + file://0001-w.c-correct-musl-builds.patch \ + file://0002-proc-escape.c-add-missing-include.patch \ " -SRCREV = "59c88e18f29000ceaf7e5f98181b07be443cf12f" +SRCREV = "19a508ea121c0c4ac6d0224575a036de745eaaf8" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-extended/quota/quota_4.06.bb b/poky/meta/recipes-extended/quota/quota_4.06.bb index 19ccbd588..027b0811f 100644 --- a/poky/meta/recipes-extended/quota/quota_4.06.bb +++ b/poky/meta/recipes-extended/quota/quota_4.06.bb @@ -1,6 +1,7 @@ SUMMARY = "Tools for monitoring & limiting user disk usage per filesystem" SECTION = "base" HOMEPAGE = "http://sourceforge.net/projects/linuxquota/" +DESCRIPTION = "Tools and patches for the Linux Diskquota system as part of the Linux kernel" BUGTRACKER = "http://sourceforge.net/tracker/?group_id=18136&atid=118136" LICENSE = "BSD & GPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://rquota_server.c;beginline=1;endline=20;md5=fe7e0d7e11c6f820f8fa62a5af71230f \ diff --git a/poky/meta/recipes-extended/sed/sed_4.8.bb b/poky/meta/recipes-extended/sed/sed_4.8.bb index 048db47e1..57a769e8c 100644 --- a/poky/meta/recipes-extended/sed/sed_4.8.bb +++ b/poky/meta/recipes-extended/sed/sed_4.8.bb @@ -1,5 +1,6 @@ SUMMARY = "Stream EDitor (text filtering utility)" HOMEPAGE = "http://www.gnu.org/software/sed/" +DESCRIPTION = "sed (stream editor) is a non-interactive command-line text editor." LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \ file://sed/sed.h;beginline=1;endline=15;md5=fb3c7e6fbca6f66943859153d4be8efe \ diff --git a/poky/meta/recipes-extended/shadow/shadow.inc b/poky/meta/recipes-extended/shadow/shadow.inc index 4ae7a78c5..2278541f6 100644 --- a/poky/meta/recipes-extended/shadow/shadow.inc +++ b/poky/meta/recipes-extended/shadow/shadow.inc @@ -1,5 +1,6 @@ SUMMARY = "Tools to change and administer password and group data" HOMEPAGE = "http://github.com/shadow-maint/shadow" +DESCRIPTION = "${SUMMARY}" BUGTRACKER = "http://github.com/shadow-maint/shadow/issues" SECTION = "base/utils" LICENSE = "BSD | Artistic-1.0" diff --git a/poky/meta/recipes-extended/shadow/shadow_4.8.1.bb b/poky/meta/recipes-extended/shadow/shadow_4.8.1.bb index c975395ff..ff4aad926 100644 --- a/poky/meta/recipes-extended/shadow/shadow_4.8.1.bb +++ b/poky/meta/recipes-extended/shadow/shadow_4.8.1.bb @@ -6,5 +6,6 @@ BUILD_LDFLAGS_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'p BBCLASSEXTEND = "native nativesdk" - - +# Severity is low and marked as closed and won't fix. +# https://bugzilla.redhat.com/show_bug.cgi?id=884658 +CVE_CHECK_WHITELIST += "CVE-2013-4235" diff --git a/poky/meta/recipes-extended/stress-ng/stress-ng_0.12.03.bb b/poky/meta/recipes-extended/stress-ng/stress-ng_0.12.05.bb index 73539c926..eb6bdb4a8 100644 --- a/poky/meta/recipes-extended/stress-ng/stress-ng_0.12.03.bb +++ b/poky/meta/recipes-extended/stress-ng/stress-ng_0.12.05.bb @@ -9,7 +9,7 @@ SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \ file://no_daddr_t.patch \ " -SRC_URI[sha256sum] = "f27ff439b76a17641291d4234c73655cddcb0a5a588441d6ade290b06ca4b805" +SRC_URI[sha256sum] = "af7779aee38e6d94726ed7d5cf36384a64d50c86e42fff89c141d8609913f425" DEPENDS = "coreutils-native" diff --git a/poky/meta/recipes-extended/sudo/sudo.inc b/poky/meta/recipes-extended/sudo/sudo.inc index 97ecabe0f..0bea35a0a 100644 --- a/poky/meta/recipes-extended/sudo/sudo.inc +++ b/poky/meta/recipes-extended/sudo/sudo.inc @@ -49,3 +49,5 @@ do_compile_prepend () { do_install_prepend (){ mkdir -p ${D}/${localstatedir}/lib } + +CVE_VERSION_SUFFIX = "patch" diff --git a/poky/meta/recipes-extended/sudo/sudo_1.9.5p2.bb b/poky/meta/recipes-extended/sudo/sudo_1.9.6p1.bb index ca23e94ac..b33345913 100644 --- a/poky/meta/recipes-extended/sudo/sudo_1.9.5p2.bb +++ b/poky/meta/recipes-extended/sudo/sudo_1.9.6p1.bb @@ -7,7 +7,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[sha256sum] = "539e2ef43c8a55026697fb0474ab6a925a11206b5aa58710cb42a0e1c81f0978" +SRC_URI[sha256sum] = "a9e9cdc058fafeb9cd3ebfb864c81755e524d98aa022152763f25bce8ca3ca90" DEPENDS += " virtual/crypt ${@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/poky/meta/recipes-extended/sysklogd/sysklogd_2.2.1.bb b/poky/meta/recipes-extended/sysklogd/sysklogd_2.2.2.bb index aa3f126fb..5dfeca532 100644 --- a/poky/meta/recipes-extended/sysklogd/sysklogd_2.2.1.bb +++ b/poky/meta/recipes-extended/sysklogd/sysklogd_2.2.2.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \ file://sysklogd \ " -SRCREV = "b115c7ec4e6d9f3587ac8d212bfc454bfbfe7023" +SRCREV = "f507ed8ff3f1e9d71bb6f85acbf5d14b2fa4e5f7" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb b/poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb index ec04bfe39..a942ac299 100644 --- a/poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb +++ b/poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb @@ -1,5 +1,6 @@ SUMMARY = "Fake version of the texinfo utility suite" SECTION = "console/utils" +DESCRIPTION = "${SUMMARY}" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d6bb62e73ca8b901d3f2e9d71542f4bb" DEPENDS = "" diff --git a/poky/meta/recipes-extended/unzip/unzip_6.0.bb b/poky/meta/recipes-extended/unzip/unzip_6.0.bb index c1ea0a9a2..0c56a39d9 100644 --- a/poky/meta/recipes-extended/unzip/unzip_6.0.bb +++ b/poky/meta/recipes-extended/unzip/unzip_6.0.bb @@ -1,5 +1,6 @@ SUMMARY = "Utilities for extracting and viewing files in .zip archives" HOMEPAGE = "http://www.info-zip.org" +DESCRIPTION = "Info-ZIP's purpose is to provide free, portable, high-quality versions of the Zip and UnZip compressor-archiver utilities that are compatible with the DOS-based PKZIP by PKWARE, Inc." SECTION = "console/utils" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=94caec5a51ef55ef711ee4e8b1c69e29" diff --git a/poky/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb b/poky/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb index 4f0f9531a..2787b270f 100644 --- a/poky/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb +++ b/poky/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb @@ -1,5 +1,6 @@ SUMMARY = "Socket-based service activation daemon" HOMEPAGE = "https://github.com/xinetd-org/xinetd" +DESCRIPTION = "xinetd is a powerful replacement for inetd, xinetd has access control mechanisms, extensive logging capabilities, the ability to make services available based on time, can place limits on the number of servers that can be started, and has deployable defence mechanisms to protect against port scanners, among other things." # xinetd is a BSD-like license # Apple and Gentoo say BSD here. diff --git a/poky/meta/recipes-extended/xz/xz_5.2.5.bb b/poky/meta/recipes-extended/xz/xz_5.2.5.bb index af21b6056..f5f5c318f 100644 --- a/poky/meta/recipes-extended/xz/xz_5.2.5.bb +++ b/poky/meta/recipes-extended/xz/xz_5.2.5.bb @@ -1,5 +1,6 @@ SUMMARY = "Utilities for managing LZMA compressed files" HOMEPAGE = "https://tukaani.org/xz/" +DESCRIPTION = "XZ Utils is free general-purpose data compression software with a high compression ratio. XZ Utils were written for POSIX-like systems, but also work on some not-so-POSIX systems. XZ Utils are the successor to LZMA Utils." SECTION = "base" # The source includes bits of PD, GPLv2, GPLv3, LGPLv2.1+, but the only file diff --git a/poky/meta/recipes-extended/zip/zip_3.0.bb b/poky/meta/recipes-extended/zip/zip_3.0.bb index 97e5e5753..18b5d8648 100644 --- a/poky/meta/recipes-extended/zip/zip_3.0.bb +++ b/poky/meta/recipes-extended/zip/zip_3.0.bb @@ -1,5 +1,6 @@ SUMMARY = "Compressor/archiver for creating and modifying .zip files" HOMEPAGE = "http://www.info-zip.org" +DESCRIPTION = "Info-ZIP's purpose is to provide free, portable, high-quality versions of the Zip and UnZip compressor-archiver utilities that are compatible with the DOS-based PKZIP by PKWARE, Inc." SECTION = "console/utils" LICENSE = "BSD-3-Clause" diff --git a/poky/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch b/poky/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch index 178124a2e..b5ffb95b7 100644 --- a/poky/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch +++ b/poky/meta/recipes-extended/zstd/zstd/0001-Makefile-sort-all-wildcard-file-list-expansions.patch @@ -1,4 +1,4 @@ -From 8d01b0753162681dcdbb7cf56f1e393c261e3eb0 Mon Sep 17 00:00:00 2001 +From 986c7917aef632745cb3388a86a2f62347d5a0a5 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 23 Dec 2020 19:14:32 +0100 Subject: [PATCH] Makefile: sort all wildcard file list expansions @@ -8,6 +8,7 @@ reproducible builds. Upstream-Status: Pending Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- programs/Makefile | 10 +++++----- tests/Makefile | 4 ++-- @@ -15,10 +16,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/Makefile b/programs/Makefile -index 8641d0ee..26fee45f 100644 +index 936f3c80..b8200fae 100644 --- a/programs/Makefile +++ b/programs/Makefile -@@ -72,11 +72,11 @@ ZSTDLEGACY_DIR := $(ZSTDDIR)/legacy +@@ -74,11 +74,11 @@ ZSTDLEGACY_DIR := $(ZSTDDIR)/legacy vpath %.c $(ZSTDLIB_COMMON) $(ZSTDLIB_COMPRESS) $(ZSTDLIB_DECOMPRESS) $(ZDICT_DIR) $(ZSTDLEGACY_DIR) @@ -34,17 +35,17 @@ index 8641d0ee..26fee45f 100644 ZSTD_LEGACY_SUPPORT ?= 5 ZSTDLEGACY_SRC := -@@ -91,7 +91,7 @@ ZSTDLIB_FULL_SRC = $(sort $(ZSTDLIB_CORE_SRC) $(ZSTDLEGACY_SRC) $(ZDICT_SRC)) - ZSTDLIB_LOCAL_SRC := $(notdir $(ZSTDLIB_FULL_SRC)) +@@ -93,7 +93,7 @@ ZSTDLIB_FULL_SRC = $(sort $(ZSTDLIB_CORE_SRC) $(ZSTDLEGACY_SRC) $(ZDICT_SRC)) + ZSTDLIB_LOCAL_SRC = $(notdir $(ZSTDLIB_FULL_SRC)) ZSTDLIB_LOCAL_OBJ := $(ZSTDLIB_LOCAL_SRC:.c=.o) -ZSTD_CLI_SRC := $(wildcard *.c) +ZSTD_CLI_SRC := $(sort $(wildcard *.c)) ZSTD_CLI_OBJ := $(ZSTD_CLI_SRC:.c=.o) - ZSTD_ALL_SRC := $(ZSTDLIB_LOCAL_SRC) $(ZSTD_CLI_SRC) + ZSTD_ALL_SRC = $(ZSTDLIB_LOCAL_SRC) $(ZSTD_CLI_SRC) diff --git a/tests/Makefile b/tests/Makefile -index 42bc353c..5f5654f0 100644 +index f0605057..74a90b0f 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -49,7 +49,7 @@ ZSTD_FILES := $(ZSTDDECOMP_FILES) $(ZSTDCOMMON_FILES) $(ZSTDCOMP_FILES) @@ -56,7 +57,7 @@ index 42bc353c..5f5654f0 100644 ZSTD_OBJ1 := $(subst $(ZSTDDIR)/common/,zstdm_,$(ZSTD_F1)) ZSTD_OBJ2 := $(subst $(ZSTDDIR)/compress/,zstdc_,$(ZSTD_OBJ1)) ZSTD_OBJ3 := $(subst $(ZSTDDIR)/decompress/,zstdd_,$(ZSTD_OBJ2)) -@@ -212,7 +212,7 @@ bigdict: $(ZSTDMT_OBJECTS) $(PRGDIR)/datagen.c bigdict.c +@@ -211,7 +211,7 @@ bigdict: $(ZSTDMT_OBJECTS) $(PRGDIR)/datagen.c bigdict.c invalidDictionaries : $(ZSTD_OBJECTS) invalidDictionaries.c legacy : CPPFLAGS += -I$(ZSTDDIR)/legacy -DZSTD_LEGACY_SUPPORT=4 @@ -66,7 +67,7 @@ index 42bc353c..5f5654f0 100644 decodecorpus : LDLIBS += -lm decodecorpus : $(filter-out zstdc_zstd_compress.o, $(ZSTD_OBJECTS)) $(ZDICT_FILES) $(PRGDIR)/util.c $(PRGDIR)/timefn.c decodecorpus.c diff --git a/tests/fuzz/Makefile b/tests/fuzz/Makefile -index 36232a8c..574fe877 100644 +index f3a561de..68a29ef0 100644 --- a/tests/fuzz/Makefile +++ b/tests/fuzz/Makefile @@ -58,7 +58,7 @@ FUZZ_SRC := \ diff --git a/poky/meta/recipes-extended/zstd/zstd_1.4.8.bb b/poky/meta/recipes-extended/zstd/zstd_1.4.9.bb index 10a6334cb..b86fdf8b2 100644 --- a/poky/meta/recipes-extended/zstd/zstd_1.4.8.bb +++ b/poky/meta/recipes-extended/zstd/zstd_1.4.9.bb @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/facebook/zstd.git;branch=release \ file://0001-Makefile-sort-all-wildcard-file-list-expansions.patch \ " -SRCREV = "97a3da1df009d4dc67251de0c4b1c9d7fe286fc1" +SRCREV = "e4558ffd1dc49399faf4ee5d85abed4386b4dcf5" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" |