diff options
Diffstat (limited to 'poky/meta/recipes-extended')
17 files changed, 67 insertions, 504 deletions
diff --git a/poky/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch b/poky/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch index aac1c43465..8b88c308f2 100644 --- a/poky/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch +++ b/poky/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch @@ -1,4 +1,4 @@ -From bd7fb8be2ae2d75347cf7733302d5093046ffa85 Mon Sep 17 00:00:00 2001 +From 027229d25392b22d7280c0abbc3efde4f467d167 Mon Sep 17 00:00:00 2001 From: Peiran Hong <peiran.hong@windriver.com> Date: Thu, 5 Sep 2019 15:42:22 -0400 Subject: [PATCH] Skip strip-trailing-cr test case @@ -10,19 +10,21 @@ package. Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Peiran Hong <peiran.hong@windriver.com> + --- tests/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 83a7c9d..04d51b5 100644 +index d98df82..757ea52 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -21,8 +21,10 @@ TESTS = \ +@@ -21,9 +21,11 @@ TESTS = \ stdin \ strcoll-0-names \ filename-quoting \ - strip-trailing-cr \ + timezone \ colors +# Skipping this test since it requires valgrind +# and thus is too heavy for diffutils package @@ -30,6 +32,3 @@ index 83a7c9d..04d51b5 100644 XFAIL_TESTS = large-subopt --- -2.21.0 - diff --git a/poky/meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch b/poky/meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch deleted file mode 100644 index 4928e1eaff..0000000000 --- a/poky/meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f385ad6639380eb6dfa8b8eb4a5ba65dd12db744 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 25 Mar 2022 13:43:19 -0700 -Subject: [PATCH] mcontext is not a standard layout so glibc and musl differ - -This is already applied to libsigsegv upstream, hopefully next version -of grep will update its internal copy and we can drop this patch - -Upstream-Status: Backport [https://git.savannah.gnu.org/gitweb/?p=libsigsegv.git;a=commitdiff;h=a6ff69873110c0a8ba6f7fd90532dbc11224828c] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lib/sigsegv.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/sigsegv.c b/lib/sigsegv.c -index 998c827..b6f4841 100644 ---- a/lib/sigsegv.c -+++ b/lib/sigsegv.c -@@ -219,8 +219,8 @@ int libsigsegv_version = LIBSIGSEGV_VERSION; - # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1] - # else /* 32-bit */ - /* both should be equivalent */ --# if 0 --# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] -+# if ! defined __GLIBC__ -+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_regs->gregs[1] - # else - # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] - # endif --- -2.35.1 - diff --git a/poky/meta/recipes-extended/diffutils/diffutils_3.8.bb b/poky/meta/recipes-extended/diffutils/diffutils_3.9.bb index 8889c83ee2..2bb9e6f32d 100644 --- a/poky/meta/recipes-extended/diffutils/diffutils_3.8.bb +++ b/poky/meta/recipes-extended/diffutils/diffutils_3.9.bb @@ -6,10 +6,9 @@ require diffutils.inc SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ file://run-ptest \ file://0001-Skip-strip-trailing-cr-test-case.patch \ - file://0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch \ " -SRC_URI[sha256sum] = "a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec" +SRC_URI[sha256sum] = "d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1" EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr --without-libsigsegv-prefix" diff --git a/poky/meta/recipes-extended/lighttpd/lighttpd/fix-missing-test.patch b/poky/meta/recipes-extended/lighttpd/lighttpd/fix-missing-test.patch new file mode 100644 index 0000000000..6aa843b75d --- /dev/null +++ b/poky/meta/recipes-extended/lighttpd/lighttpd/fix-missing-test.patch @@ -0,0 +1,23 @@ +From d809433d6d900e899f796606b11bdc6a73413ac5 Mon Sep 17 00:00:00 2001 +From: Glenn Strauss <gstrauss@gluelogic.com> +Date: Tue, 3 Jan 2023 17:50:16 -0500 +Subject: [PATCH] [meson] remove t/test_mod_evasive.c + +Upstream-Status: Backport [https://github.com/lighttpd/lighttpd1.4/commit/d809433d6d900e899f796606b11bdc6a73413ac5] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + src/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index ff472c320..77089fc3c 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -721,7 +721,6 @@ test('test_mod', executable('test_mod', + 't/test_mod.c', + 't/test_mod_access.c', + 't/test_mod_alias.c', +- 't/test_mod_evasive.c', + 't/test_mod_evhost.c', + 't/test_mod_indexfile.c', + 't/test_mod_simple_vhost.c', diff --git a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.67.bb b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.68.bb index 838881f238..a9163f8492 100644 --- a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.67.bb +++ b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.68.bb @@ -17,9 +17,10 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t file://index.html.lighttpd \ file://lighttpd.conf \ file://lighttpd \ + file://fix-missing-test.patch \ " -SRC_URI[sha256sum] = "7e04d767f51a8d824b32e2483ef2950982920d427d1272ef4667f49d6f89f358" +SRC_URI[sha256sum] = "e56f37ae52b63e1ada4d76ce78005affb6e56eea2f6bdb0ce17d6d36e9583384" DEPENDS = "virtual/crypt" @@ -27,19 +28,19 @@ PACKAGECONFIG ??= "openssl pcre zlib \ ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ " -PACKAGECONFIG[libev] = "-Dwith_libev=true,-Dwith_libev=false,libev" -PACKAGECONFIG[mysql] = "-Dwith_mysql=true,-Dwith_mysql=false,mariadb" -PACKAGECONFIG[ldap] = "-Dwith_ldap=true,-Dwith_ldap=false,openldap" +PACKAGECONFIG[libev] = "-Dwith_libev=enabled,-Dwith_libev=disabled,libev" +PACKAGECONFIG[mysql] = "-Dwith_mysql=enabled,-Dwith_mysql=disabled,mariadb" +PACKAGECONFIG[ldap] = "-Dwith_ldap=enabled,-Dwith_ldap=disabled,openldap" PACKAGECONFIG[attr] = "-Dwith_xattr=true,-Dwith_xattr=false,attr" PACKAGECONFIG[openssl] = "-Dwith_openssl=true,-Dwith_openssl=false,openssl" -PACKAGECONFIG[krb5] = "-Dwith_krb5=true,-Dwith_krb5=false,krb5" -PACKAGECONFIG[pcre] = "-Dwith_pcre=true,-Dwith_pcre=false,libpcre" -PACKAGECONFIG[zlib] = "-Dwith_zlib=true,-Dwith_zlib=false,zlib" -PACKAGECONFIG[bzip2] = "-Dwith_bzip=true,-Dwith_bzip=false,bzip2" -PACKAGECONFIG[webdav-props] = "-Dwith_webdav_props=true,-Dwith_webdav_props=false,libxml2 sqlite3" -PACKAGECONFIG[webdav-locks] = "-Dwith_webdav_locks=true,-Dwith_webdav_locks=false,util-linux" +PACKAGECONFIG[krb5] = "-Dwith_krb5=enabled,-Dwith_krb5=disabled,krb5" +PACKAGECONFIG[pcre] = "-Dwith_pcre=pcre2,-Dwith_pcre=disabled,libpcre2" +PACKAGECONFIG[zlib] = "-Dwith_zlib=enabled,-Dwith_zlib=disabled,zlib" +PACKAGECONFIG[bzip2] = "-Dwith_bzip=enabled,-Dwith_bzip=disabled,bzip2" +PACKAGECONFIG[webdav-props] = "-Dwith_webdav_props=enabled,-Dwith_webdav_props=disabled,libxml2 sqlite3" +PACKAGECONFIG[webdav-locks] = "-Dwith_webdav_locks=enabled,-Dwith_webdav_locks=disabled,util-linux" PACKAGECONFIG[lua] = "-Dwith_lua=true,-Dwith_lua=false,lua" -PACKAGECONFIG[zstd] = "-Dwith_zstd=true,-Dwith_zstd=false,zstd" +PACKAGECONFIG[zstd] = "-Dwith_zstd=enabled,-Dwith_zstd=disabled,zstd" inherit meson pkgconfig update-rc.d gettext systemd diff --git a/poky/meta/recipes-extended/lsof/lsof_4.96.5.bb b/poky/meta/recipes-extended/lsof/lsof_4.98.0.bb index 9f80176ee1..835ce3b8df 100644 --- a/poky/meta/recipes-extended/lsof/lsof_4.96.5.bb +++ b/poky/meta/recipes-extended/lsof/lsof_4.98.0.bb @@ -4,18 +4,18 @@ Its name stands for LiSt Open Files, and it does just that." HOMEPAGE = "http://people.freebsd.org/~abe/" SECTION = "devel" LICENSE = "Spencer-94" -LIC_FILES_CHKSUM = "file://00README;beginline=645;endline=679;md5=964df275d26429ba3b39dbb9f205172a" +LIC_FILES_CHKSUM = "file://COPYING;md5=a48ac97a8550eff12395a2c0d6151510" SRC_URI = "git://github.com/lsof-org/lsof;branch=master;protocol=https \ file://remove-host-information.patch" -SRCREV = "898916d4c7c390ea4610aebaf1d32b8a3c49f26b" +SRCREV = "546eb1c9910e7c137fdff551683c35a736021e05" S = "${WORKDIR}/git" inherit update-alternatives -ALTERNATIVE_${PN} = "lsof" +ALTERNATIVE:${PN} = "lsof" ALTERNATIVE_LINK_NAME[lsof] = "${sbindir}/lsof" # Make our priority higher than busybox ALTERNATIVE_PRIORITY = "100" @@ -38,7 +38,7 @@ export I = "${STAGING_INCDIR}" export L = "${STAGING_INCDIR}" do_compile () { - oe_runmake 'CC=${CC}' 'CFGL=${LDFLAGS} -L./lib -llsof' 'DEBUG=' 'INCL=${CFLAGS}' + oe_runmake 'CC=${CC}' 'CFGL=${LDFLAGS} -L./lib -llsof' 'DEBUG=' 'INCL=${CFLAGS} -I..' } do_install () { diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-testcases-Fix-largefile-support.patch b/poky/meta/recipes-extended/ltp/ltp/0001-testcases-Fix-largefile-support.patch deleted file mode 100644 index e9b48c392f..0000000000 --- a/poky/meta/recipes-extended/ltp/ltp/0001-testcases-Fix-largefile-support.patch +++ /dev/null @@ -1,426 +0,0 @@ -From 3cca69b85c88c6eb4f02313b3c6a9e0f6cc0b5d7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 14 Dec 2022 18:14:22 -0800 -Subject: [PATCH] testcases: Fix largefile support - -Use standard functions ( not 64-bit equivalents ) which operate on off_t -and pass -D_FILE_OFFSET_BITS=64 to enable LFS always so off_t is 64bit -for these tests. - -This helps making it portable across musl which has removed the 64bit -transition functions from _GNU_SOURCE namespace. - -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2022-December/032310.html] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - testcases/kernel/io/direct_io/Makefile | 2 +- - testcases/kernel/io/direct_io/diotest2.c | 4 ++-- - testcases/kernel/io/direct_io/diotest5.c | 10 +++++----- - testcases/kernel/io/direct_io/diotest6.c | 4 ++-- - testcases/kernel/syscalls/fcntl/fcntl18.c | 6 +++--- - testcases/kernel/syscalls/fcntl/fcntl34.c | 2 +- - testcases/kernel/syscalls/fcntl/fcntl36.c | 4 ++-- - testcases/kernel/syscalls/llseek/Makefile | 2 ++ - testcases/kernel/syscalls/llseek/llseek01.c | 14 +++++++------- - testcases/kernel/syscalls/llseek/llseek02.c | 12 ++++++------ - testcases/kernel/syscalls/llseek/llseek03.c | 6 +++--- - testcases/kernel/syscalls/open/Makefile | 2 ++ - testcases/kernel/syscalls/open/open12.c | 6 +++--- - testcases/kernel/syscalls/openat/Makefile | 2 ++ - testcases/kernel/syscalls/openat/openat02.c | 6 +++--- - testcases/kernel/syscalls/sync_file_range/Makefile | 2 ++ - .../syscalls/sync_file_range/sync_file_range01.c | 4 ++-- - .../syscalls/sync_file_range/sync_file_range02.c | 6 +++--- - 18 files changed, 51 insertions(+), 43 deletions(-) - -diff --git a/testcases/kernel/io/direct_io/Makefile b/testcases/kernel/io/direct_io/Makefile -index 777f7b166..7480d7b0d 100644 ---- a/testcases/kernel/io/direct_io/Makefile -+++ b/testcases/kernel/io/direct_io/Makefile -@@ -5,7 +5,7 @@ top_srcdir ?= ../../../.. - - include $(top_srcdir)/include/mk/testcases.mk - --CFLAGS += -DSHARED_OFILE -D_GNU_SOURCE -+CFLAGS += -DSHARED_OFILE -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE - - LDLIBS += -lpthread - -diff --git a/testcases/kernel/io/direct_io/diotest2.c b/testcases/kernel/io/direct_io/diotest2.c -index c407c46ae..db47ee8ef 100644 ---- a/testcases/kernel/io/direct_io/diotest2.c -+++ b/testcases/kernel/io/direct_io/diotest2.c -@@ -78,7 +78,7 @@ int bufsize = BUFSIZE; - * For each iteration, write data starting at offse+iter*bufsize - * location in the file and read from there. - */ --int runtest(int fd_r, int fd_w, int iter, off64_t offset, int action) -+int runtest(int fd_r, int fd_w, int iter, off_t offset, int action) - { - char *buf1; - char *buf2; -@@ -136,7 +136,7 @@ static void cleanup(void); - int main(int argc, char *argv[]) - { - int iter = 100; /* Iterations. Default 100 */ -- off64_t offset = 0; /* Offset. Default 0 */ -+ off_t offset = 0; /* Offset. Default 0 */ - int i, action, fd_r, fd_w; - int fail_count = 0, total = 0, failed = 0; - -diff --git a/testcases/kernel/io/direct_io/diotest5.c b/testcases/kernel/io/direct_io/diotest5.c -index 9bf917c64..ac66f2a04 100644 ---- a/testcases/kernel/io/direct_io/diotest5.c -+++ b/testcases/kernel/io/direct_io/diotest5.c -@@ -75,14 +75,14 @@ int TST_TOTAL = 3; /* Total number of test conditions */ - static int bufsize = BUFSIZE; /* Buffer size. Default 4k */ - static int iter = 20; /* Iterations. Default 20 */ - static int nvector = 20; /* Vector array. Default 20 */ --static off64_t offset = 0; /* Start offset. Default 0 */ -+static off_t offset = 0; /* Start offset. Default 0 */ - static char filename[LEN]; /* Test data file */ - static int fd1 = -1; - /* - * runtest: Write the data in vector array to the file. Read the data - * from the file into another vectory array and verify. Repeat the test. - */ --int runtest(int fd_r, int fd_w, int iter, off64_t offset, int action) -+int runtest(int fd_r, int fd_w, int iter, off_t offset, int action) - { - int i; - struct iovec *iov1, *iov2, *iovp; -@@ -218,7 +218,7 @@ int main(int argc, char *argv[]) - tst_brkm(TBROK, cleanup, "fd_w open failed for %s: %s", - filename, strerror(errno)); - } -- if ((fd_r = open64(filename, O_DIRECT | O_RDONLY | O_CREAT, 0666)) < 0) { -+ if ((fd_r = open(filename, O_DIRECT | O_RDONLY | O_CREAT, 0666)) < 0) { - tst_brkm(TBROK, cleanup, "fd_r open failed for %s: %s", - filename, strerror(errno)); - } -@@ -240,7 +240,7 @@ int main(int argc, char *argv[]) - tst_brkm(TBROK, cleanup, "fd_w open failed for %s: %s", - filename, strerror(errno)); - } -- if ((fd_r = open64(filename, O_RDONLY | O_CREAT, 0666)) < 0) { -+ if ((fd_r = open(filename, O_RDONLY | O_CREAT, 0666)) < 0) { - tst_brkm(TBROK, cleanup, "fd_r open failed for %s: %s", - filename, strerror(errno)); - } -@@ -261,7 +261,7 @@ int main(int argc, char *argv[]) - tst_brkm(TBROK, cleanup, "fd_w open failed for %s: %s", - filename, strerror(errno)); - } -- if ((fd_r = open64(filename, O_DIRECT | O_RDONLY | O_CREAT, 0666)) < 0) { -+ if ((fd_r = open(filename, O_DIRECT | O_RDONLY | O_CREAT, 0666)) < 0) { - tst_brkm(TBROK, cleanup, "fd_r open failed for %s: %s", - filename, strerror(errno)); - } -diff --git a/testcases/kernel/io/direct_io/diotest6.c b/testcases/kernel/io/direct_io/diotest6.c -index a06e6b82b..1905380f0 100644 ---- a/testcases/kernel/io/direct_io/diotest6.c -+++ b/testcases/kernel/io/direct_io/diotest6.c -@@ -62,7 +62,7 @@ int TST_TOTAL = 3; - - static int iter = 100; - static int bufsize = BUFSIZE; --static off64_t offset = 0; -+static off_t offset = 0; - static int nvector = 20; - static char filename[LEN]; - static int fd1 = -1; -@@ -84,7 +84,7 @@ static void prg_usage(void) - */ - int runtest(int fd_r, int fd_w, int childnum, int action) - { -- off64_t seekoff; -+ off_t seekoff; - int i, ret = -1; - ssize_t n = 0; - struct iovec *iov_r, *iov_w; -diff --git a/testcases/kernel/syscalls/fcntl/fcntl18.c b/testcases/kernel/syscalls/fcntl/fcntl18.c -index 5eefbd128..1105dd393 100644 ---- a/testcases/kernel/syscalls/fcntl/fcntl18.c -+++ b/testcases/kernel/syscalls/fcntl/fcntl18.c -@@ -103,11 +103,11 @@ int main(int ac, char **av) - tst_resm(TINFO, "Enter block 2"); - fail = 0; - /* Error condition if address is bad */ -- retval = fcntl(fd, F_GETLK64, (struct flock *)INVAL_FLAG); -+ retval = fcntl(fd, F_GETLK, (struct flock *)INVAL_FLAG); - if (errno == EFAULT) { -- tst_resm(TPASS, "Test F_GETLK64: for errno EFAULT PASSED"); -+ tst_resm(TPASS, "Test F_GETLK: for errno EFAULT PASSED"); - } else { -- tst_resm(TFAIL, "Test F_GETLK64: for errno EFAULT FAILED"); -+ tst_resm(TFAIL, "Test F_GETLK: for errno EFAULT FAILED"); - fail = 1; - } - if (fail) { -diff --git a/testcases/kernel/syscalls/fcntl/fcntl34.c b/testcases/kernel/syscalls/fcntl/fcntl34.c -index 3442114ff..536dead29 100644 ---- a/testcases/kernel/syscalls/fcntl/fcntl34.c -+++ b/testcases/kernel/syscalls/fcntl/fcntl34.c -@@ -54,7 +54,7 @@ void *thread_fn_01(void *arg) - - memset(buf, (intptr_t)arg, write_size); - -- struct flock64 lck = { -+ struct flock lck = { - .l_whence = SEEK_SET, - .l_start = 0, - .l_len = 1, -diff --git a/testcases/kernel/syscalls/fcntl/fcntl36.c b/testcases/kernel/syscalls/fcntl/fcntl36.c -index d6b07fc41..4e4d48afc 100644 ---- a/testcases/kernel/syscalls/fcntl/fcntl36.c -+++ b/testcases/kernel/syscalls/fcntl/fcntl36.c -@@ -72,7 +72,7 @@ static void *fn_ofd_w(void *arg) - int fd = SAFE_OPEN(fname, O_RDWR); - long wt = pa->cnt; - -- struct flock64 lck = { -+ struct flock lck = { - .l_whence = SEEK_SET, - .l_start = pa->offset, - .l_len = pa->length, -@@ -151,7 +151,7 @@ static void *fn_ofd_r(void *arg) - int i; - int fd = SAFE_OPEN(fname, O_RDWR); - -- struct flock64 lck = { -+ struct flock lck = { - .l_whence = SEEK_SET, - .l_start = pa->offset, - .l_len = pa->length, -diff --git a/testcases/kernel/syscalls/llseek/Makefile b/testcases/kernel/syscalls/llseek/Makefile -index 044619fb8..8a916d0fa 100644 ---- a/testcases/kernel/syscalls/llseek/Makefile -+++ b/testcases/kernel/syscalls/llseek/Makefile -@@ -6,3 +6,5 @@ top_srcdir ?= ../../../.. - include $(top_srcdir)/include/mk/testcases.mk - - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -diff --git a/testcases/kernel/syscalls/llseek/llseek01.c b/testcases/kernel/syscalls/llseek/llseek01.c -index 50f35493d..efb444dc8 100644 ---- a/testcases/kernel/syscalls/llseek/llseek01.c -+++ b/testcases/kernel/syscalls/llseek/llseek01.c -@@ -4,7 +4,7 @@ - * 07/2001 Ported by Wayne Boyer - */ - /* -- * Verify that lseek64() call succeeds to set the file pointer position to an -+ * Verify that lseek() call succeeds to set the file pointer position to an - * offset larger than file size limit (RLIMIT_FSIZE). Also, verify that any - * attempt to write to this location fails. - */ -@@ -27,22 +27,22 @@ static int fildes; - - static void verify_llseek(void) - { -- TEST(lseek64(fildes, (loff_t) (80 * BUFSIZ), SEEK_SET)); -+ TEST(lseek(fildes, (loff_t) (80 * BUFSIZ), SEEK_SET)); - if (TST_RET == (80 * BUFSIZ)) -- tst_res(TPASS, "lseek64() can set file pointer position larger than file size limit"); -+ tst_res(TPASS, "lseek() can set file pointer position larger than file size limit"); - else -- tst_res(TFAIL, "lseek64() returned wrong value %ld when write past file size", TST_RET); -+ tst_res(TFAIL, "lseek() returned wrong value %ld when write past file size", TST_RET); - - if (write(fildes, write_buff, BUFSIZ) == -1) - tst_res(TPASS,"write failed after file size limit"); - else - tst_brk(TFAIL, "write successful after file size limit"); - -- TEST(lseek64(fildes, (loff_t) BUFSIZ, SEEK_SET)); -+ TEST(lseek(fildes, (loff_t) BUFSIZ, SEEK_SET)); - if (TST_RET == BUFSIZ) -- tst_res(TPASS,"lseek64() can set file pointer position under filer size limit"); -+ tst_res(TPASS,"lseek() can set file pointer position under filer size limit"); - else -- tst_brk(TFAIL,"lseek64() returns wrong value %ld when write under file size", TST_RET); -+ tst_brk(TFAIL,"lseek() returns wrong value %ld when write under file size", TST_RET); - - if (write(fildes, write_buff, BUFSIZ) != -1) - tst_res(TPASS, "write succcessfully under file size limit"); -diff --git a/testcases/kernel/syscalls/llseek/llseek02.c b/testcases/kernel/syscalls/llseek/llseek02.c -index 3d9c21fc9..5431969f9 100644 ---- a/testcases/kernel/syscalls/llseek/llseek02.c -+++ b/testcases/kernel/syscalls/llseek/llseek02.c -@@ -5,8 +5,8 @@ - */ - /* - * Description: -- * 1) lseek64(2) fails and sets errno to EINVAL when whence is invalid. -- * 2) lseek64(2) fails ans sets errno to EBADF when fd is not an open -+ * 1) lseek(2) fails and sets errno to EINVAL when whence is invalid. -+ * 2) lseek(2) fails ans sets errno to EBADF when fd is not an open - * file descriptor. - */ - -@@ -39,17 +39,17 @@ static void verify_llseek(unsigned int n) - { - struct tcase *tc = &tcases[n]; - -- TEST(lseek64(*tc->fd, (loff_t) 1, tc->whence)); -+ TEST(lseek(*tc->fd, (loff_t) 1, tc->whence)); - if (TST_RET != (off_t) -1) { -- tst_res(TFAIL, "lseek64(%d, 1, %d) succeeded unexpectedly (%ld)", -+ tst_res(TFAIL, "lseek(%d, 1, %d) succeeded unexpectedly (%ld)", - *tc->fd, tc->whence, TST_RET); - return; - } - if (TST_ERR == tc->exp_err) { -- tst_res(TPASS | TTERRNO, "lseek64(%d, 1, %d) failed as expected", -+ tst_res(TPASS | TTERRNO, "lseek(%d, 1, %d) failed as expected", - *tc->fd, tc->whence); - } else { -- tst_res(TFAIL | TTERRNO, "lseek64(%d, 1, %d) failed " -+ tst_res(TFAIL | TTERRNO, "lseek(%d, 1, %d) failed " - "unexpectedly, expected %s", *tc->fd, tc->whence, - tst_strerrno(tc->exp_err)); - } -diff --git a/testcases/kernel/syscalls/llseek/llseek03.c b/testcases/kernel/syscalls/llseek/llseek03.c -index d780f2af6..6c34119e5 100644 ---- a/testcases/kernel/syscalls/llseek/llseek03.c -+++ b/testcases/kernel/syscalls/llseek/llseek03.c -@@ -72,7 +72,7 @@ static const char *str_whence(int whence) - } - } - --static void verify_lseek64(unsigned int n) -+static void verify_lseek(unsigned int n) - { - struct tcase *tc = &tcases[n]; - char read_buf[128]; -@@ -82,7 +82,7 @@ static void verify_lseek64(unsigned int n) - - SAFE_READ(1, fd, read_buf, 4); - -- TEST(lseek64(fd, tc->off, tc->whence)); -+ TEST(lseek(fd, tc->off, tc->whence)); - - if (TST_RET == -1) { - tst_res(TFAIL | TTERRNO, "llseek failed on %s ", TEST_FILE); -@@ -121,6 +121,6 @@ exit: - static struct tst_test test = { - .needs_tmpdir = 1, - .setup = setup, -- .test = verify_lseek64, -+ .test = verify_lseek, - .tcnt = ARRAY_SIZE(tcases), - }; -diff --git a/testcases/kernel/syscalls/open/Makefile b/testcases/kernel/syscalls/open/Makefile -index 044619fb8..8a916d0fa 100644 ---- a/testcases/kernel/syscalls/open/Makefile -+++ b/testcases/kernel/syscalls/open/Makefile -@@ -6,3 +6,5 @@ top_srcdir ?= ../../../.. - include $(top_srcdir)/include/mk/testcases.mk - - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -diff --git a/testcases/kernel/syscalls/open/open12.c b/testcases/kernel/syscalls/open/open12.c -index bdf29a9a8..c840de53d 100644 ---- a/testcases/kernel/syscalls/open/open12.c -+++ b/testcases/kernel/syscalls/open/open12.c -@@ -233,14 +233,14 @@ static void test_cloexec(void) - static void test_largefile(void) - { - int fd; -- off64_t offset; -+ off_t offset; - - fd = SAFE_OPEN(cleanup, LARGE_FILE, - O_LARGEFILE | O_RDWR | O_CREAT, 0777); - -- offset = lseek64(fd, 4.1*1024*1024*1024, SEEK_SET); -+ offset = lseek(fd, 4.1*1024*1024*1024, SEEK_SET); - if (offset == -1) -- tst_brkm(TBROK | TERRNO, cleanup, "lseek64 failed"); -+ tst_brkm(TBROK | TERRNO, cleanup, "lseek failed"); - - SAFE_WRITE(cleanup, 1, fd, LARGE_FILE, sizeof(LARGE_FILE)); - -diff --git a/testcases/kernel/syscalls/openat/Makefile b/testcases/kernel/syscalls/openat/Makefile -index 044619fb8..8a916d0fa 100644 ---- a/testcases/kernel/syscalls/openat/Makefile -+++ b/testcases/kernel/syscalls/openat/Makefile -@@ -6,3 +6,5 @@ top_srcdir ?= ../../../.. - include $(top_srcdir)/include/mk/testcases.mk - - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -diff --git a/testcases/kernel/syscalls/openat/openat02.c b/testcases/kernel/syscalls/openat/openat02.c -index 2ce119033..f6113852a 100644 ---- a/testcases/kernel/syscalls/openat/openat02.c -+++ b/testcases/kernel/syscalls/openat/openat02.c -@@ -22,7 +22,7 @@ - * 2)openat() succeeds to enable the close-on-exec flag for a - * file descriptor, when 'flags' is set to O_CLOEXEC. - * 3)openat() succeeds to allow files whose sizes cannot be -- * represented in an off_t but can be represented in an off64_t -+ * represented in an off_t but can be represented in an off_t - * to be opened, when 'flags' is set to O_LARGEFILE. - * 4)openat() succeeds to not update the file last access time - * (st_atime in the inode) when the file is read, when 'flags' -@@ -193,12 +193,12 @@ void testfunc_cloexec(void) - void testfunc_largefile(void) - { - int fd; -- off64_t offset; -+ off_t offset; - - fd = SAFE_OPEN(cleanup, LARGE_FILE, - O_LARGEFILE | O_RDWR | O_CREAT, 0777); - -- offset = lseek64(fd, 4.1*1024*1024*1024, SEEK_SET); -+ offset = lseek(fd, 4.1*1024*1024*1024, SEEK_SET); - if (offset == -1) - tst_brkm(TBROK | TERRNO, cleanup, "lseek64 failed"); - -diff --git a/testcases/kernel/syscalls/sync_file_range/Makefile b/testcases/kernel/syscalls/sync_file_range/Makefile -index 044619fb8..8a916d0fa 100644 ---- a/testcases/kernel/syscalls/sync_file_range/Makefile -+++ b/testcases/kernel/syscalls/sync_file_range/Makefile -@@ -6,3 +6,5 @@ top_srcdir ?= ../../../.. - include $(top_srcdir)/include/mk/testcases.mk - - include $(top_srcdir)/include/mk/generic_leaf_target.mk -+ -+CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -diff --git a/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c b/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c -index 187ef6071..47188aa48 100644 ---- a/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c -+++ b/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c -@@ -44,8 +44,8 @@ static int bfd = -1; - - struct test_case { - int *fd; -- off64_t offset; -- off64_t nbytes; -+ off_t offset; -+ off_t nbytes; - unsigned int flags; - int error; - } tcases[] = { -diff --git a/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c b/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c -index 5da751c70..28a8156c8 100644 ---- a/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c -+++ b/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c -@@ -31,10 +31,10 @@ - - struct testcase { - char *fname; -- off64_t sync_off; -- off64_t sync_size; -+ off_t sync_off; -+ off_t sync_size; - size_t exp_sync_size; -- off64_t write_off; -+ off_t write_off; - size_t write_size_mb; - const char *desc; - }; diff --git a/poky/meta/recipes-extended/ltp/ltp_20220930.bb b/poky/meta/recipes-extended/ltp/ltp_20230127.bb index 568a6320c1..4325aa6672 100644 --- a/poky/meta/recipes-extended/ltp/ltp_20220930.bb +++ b/poky/meta/recipes-extended/ltp/ltp_20230127.bb @@ -24,12 +24,11 @@ TUNE_CCARGS:remove:x86-64 = "-mfpmath=sse" CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "b763f81998f19f783982d3937d1fd05bcf649c16" +SRCREV = "dd2d61ac1a1e09797a6165f478abd4a9f4f43035" SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \ file://0001-Remove-OOM-tests-from-runtest-mm.patch \ file://disable_hanging_tests.patch \ - file://0001-testcases-Fix-largefile-support.patch \ " S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch b/poky/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch index 012a499684..5ede82d342 100644 --- a/poky/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch +++ b/poky/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch @@ -1,4 +1,4 @@ -From cdc7c278212ae836eecb4cc9d42c29443cc128a0 Mon Sep 17 00:00:00 2001 +From 62c86b69106d0d702167ba1b963ea1c201cce5af Mon Sep 17 00:00:00 2001 From: Robert Yang <liezhi.yang@windriver.com> Date: Thu, 6 Apr 2017 02:24:28 -0700 Subject: [PATCH] mc: replace "perl -w" with "use warnings" @@ -20,6 +20,7 @@ The man2hlp.in already has "use warnings;", so just remove '-w' is OK. Upstream-Status: Submitted [https://github.com/MidnightCommander/mc/pull/174] Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + --- src/man2hlp/man2hlp.in | 2 +- src/vfs/extfs/helpers/a+.in | 4 +++- @@ -30,12 +31,12 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/man2hlp/man2hlp.in b/src/man2hlp/man2hlp.in -index f095830..558a674 100644 +index 08765d8..8aa7131 100644 --- a/src/man2hlp/man2hlp.in +++ b/src/man2hlp/man2hlp.in @@ -1,4 +1,4 @@ --#! @PERL@ -w -+#! @PERL@ +-#! @PERL_FOR_BUILD@ -w ++#! @PERL_FOR_BUILD@ # # Man page to help file converter # Copyright (C) 1994, 1995, 1998, 2000, 2001, 2002, 2003, 2004, 2005, @@ -59,7 +60,7 @@ index 579441c..fe446f4 100644 $_ = shift(@_); s/([^\w\/.+-])/\\$1/g; diff --git a/src/vfs/extfs/helpers/mailfs.in b/src/vfs/extfs/helpers/mailfs.in -index e9455be..059f41f 100644 +index 4bdd68b..5bb373b 100644 --- a/src/vfs/extfs/helpers/mailfs.in +++ b/src/vfs/extfs/helpers/mailfs.in @@ -1,6 +1,7 @@ @@ -72,7 +73,7 @@ index e9455be..059f41f 100644 # MC extfs for (possibly compressed) Berkeley style mailbox files # Peter Daum <gator@cs.tu-berlin.de> (Jan 1998, mc-4.1.24) diff --git a/src/vfs/extfs/helpers/patchfs.in b/src/vfs/extfs/helpers/patchfs.in -index ef407de..3ad4b53 100644 +index c20cd54..1f1e75b 100644 --- a/src/vfs/extfs/helpers/patchfs.in +++ b/src/vfs/extfs/helpers/patchfs.in @@ -1,4 +1,4 @@ @@ -107,7 +108,7 @@ index 418611f..82c7ccf 100644 'apr' => '04', 'may' => '05', 'jun' => '06', 'jul' => '07', 'aug' => '08', 'sep' => '09', diff --git a/src/vfs/extfs/helpers/uzip.in b/src/vfs/extfs/helpers/uzip.in -index b1c4f90..c8eb335 100644 +index c468f3a..ceffb53 100644 --- a/src/vfs/extfs/helpers/uzip.in +++ b/src/vfs/extfs/helpers/uzip.in @@ -1,4 +1,4 @@ @@ -124,6 +125,3 @@ index b1c4f90..c8eb335 100644 # # Configuration options --- -2.10.2 - diff --git a/poky/meta/recipes-extended/mc/files/nomandate.patch b/poky/meta/recipes-extended/mc/files/nomandate.patch index c01d065b0e..4ebaaa2fa7 100644 --- a/poky/meta/recipes-extended/mc/files/nomandate.patch +++ b/poky/meta/recipes-extended/mc/files/nomandate.patch @@ -1,4 +1,4 @@ -From f02010965af21db018c4e108b2193c872406a314 Mon Sep 17 00:00:00 2001 +From 4482ed0b8bd506cc2590ceacfdada6cc34450796 Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Tue, 4 Feb 2020 18:12:15 +0000 Subject: [PATCH] mc: Fix manpage date indeterminism @@ -21,7 +21,7 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/man/date-of-man-include.am b/doc/man/date-of-man-include.am -index 3a4e599..f11e9b3 100644 +index c6b1e69..165a796 100644 --- a/doc/man/date-of-man-include.am +++ b/doc/man/date-of-man-include.am @@ -1,5 +1,5 @@ @@ -29,5 +29,5 @@ index 3a4e599..f11e9b3 100644 - -e "s/%DATE_OF_MAN_PAGE%/$${MAN_DATE}/g" \ + -e "s/%DATE_OF_MAN_PAGE%//g" \ -e "s/%MAN_VERSION%/@MAN_VERSION@/g" \ - -e "s{%prefix%{@prefix@{g" \ -e "s{%sysconfdir%{@sysconfdir@{g" \ + -e "s{%libexecdir%{@libexecdir@{g" \ diff --git a/poky/meta/recipes-extended/mc/mc_4.8.28.bb b/poky/meta/recipes-extended/mc/mc_4.8.29.bb index 9a950a8cd0..c9db172183 100644 --- a/poky/meta/recipes-extended/mc/mc_4.8.28.bb +++ b/poky/meta/recipes-extended/mc/mc_4.8.29.bb @@ -12,7 +12,7 @@ SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-mc-replace-perl-w-with-use-warnings.patch \ file://nomandate.patch \ " -SRC_URI[sha256sum] = "6bb47533d7a55bb21e46292d2f94786c9037bd7a70bf02b6a3c48adb0c9ce20c" +SRC_URI[sha256sum] = "ba6b2d8752806ac23fe045c1b081eb66dcefa6159205c79f86c005dcaf9941c1" # remove at next version upgrade or when output changes HASHEQUIV_HASH_VERSION .= ".2" diff --git a/poky/meta/recipes-extended/msmtp/msmtp_1.8.22.bb b/poky/meta/recipes-extended/msmtp/msmtp_1.8.23.bb index d56af7346b..5e68a7ea92 100644 --- a/poky/meta/recipes-extended/msmtp/msmtp_1.8.22.bb +++ b/poky/meta/recipes-extended/msmtp/msmtp_1.8.23.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] = "1b04206286a5b82622335e4eb09e17074368b7288e53d134543cbbc6b79ea3e7" +SRC_URI[sha256sum] = "cf04c16b099b3d414db4b5b93fc5ed9d46aad564c81a352aa107a33964c356b8" inherit gettext autotools update-alternatives pkgconfig diff --git a/poky/meta/recipes-extended/stress-ng/stress-ng_0.15.02.bb b/poky/meta/recipes-extended/stress-ng/stress-ng_0.15.03.bb index 75400f589e..13a8b49f70 100644 --- a/poky/meta/recipes-extended/stress-ng/stress-ng_0.15.02.bb +++ b/poky/meta/recipes-extended/stress-ng/stress-ng_0.15.03.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ file://0001-test-float-Make-variables-global.patch \ file://0001-Pass-LD_GOLD-1-via-makefile-to-enable-gold-linker.patch" -SRCREV = "4164f6842c712c2d9a13619c3c70fd35d8d02cdb" +SRCREV = "f3be0447c10fd5652b4c3753d56bcaac13fd8917" S = "${WORKDIR}/git" DEPENDS = "coreutils-native libbsd" diff --git a/poky/meta/recipes-extended/sudo/sudo_1.9.12p1.bb b/poky/meta/recipes-extended/sudo/sudo_1.9.12p2.bb index 1495b67b8b..ae7207c081 100644 --- a/poky/meta/recipes-extended/sudo/sudo_1.9.12p1.bb +++ b/poky/meta/recipes-extended/sudo/sudo_1.9.12p2.bb @@ -8,7 +8,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[sha256sum] = "475a18a8eb3da8b2917ceab063a6baf51ea09128c3c47e3e0e33ab7497bab7d8" +SRC_URI[sha256sum] = "b9a0b1ae0f1ddd9be7f3eafe70be05ee81f572f6f536632c44cd4101bb2a8539" 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/sysstat/sysstat_12.6.1.bb b/poky/meta/recipes-extended/sysstat/sysstat_12.6.2.bb index 6df7bdbb83..f9e5778e76 100644 --- a/poky/meta/recipes-extended/sysstat/sysstat_12.6.1.bb +++ b/poky/meta/recipes-extended/sysstat/sysstat_12.6.2.bb @@ -4,4 +4,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" SRC_URI += "file://0001-configure.in-remove-check-for-chkconfig.patch" -SRC_URI[sha256sum] = "18ff5a4e149e2568e43385637f72437fe6bafcc1322a93d13d1981e9464a0342" +SRC_URI[sha256sum] = "3e77134aedaa6fc57d9745da67edfd8990e19adee71ac47196229261c563fb48" diff --git a/poky/meta/recipes-extended/texinfo/texinfo_7.0.1.bb b/poky/meta/recipes-extended/texinfo/texinfo_7.0.2.bb index f0f9211594..da455df4bb 100644 --- a/poky/meta/recipes-extended/texinfo/texinfo_7.0.1.bb +++ b/poky/meta/recipes-extended/texinfo/texinfo_7.0.2.bb @@ -35,7 +35,7 @@ SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ ${TARGET_PATCH} \ " -SRC_URI[sha256sum] = "53c01dd34c9bf116866d03aabd38c5cd9ee95ac10043d61aa33dec0d27825d8d" +SRC_URI[sha256sum] = "a9c646bc4f6bb31843f129f8408a3a627334575faf7b22ebc416be5cb1570553" tex_texinfo = "texmf/tex/texinfo" 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 897417314d..c390fcf33c 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 @@ -48,4 +48,7 @@ do_install:append() { ${D}${systemd_system_unitdir}/xinetd.service } -RDEPENDS:${PN} += "perl" +# Script for converting inetd.conf files into xinetd.conf files +PACKAGES =+ "${PN}-xconv" +FILES:${PN}-xconv = "${bindir}/xconv.pl" +RDEPENDS:${PN}-xconv += "perl" |