From d25ed3241ddffad58c7a52e45e388e6c48d5123a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sat, 27 Jun 2020 00:28:28 -0500 Subject: poky: subtree update:26ae42ded7..5951cbcabe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Alex Kiernan (1): recipetool: Fix list concatenation when using edit Alexander Kanavin (4): apr-util: make gdbm optional gobject-introspection: add a patch to fix a build race icu: merge .inc into main recipe icu: make filtered data generation optional, serial and off by default Alexandru N. Onea (3): bitbake: perforce: add basic progress handler for perforce bitbake: perforce: add local path handling SRC_URI options bitbake: bitbake-user-manual: update perforce fetcher docs Andreas M?ller (1): meson.bbclass: avoid unexpected operating-system names Andreas Müller (6): boost: Add upstream patch to fix build on depending projects libinput: upgrade 1.15.5 -> 1.15.6 sqlite3: upgrade 3.32.2 -> 3.32.3 desktop-file-utils: upgrade 0.24 -> 0.26 file: upgrade 5.38 -> 5.39 ffmpeg: upgrade 4.2.3 -> 4.3 Andrej Valek (1): oeqa/runtime/cases/ptest: Make output content path absolute Andrew Geissler (1): meson: backport library ordering fix Armin Kuster (1): libuv: move from meta-oe to core for bind update Arthur She (1): igt-gpu-tools: add new package Changqing Li (1): mime.bbclass: fix post install scriptlet error Chen Qi (1): systemd-serialgetty: do not use BindsTo Daniel McGregor (3): sign_rpm.bbclass: ignore thread count systemd-conf: Accept MTU from DHCP buildhistory-collect-srcrevs: sort directories He Zhe (1): ltp: Fix copy_file_rang02 for 32-bit arches Hongxu Jia (1): libmodulemd: switch branch master -> main Jacob Kroon (5): bitbake: lib/bb/utils.py: Do not preserve TERM in the environment bitbake: bitbake-user-manual: Remove TERM from BB_HASHBASE_WHITELIST example bitbake.conf: Remove TERM from default BB_HASHBASE_WHITELIST grub: Remove native version of grub-efi distro_alias: Remove unused grub-efi distro aliases Jens Rehsack (1): u-boot: avoid blind merging all *.cfg Joe Slater (1): systemd: fix CVE-2020-13776 Joshua Watt (5): sstatesig: Account for all dataCaches being passed bitbake: bitbake: cache: Fix error message with bad multiconfig wic: Fix error message when reporting invalid offset classes/archiver: Create patched archive before configuring bitbake: cache: Bump cache version Konrad Weihmann (3): oeqa/runtime: Add OERequirePackage decorator bitbake: cookerdata: Add BBFILES_DYNAMIC inverse mode bitbake: bitbake-user-manual: Add BBFILES_DYNAMIC Mark Morton (2): New source files and Makefile update for Test Manual test-manual: Fixed codeblock formatting Martin Jansa (1): net-tools: backport a patch from upstream to use the same ifconfig format as debian/ubuntu Mingli Yu (3): python3: add the rdepends for python3-misc python3: add rdepends for python3-idle python3-dbusmock: add the missing rdepends Otavio Salvador (2): systemd: Sync systemd-serialgetty@.service with upstream mtd-utils: Fix return value of ubiformat Ovidiu Panait (2): dbus-test: Remove EXTRA_OECONF_X configs dbus,dbus-test: Move common parts to dbus.inc Paul Barker (2): bitbake: fetch2/gitsm: Mark srcrev as fetched once all submodules are processed bitbake: fetch2/gitsm: Make need_update() process submodules Paul Eggleton (5): graph-tool: switch to argparse graph-tool: add filter subcommand dpkg-native: rebase and reinstate fix for "tar: file changed as we read it" shadow-sysroot: drop unused SRC_URI checksums devtool: fix typo Peter Kjellerstedt (1): relocatable.bbclass: Avoid an exception if an empty pkgconfig dir exist Pierre-Jean Texier (3): diffoscope: upgrade 146 -> 147 ell: upgrade 0.31 -> 0.32 curl: upgrade 7.70.0 -> 7.71.0 Rasmus Villemoes (1): curl: add debug info Richard Purdie (15): buildhistory: Add simplistic file move detection bitbake: bin/bitbake: Update to next series release version perl: Fix host specific modules problems sanity.conf: Require bitbake 1.47.0 as the minimum version patchelf: Upgrade 0.10 -> 0.11 test-manual: Add SPDX license headers Makefile: Drop obsolete edison/denzil branch conditionals bitbake: tests/fetch: Switch from git.infradead.org to a YP mirror pseudo: Fix attr errors due to incorrect library resolution issues oeqa/selftest/runcmd: Add better debug for thread count mismatch failures oeqa/utils/command: Improve stdin handling in runCmd vulkan-headers: Fix upstream branch deletion issue recipes: Fix Upstream-Status Accepted -> Backport scripts/install-buildtools: Update to 3.2 M1 buildtools scripts/install-buildtools: Handle new format checksum files Robert P. J. Day (1): python: use official "pypi.org" URLs for HOMEPAGE Ross Burton (8): install-buildtools: fail if an error occurs install-buildtools: remove hardcoded x86-64 architecture install-buildtools: add option to disable checksum validation common-licenses: add BSD-2-Clause-Patent gstreamer1.0-plugins-bad: add support for vdpau go-binary-native: add binary Go to bootstrap tcmode-default: use go-binary-native by default go-native: merge bb/inc and add comment Ryan Rowe (1): python3: fix PGO for non-reproducible biniaries Sakib Sajal (1): qemu: uprev v4.2.0 -> v5.0.0 Samuli Piippo (2): cmake: allow chainloading of the toolchain file perl: use relative paths in the perl wrapper Steve Sakoman (1): buildtools-tarball: export OPENSSL_CONF in environment setup Tanu Kaskinen (1): pulseaudio: remove unnecessary libltdl copying Trevor Gamblin (1): python3-setuptools: patch entrypoints for faster initialization Tuomas Salokanto (1): recipetool: create: fix SRCBRANCH not being passed to params Valentin Longchamp (2): tools-profile: disable valgrind for powerpc soft-float valgrind: disable it for powerpc soft-float Wang Mingyu (5): powertop: upgrade 2.12 -> 2.13 man-db: upgrade 2.9.2 -> 2.9.3 valgrind: upgrade 3.16.0 -> 3.16.1 man-pages: upgrade 5.06 -> 5.07 harfbuzz: upgrade 2.6.7 -> 2.6.8 Yi Zhao (2): iptables: fix invalid symbolic link for ip6tables-apply iptables: split iptables-apply to its own package Yongxin Liu (1): linux-firmware: add ice for Intel E800 series driver Yuki Hoshino (1): sysvinit-inittab: Add support for tty devices with 10 or more number. akuster (9): bind: update to 9.11.19 adt-manual: Add SPDX license headers bsp-guide: Add SPDX license headers brief-yoctoprojectsqa: Add SPDX license headers dev-manual: Add SPDX License headers kernel-dev: Add SPDX license headers profile-manual: Add SPDX licence headers sdk-manual: Add SPDX license headers toaster-manaul: Add SPDX license headers haiqing (1): libpam: Remove option 'obscure' from common-password hongxu (1): kmod: add nativesdk support zangrc (1): ethtool:upgrade 5.6 -> 5.7 Signed-off-by: Andrew Geissler Change-Id: I1190ca17297b1167286cfc06033e8485396c7cce --- ...c-Remove-superfluous-declaration-of-progr.patch | 2 +- .../ethtool/ethtool/avoid_parallel_tests.patch | 2 +- .../ethtool/ethtool/fix-printf.patch | 32 -- poky/meta/recipes-extended/ethtool/ethtool_5.6.bb | 36 -- poky/meta/recipes-extended/ethtool/ethtool_5.7.bb | 35 ++ ...olve-iptables-apply-not-getting-installed.patch | 45 +++ .../recipes-extended/iptables/iptables_1.8.5.bb | 6 +- ...py_file_range02-Expect-EFBIG-in-subcase-m.patch | 57 +++ poky/meta/recipes-extended/ltp/ltp_20200515.bb | 1 + poky/meta/recipes-extended/man-db/man-db_2.9.2.bb | 58 ---- poky/meta/recipes-extended/man-db/man-db_2.9.3.bb | 58 ++++ .../recipes-extended/man-pages/man-pages_5.06.bb | 37 -- .../recipes-extended/man-pages/man-pages_5.07.bb | 37 ++ ...refix-to-unsigned-long-long-constants-to-.patch | 381 +++++++++++++++++++++ .../net-tools/net-tools_1.60-26.bb | 1 + .../pam/libpam/pam.d/common-password | 5 +- .../recipes-extended/shadow/shadow-sysroot_4.6.bb | 3 - 17 files changed, 623 insertions(+), 173 deletions(-) delete mode 100644 poky/meta/recipes-extended/ethtool/ethtool/fix-printf.patch delete mode 100644 poky/meta/recipes-extended/ethtool/ethtool_5.6.bb create mode 100644 poky/meta/recipes-extended/ethtool/ethtool_5.7.bb create mode 100644 poky/meta/recipes-extended/iptables/iptables/0001-build-resolve-iptables-apply-not-getting-installed.patch create mode 100644 poky/meta/recipes-extended/ltp/ltp/0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch delete mode 100644 poky/meta/recipes-extended/man-db/man-db_2.9.2.bb create mode 100644 poky/meta/recipes-extended/man-db/man-db_2.9.3.bb delete mode 100644 poky/meta/recipes-extended/man-pages/man-pages_5.06.bb create mode 100644 poky/meta/recipes-extended/man-pages/man-pages_5.07.bb create mode 100644 poky/meta/recipes-extended/net-tools/net-tools/0001-added-ull-prefix-to-unsigned-long-long-constants-to-.patch (limited to 'poky/meta/recipes-extended') diff --git a/poky/meta/recipes-extended/cpio/cpio-2.13/0002-src-global.c-Remove-superfluous-declaration-of-progr.patch b/poky/meta/recipes-extended/cpio/cpio-2.13/0002-src-global.c-Remove-superfluous-declaration-of-progr.patch index d48a3b0d1..478324c1c 100644 --- a/poky/meta/recipes-extended/cpio/cpio-2.13/0002-src-global.c-Remove-superfluous-declaration-of-progr.patch +++ b/poky/meta/recipes-extended/cpio/cpio-2.13/0002-src-global.c-Remove-superfluous-declaration-of-progr.patch @@ -3,7 +3,7 @@ From: Sergey Poznyakoff Date: Mon, 20 Jan 2020 07:45:39 +0200 Subject: [PATCH] src/global.c: Remove superfluous declaration of program_name -Upstream-Status: Accepted (commit 641d3f4) +Upstream-Status: Backport (commit 641d3f4) Signed-off-by: Richard Leitner --- src/global.c | 3 --- diff --git a/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index 2f2d04ca0..8ecfde141 100644 --- a/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -19,7 +19,7 @@ index 1169b7f..ed82524 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(ethtool, 5.6, netdev@vger.kernel.org) + AC_INIT(ethtool, 5.7, netdev@vger.kernel.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu subdir-objects]) diff --git a/poky/meta/recipes-extended/ethtool/ethtool/fix-printf.patch b/poky/meta/recipes-extended/ethtool/ethtool/fix-printf.patch deleted file mode 100644 index 9effa4f3f..000000000 --- a/poky/meta/recipes-extended/ethtool/ethtool/fix-printf.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8dcdb3d22a66f18770e5566c0e72e86a0701aeac Mon Sep 17 00:00:00 2001 -From: Robert Scheck -Date: Tue, 12 May 2020 20:33:12 +0200 -Subject: Rewrite printf() due to -Werror=format-security - -Avoid -Werror=format-security leading to: netlink/settings.c:378:2: error: -format not a string literal and no format arguments [-Werror=format-security] - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin -Signed-off-by: Robert Scheck -Signed-off-by: John W. Linville ---- - netlink/settings.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/netlink/settings.c b/netlink/settings.c -index c8a911d..0212465 100644 ---- a/netlink/settings.c -+++ b/netlink/settings.c -@@ -375,7 +375,7 @@ static int dump_link_modes(struct nl_context *nlctx, - after: - if (first && if_none) - printf("%s", if_none); -- printf(after); -+ printf("%s", after); - - return 0; - err: --- -cgit 1.2.3-1.el7 - diff --git a/poky/meta/recipes-extended/ethtool/ethtool_5.6.bb b/poky/meta/recipes-extended/ethtool/ethtool_5.6.bb deleted file mode 100644 index eda32c877..000000000 --- a/poky/meta/recipes-extended/ethtool/ethtool_5.6.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Display or change ethernet card settings" -DESCRIPTION = "A small utility for examining and tuning the settings of your ethernet-based network interfaces." -HOMEPAGE = "http://www.kernel.org/pub/software/network/ethtool/" -SECTION = "console/network" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216" - -SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ - file://run-ptest \ - file://avoid_parallel_tests.patch \ - file://fix-printf.patch \ - " - -SRC_URI[sha256sum] = "e904e980294baf5878df410ebcf1d660497ba19bc3a77f798a04dba569f44a7e" - -UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" - -inherit autotools ptest bash-completion pkgconfig - -RDEPENDS_${PN}-ptest += "make" - -PACKAGECONFIG ?= "netlink" -PACKAGECONFIG[netlink] = "--enable-netlink,--disable-netlink,libmnl," - -do_compile_ptest() { - oe_runmake buildtest-TESTS -} - -do_install_ptest () { - cp ${B}/Makefile ${D}${PTEST_PATH} - install ${B}/test-cmdline ${D}${PTEST_PATH} - install ${B}/test-features ${D}${PTEST_PATH} - install ${B}/ethtool ${D}${PTEST_PATH}/ethtool - sed -i 's/^Makefile/_Makefile/' ${D}${PTEST_PATH}/Makefile -} diff --git a/poky/meta/recipes-extended/ethtool/ethtool_5.7.bb b/poky/meta/recipes-extended/ethtool/ethtool_5.7.bb new file mode 100644 index 000000000..d9fc30cb5 --- /dev/null +++ b/poky/meta/recipes-extended/ethtool/ethtool_5.7.bb @@ -0,0 +1,35 @@ +SUMMARY = "Display or change ethernet card settings" +DESCRIPTION = "A small utility for examining and tuning the settings of your ethernet-based network interfaces." +HOMEPAGE = "http://www.kernel.org/pub/software/network/ethtool/" +SECTION = "console/network" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216" + +SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ + file://run-ptest \ + file://avoid_parallel_tests.patch \ + " + +SRC_URI[sha256sum] = "c2e16f8bf510c5822f8e25061c2533972308a421767c54abcacb1038b08bb782" + +UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" + +inherit autotools ptest bash-completion pkgconfig + +RDEPENDS_${PN}-ptest += "make" + +PACKAGECONFIG ?= "netlink" +PACKAGECONFIG[netlink] = "--enable-netlink,--disable-netlink,libmnl," + +do_compile_ptest() { + oe_runmake buildtest-TESTS +} + +do_install_ptest () { + cp ${B}/Makefile ${D}${PTEST_PATH} + install ${B}/test-cmdline ${D}${PTEST_PATH} + install ${B}/test-features ${D}${PTEST_PATH} + install ${B}/ethtool ${D}${PTEST_PATH}/ethtool + sed -i 's/^Makefile/_Makefile/' ${D}${PTEST_PATH}/Makefile +} diff --git a/poky/meta/recipes-extended/iptables/iptables/0001-build-resolve-iptables-apply-not-getting-installed.patch b/poky/meta/recipes-extended/iptables/iptables/0001-build-resolve-iptables-apply-not-getting-installed.patch new file mode 100644 index 000000000..51ed66ed2 --- /dev/null +++ b/poky/meta/recipes-extended/iptables/iptables/0001-build-resolve-iptables-apply-not-getting-installed.patch @@ -0,0 +1,45 @@ +From d4ed0c741fc789bb09d977d74d30875fdd50d08b Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Wed, 3 Jun 2020 15:38:48 +0200 +Subject: [PATCH] build: resolve iptables-apply not getting installed +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +ip6tables-apply gets installed but iptables-apply does not. +That is wrong. + +» make install DESTDIR=$PWD/r +» find r -name "*app*" +r/usr/local/sbin/ip6tables-apply +r/usr/local/share/man/man8/iptables-apply.8 +r/usr/local/share/man/man8/ip6tables-apply.8 + +Fixes: v1.8.5~87 +Signed-off-by: Jan Engelhardt +Signed-off-by: Pablo Neira Ayuso + +Upstream-Status: Backport +[https://git.netfilter.org/iptables/commit/?id=d4ed0c741fc789bb09d977d74d30875fdd50d08b] + +Signed-off-by: Yi Zhao +--- + iptables/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/iptables/Makefile.am b/iptables/Makefile.am +index dc66b3cc..2024dbf5 100644 +--- a/iptables/Makefile.am ++++ b/iptables/Makefile.am +@@ -56,7 +56,7 @@ man_MANS = iptables.8 iptables-restore.8 iptables-save.8 \ + ip6tables-save.8 iptables-extensions.8 \ + iptables-apply.8 ip6tables-apply.8 + +-sbin_SCRIPT = iptables-apply ++sbin_SCRIPTS = iptables-apply + + if ENABLE_NFTABLES + man_MANS += xtables-nft.8 xtables-translate.8 xtables-legacy.8 \ +-- +2.17.1 + diff --git a/poky/meta/recipes-extended/iptables/iptables_1.8.5.bb b/poky/meta/recipes-extended/iptables/iptables_1.8.5.bb index fa1e5c229..597612880 100644 --- a/poky/meta/recipes-extended/iptables/iptables_1.8.5.bb +++ b/poky/meta/recipes-extended/iptables/iptables_1.8.5.bb @@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ file://0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch \ + file://0001-build-resolve-iptables-apply-not-getting-installed.patch \ file://iptables.service \ file://iptables.rules \ file://ip6tables.service \ @@ -67,7 +68,7 @@ do_install_append() { fi } -PACKAGES += "${PN}-modules" +PACKAGES =+ "${PN}-modules ${PN}-apply" PACKAGES_DYNAMIC += "^${PN}-module-.*" python populate_packages_prepend() { @@ -97,6 +98,9 @@ RRECOMMENDS_${PN} = " \ FILES_${PN} += "${datadir}/xtables" +FILES_${PN}-apply = "${sbindir}/ip*-apply" +RDEPENDS_${PN}-apply = "${PN} bash" + # Include the symlinks as well in respective packages FILES_${PN}-module-xt-conntrack += "${libdir}/xtables/libxt_state.so" FILES_${PN}-module-xt-ct += "${libdir}/xtables/libxt_NOTRACK.so" diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch b/poky/meta/recipes-extended/ltp/ltp/0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch new file mode 100644 index 000000000..09b6f5487 --- /dev/null +++ b/poky/meta/recipes-extended/ltp/ltp/0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch @@ -0,0 +1,57 @@ +From 99687ab002f9f750f6f18fa1d70a91f0aa4f8ba2 Mon Sep 17 00:00:00 2001 +From: He Zhe +Date: Thu, 18 Jun 2020 17:18:27 +0800 +Subject: [PATCH] syscalls/copy_file_range02: Expect EFBIG in subcase max + length on 32-bit architectures + +For syscall +ssize_t copy_file_range(int fd_in, loff_t *off_in, + int fd_out, loff_t *off_out, + size_t len, unsigned int flags); +off_out is loff_t* that is long long, 64 bits on 32-bit architectures, +while len is size_t that unsigned int, 32 bits on 32-bit architectures. + +In subcase "max length", simplified as below, + +dst = tst_max_lfs_filesize(); +TEST(sys_copy_file_range(fd_src, 0, *tc->copy_to_fd, &dst, tc->len, tc->flags)); + +where dst is 4K*4G and len is 4G, so (4K+1)*4G is always smaller than 4G*4G, +it can never match the following kernel condition on 32-bit architectures. + +if (pos_in + count < pos_in || pos_out + count < pos_out) + return -EOVERFLOW; + +And thus we would get error like +copy_file_range02.c:139: FAIL: copy_file_range failed unexpectedly; expected EOVERFLOW, but got: EFBIG (27) + +Also correct a typo. + +Upstream-Status: Backport [http://lists.linux.it/pipermail/ltp/2020-June/017716.html] + +Signed-off-by: He Zhe +Acked-by: Li Wang +--- + .../kernel/syscalls/copy_file_range/copy_file_range02.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c b/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c +index fa679c4d3..bc27fbe57 100644 +--- a/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c ++++ b/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c +@@ -78,7 +78,11 @@ static struct tcase { + {&fd_chrdev, 0, EINVAL, CONTSIZE, "char device", 0}, + {&fd_fifo, 0, EINVAL, CONTSIZE, "fifo", 0}, + {&fd_pipe[0], 0, EINVAL, CONTSIZE, "pipe", 0}, +- {&fd_copy, 0, EOVERFLOW, ULLONG_MAX, "max length lenght", 1}, ++#ifdef TST_ABI64 ++ {&fd_copy, 0, EOVERFLOW, ULLONG_MAX, "max length", 1}, ++#else ++ {&fd_copy, 0, EFBIG, ULLONG_MAX, "max length", 1}, ++#endif + {&fd_copy, 0, EFBIG, MIN_OFF, "max file size", 1}, + }; + +-- +2.17.1 + diff --git a/poky/meta/recipes-extended/ltp/ltp_20200515.bb b/poky/meta/recipes-extended/ltp/ltp_20200515.bb index f2510baa6..b283add12 100644 --- a/poky/meta/recipes-extended/ltp/ltp_20200515.bb +++ b/poky/meta/recipes-extended/ltp/ltp_20200515.bb @@ -36,6 +36,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-Add-more-musl-exclusions.patch \ file://0001-ptrace01-Fix-missing-format-string.patch \ file://0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch \ + file://0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch \ " S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-extended/man-db/man-db_2.9.2.bb b/poky/meta/recipes-extended/man-db/man-db_2.9.2.bb deleted file mode 100644 index 53ebc8592..000000000 --- a/poky/meta/recipes-extended/man-db/man-db_2.9.2.bb +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY = "An implementation of the standard Unix documentation system accessed using the man command" -HOMEPAGE = "http://man-db.nongnu.org/" -LICENSE = "LGPLv2.1 & GPLv2" -LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ - file://docs/COPYING;md5=eb723b61539feef013de476e68b5c50a" - -SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \ - file://99_mandb \ - file://man_db.conf-avoid-multilib-install-file-conflict.patch" -SRC_URI[sha256sum] = "7b383f26c67525205f96a4a3bfb27993396992794adda6fe05ad565f369f047c" - -DEPENDS = "libpipeline gdbm groff-native base-passwd" -RDEPENDS_${PN} += "base-passwd" - -# | /usr/src/debug/man-db/2.8.0-r0/man-db-2.8.0/src/whatis.c:939: undefined reference to `_nl_msg_cat_cntr' -USE_NLS_libc-musl = "no" - -inherit gettext pkgconfig autotools systemd - -EXTRA_OECONF = "--with-pager=less --with-systemdsystemunitdir=${systemd_unitdir}/system" -EXTRA_AUTORECONF += "-I ${S}/gl/m4" - -do_install() { - autotools_do_install - - if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}/etc/default/volatiles - install -m 0644 ${WORKDIR}/99_mandb ${D}/etc/default/volatiles - fi -} - -do_install_append_libc-musl() { - rm -f ${D}${libdir}/charset.alias -} - -FILES_${PN} += "${prefix}/lib/tmpfiles.d" - -FILES_${PN}-dev += "${libdir}/man-db/libman.so ${libdir}/${BPN}/libmandb.so" - -RDEPENDS_${PN} += "groff" -RRECOMMENDS_${PN} += "less" -RPROVIDES_${PN} += " man" - -def compress_pkg(d): - if bb.utils.contains("INHERIT", "compress_doc", True, False, d): - compress = d.getVar("DOC_COMPRESS") - if compress == "gz": - return "gzip" - elif compress == "bz2": - return "bzip2" - elif compress == "xz": - return "xz" - return "" - -RDEPENDS_${PN} += "${@compress_pkg(d)}" - -SYSTEMD_SERVICE_${PN} = "man-db.timer man-db.service" -SYSTEMD_AUTO_ENABLE ?= "disable" diff --git a/poky/meta/recipes-extended/man-db/man-db_2.9.3.bb b/poky/meta/recipes-extended/man-db/man-db_2.9.3.bb new file mode 100644 index 000000000..0e6016a73 --- /dev/null +++ b/poky/meta/recipes-extended/man-db/man-db_2.9.3.bb @@ -0,0 +1,58 @@ +SUMMARY = "An implementation of the standard Unix documentation system accessed using the man command" +HOMEPAGE = "http://man-db.nongnu.org/" +LICENSE = "LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ + file://docs/COPYING;md5=eb723b61539feef013de476e68b5c50a" + +SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \ + file://99_mandb \ + file://man_db.conf-avoid-multilib-install-file-conflict.patch" +SRC_URI[sha256sum] = "fa5aa11ab0692daf737e76947f45669225db310b2801a5911bceb7551c5597b8" + +DEPENDS = "libpipeline gdbm groff-native base-passwd" +RDEPENDS_${PN} += "base-passwd" + +# | /usr/src/debug/man-db/2.8.0-r0/man-db-2.8.0/src/whatis.c:939: undefined reference to `_nl_msg_cat_cntr' +USE_NLS_libc-musl = "no" + +inherit gettext pkgconfig autotools systemd + +EXTRA_OECONF = "--with-pager=less --with-systemdsystemunitdir=${systemd_unitdir}/system" +EXTRA_AUTORECONF += "-I ${S}/gl/m4" + +do_install() { + autotools_do_install + + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}/etc/default/volatiles + install -m 0644 ${WORKDIR}/99_mandb ${D}/etc/default/volatiles + fi +} + +do_install_append_libc-musl() { + rm -f ${D}${libdir}/charset.alias +} + +FILES_${PN} += "${prefix}/lib/tmpfiles.d" + +FILES_${PN}-dev += "${libdir}/man-db/libman.so ${libdir}/${BPN}/libmandb.so" + +RDEPENDS_${PN} += "groff" +RRECOMMENDS_${PN} += "less" +RPROVIDES_${PN} += " man" + +def compress_pkg(d): + if bb.utils.contains("INHERIT", "compress_doc", True, False, d): + compress = d.getVar("DOC_COMPRESS") + if compress == "gz": + return "gzip" + elif compress == "bz2": + return "bzip2" + elif compress == "xz": + return "xz" + return "" + +RDEPENDS_${PN} += "${@compress_pkg(d)}" + +SYSTEMD_SERVICE_${PN} = "man-db.timer man-db.service" +SYSTEMD_AUTO_ENABLE ?= "disable" diff --git a/poky/meta/recipes-extended/man-pages/man-pages_5.06.bb b/poky/meta/recipes-extended/man-pages/man-pages_5.06.bb deleted file mode 100644 index 0d632e617..000000000 --- a/poky/meta/recipes-extended/man-pages/man-pages_5.06.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Linux man-pages" -DESCRIPTION = "The Linux man-pages project documents the Linux kernel and C library interfaces that are employed by user programs" -SECTION = "console/utils" -HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" -LICENSE = "GPLv2+" - -LIC_FILES_CHKSUM = "file://README;md5=794f701617cc03fe50c53257660d8ec4" -SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz" - -SRC_URI[md5sum] = "ebddb52ea013c160f07fd0a4a7e9266d" -SRC_URI[sha256sum] = "da4e939c624bec4bab8ca1702e5f54bbc70505090d90967fd5e12bc1453f19b0" - -inherit manpages - -MAN_PKG = "${PN}" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[manpages] = "" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install() { - oe_runmake install DESTDIR=${D} -} - -# Only deliveres man-pages so FILES_${PN} gets everything -FILES_${PN}-doc = "" -FILES_${PN} = "${mandir}/*" - -inherit update-alternatives - -ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "passwd.5 getspnam.3 crypt.3" -ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" -ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" -ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3" diff --git a/poky/meta/recipes-extended/man-pages/man-pages_5.07.bb b/poky/meta/recipes-extended/man-pages/man-pages_5.07.bb new file mode 100644 index 000000000..04d0597b3 --- /dev/null +++ b/poky/meta/recipes-extended/man-pages/man-pages_5.07.bb @@ -0,0 +1,37 @@ +SUMMARY = "Linux man-pages" +DESCRIPTION = "The Linux man-pages project documents the Linux kernel and C library interfaces that are employed by user programs" +SECTION = "console/utils" +HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" +LICENSE = "GPLv2+" + +LIC_FILES_CHKSUM = "file://README;md5=207f70f56526417514ac46b6680e314f" +SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz" + +SRC_URI[md5sum] = "193d9223e9c6dbe1d928eaaecc1f68db" +SRC_URI[sha256sum] = "5ba58d7b2b9a8929903b1cf791ed4edf72ab225678d5ea0a6b80dc090080ac33" + +inherit manpages + +MAN_PKG = "${PN}" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[manpages] = "" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install() { + oe_runmake install DESTDIR=${D} +} + +# Only deliveres man-pages so FILES_${PN} gets everything +FILES_${PN}-doc = "" +FILES_${PN} = "${mandir}/*" + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN} = "passwd.5 getspnam.3 crypt.3" +ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" +ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" +ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3" diff --git a/poky/meta/recipes-extended/net-tools/net-tools/0001-added-ull-prefix-to-unsigned-long-long-constants-to-.patch b/poky/meta/recipes-extended/net-tools/net-tools/0001-added-ull-prefix-to-unsigned-long-long-constants-to-.patch new file mode 100644 index 000000000..523d434b7 --- /dev/null +++ b/poky/meta/recipes-extended/net-tools/net-tools/0001-added-ull-prefix-to-unsigned-long-long-constants-to-.patch @@ -0,0 +1,381 @@ +From eb04ef31571f6c707eacaba6846feeebfab518e6 Mon Sep 17 00:00:00 2001 +From: Bernd Eckenfels +Date: Thu, 29 May 2003 02:09:14 +0000 +Subject: [PATCH] added 'ull' prefix to unsigned long long constants to make + gcc 3.3 happy + +Signed-off-by: Martin Jansa +Upstream-Status: Backport [https://sourceforge.net/p/net-tools/code/ci/eb04ef31571f6c707eacaba6846feeebfab518e6] +--- + lib/interface.c | 299 ++++++++++++++++++++++++++---------------------- + 1 file changed, 161 insertions(+), 138 deletions(-) + +diff -uNr net-tools-1.60.orig/lib/interface.c net-tools-1.60/lib/interface.c +--- net-tools-1.60.orig/lib/interface.c 2020-06-16 10:04:16.308411879 +0000 ++++ net-tools-1.60/lib/interface.c 2020-06-16 10:05:15.697264291 +0000 +@@ -23,7 +23,6 @@ + #include + #include + #include +-#include + + #if HAVE_AFIPX + #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) +@@ -654,6 +653,8 @@ + const char *Rext = "B"; + const char *Text = "B"; + ++ static char flags[200]; ++ + #if HAVE_AFIPX + static struct aftype *ipxtype = NULL; + #endif +@@ -685,32 +686,68 @@ + if (hw == NULL) + hw = get_hwntype(-1); + +- printf(_("%-9s Link encap:%s "), ptr->name, hw->title); +- /* For some hardware types (eg Ash, ATM) we don't print the +- hardware address if it's null. */ +- if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) && +- hw->suppress_null_addr))) +- printf(_("HWaddr %s "), hw->print(ptr->hwaddr)); +-#ifdef IFF_PORTSEL +- if (ptr->flags & IFF_PORTSEL) { +- printf(_("Media:%s"), if_port_text[ptr->map.port][0]); +- if (ptr->flags & IFF_AUTOMEDIA) +- printf(_("(auto)")); +- } ++ sprintf(flags, "flags=%d<", ptr->flags); ++ /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */ ++ if (ptr->flags == 0) ++ strcat(flags,">"); ++ if (ptr->flags & IFF_UP) ++ strcat(flags,_("UP,")); ++ if (ptr->flags & IFF_BROADCAST) ++ strcat(flags,_("BROADCAST,")); ++ if (ptr->flags & IFF_DEBUG) ++ strcat(flags,_("DEBUG,")); ++ if (ptr->flags & IFF_LOOPBACK) ++ strcat(flags,_("LOOPBACK,")); ++ if (ptr->flags & IFF_POINTOPOINT) ++ strcat(flags,_("POINTOPOINT,")); ++ if (ptr->flags & IFF_NOTRAILERS) ++ strcat(flags,_("NOTRAILERS,")); ++ if (ptr->flags & IFF_RUNNING) ++ strcat(flags,_("RUNNING,")); ++ if (ptr->flags & IFF_NOARP) ++ strcat(flags,_("NOARP,")); ++ if (ptr->flags & IFF_PROMISC) ++ strcat(flags,_("PROMISC,")); ++ if (ptr->flags & IFF_ALLMULTI) ++ strcat(flags,_("ALLMULTI,")); ++ if (ptr->flags & IFF_SLAVE) ++ strcat(flags,_("SLAVE,")); ++ if (ptr->flags & IFF_MASTER) ++ strcat(flags,_("MASTER,")); ++ if (ptr->flags & IFF_MULTICAST) ++ strcat(flags,_("MULTICAST,")); ++#ifdef HAVE_DYNAMIC ++ if (ptr->flags & IFF_DYNAMIC) ++ strcat(flags,_("DYNAMIC,")); ++#endif ++ /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */ ++ if (flags[strlen(flags)-1] == ',') ++ flags[strlen(flags)-1] = '>'; ++ else ++ flags[strlen(flags)-1] = 0; ++ ++ ++ printf(_("%s: %s mtu %d metric %d"), ++ ptr->name, flags, ptr->mtu, ptr->metric ? ptr->metric : 1); ++#ifdef SIOCSKEEPALIVE ++ if (ptr->outfill || ptr->keepalive) ++ printf(_(" outfill %d keepalive %d"), ++ ptr->outfill, ptr->keepalive); + #endif + printf("\n"); + + #if HAVE_AFINET + if (ptr->has_ip) { +- printf(_(" %s addr:%s "), ap->name, ++ printf(_(" %s %s"), ap->name, + ap->sprint(&ptr->addr, 1)); +- if (ptr->flags & IFF_POINTOPOINT) { +- printf(_(" P-t-P:%s "), ap->sprint(&ptr->dstaddr, 1)); +- } ++ printf(_(" netmask %s"), ap->sprint(&ptr->netmask, 1)); + if (ptr->flags & IFF_BROADCAST) { +- printf(_(" Bcast:%s "), ap->sprint(&ptr->broadaddr, 1)); ++ printf(_(" broadcast %s"), ap->sprint(&ptr->broadaddr, 1)); + } +- printf(_(" Mask:%s\n"), ap->sprint(&ptr->netmask, 1)); ++ if (ptr->flags & IFF_POINTOPOINT) { ++ printf(_(" destination %s"), ap->sprint(&ptr->dstaddr, 1)); ++ } ++ printf("\n"); + } + #endif + +@@ -727,29 +764,30 @@ + addr6p[0], addr6p[1], addr6p[2], addr6p[3], + addr6p[4], addr6p[5], addr6p[6], addr6p[7]); + inet6_aftype.input(1, addr6, (struct sockaddr *) &sap); +- printf(_(" inet6 addr: %s/%d"), +- inet6_aftype.sprint((struct sockaddr *) &sap, 1), plen); +- printf(_(" Scope:")); +- switch (scope) { +- case 0: +- printf(_("Global")); +- break; +- case IPV6_ADDR_LINKLOCAL: +- printf(_("Link")); +- break; +- case IPV6_ADDR_SITELOCAL: +- printf(_("Site")); +- break; +- case IPV6_ADDR_COMPATv4: +- printf(_("Compat")); +- break; +- case IPV6_ADDR_LOOPBACK: +- printf(_("Host")); +- break; +- default: +- printf(_("Unknown")); ++ printf(_(" %s %s prefixlen %d"), ++ inet6_aftype.name, ++ inet6_aftype.sprint((struct sockaddr *) &sap, 1), ++ plen); ++ printf(_(" scopeid 0x%x"), scope); ++ ++ flags[0] = '<'; flags[1] = 0; ++ if (scope & IPV6_ADDR_COMPATv4) { ++ strcat(flags, _("compat,")); ++ scope -= IPV6_ADDR_COMPATv4; + } +- printf("\n"); ++ if (scope == 0) ++ strcat(flags, _("global,")); ++ if (scope & IPV6_ADDR_LINKLOCAL) ++ strcat(flags, _("link,")); ++ if (scope & IPV6_ADDR_SITELOCAL) ++ strcat(flags, _("site,")); ++ if (scope & IPV6_ADDR_LOOPBACK) ++ strcat(flags, _("host,")); ++ if (flags[strlen(flags)-1] == ',') ++ flags[strlen(flags)-1] = '>'; ++ else ++ flags[strlen(flags)-1] = 0; ++ printf("%s\n", flags); + } + } + fclose(f); +@@ -762,17 +800,17 @@ + + if (ipxtype != NULL) { + if (ptr->has_ipx_bb) +- printf(_(" IPX/Ethernet II addr:%s\n"), +- ipxtype->sprint(&ptr->ipxaddr_bb, 1)); ++ printf(_(" %s Ethernet-II %s\n"), ++ ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_bb, 1)); + if (ptr->has_ipx_sn) +- printf(_(" IPX/Ethernet SNAP addr:%s\n"), +- ipxtype->sprint(&ptr->ipxaddr_sn, 1)); ++ printf(_(" %s Ethernet-SNAP %s\n"), ++ ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_sn, 1)); + if (ptr->has_ipx_e2) +- printf(_(" IPX/Ethernet 802.2 addr:%s\n"), +- ipxtype->sprint(&ptr->ipxaddr_e2, 1)); ++ printf(_(" %s Ethernet802.2 %s\n"), ++ ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e2, 1)); + if (ptr->has_ipx_e3) +- printf(_(" IPX/Ethernet 802.3 addr:%s\n"), +- ipxtype->sprint(&ptr->ipxaddr_e3, 1)); ++ printf(_(" %s Ethernet802.3 %s\n"), ++ ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e3, 1)); + } + #endif + +@@ -781,7 +819,7 @@ + ddptype = get_afntype(AF_APPLETALK); + if (ddptype != NULL) { + if (ptr->has_ddp) +- printf(_(" EtherTalk Phase 2 addr:%s\n"), ddptype->sprint(&ptr->ddpaddr, 1)); ++ printf(_(" %s %s\n"), ddptype->name, ddptype->sprint(&ptr->ddpaddr, 1)); + } + #endif + +@@ -790,53 +828,30 @@ + ectype = get_afntype(AF_ECONET); + if (ectype != NULL) { + if (ptr->has_econet) +- printf(_(" econet addr:%s\n"), ectype->sprint(&ptr->ecaddr, 1)); ++ printf(_(" %s %s\n"), ectype->name, ectype->sprint(&ptr->ecaddr, 1)); + } + #endif + +- printf(" "); +- /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */ +- if (ptr->flags == 0) +- printf(_("[NO FLAGS] ")); +- if (ptr->flags & IFF_UP) +- printf(_("UP ")); +- if (ptr->flags & IFF_BROADCAST) +- printf(_("BROADCAST ")); +- if (ptr->flags & IFF_DEBUG) +- printf(_("DEBUG ")); +- if (ptr->flags & IFF_LOOPBACK) +- printf(_("LOOPBACK ")); +- if (ptr->flags & IFF_POINTOPOINT) +- printf(_("POINTOPOINT ")); +- if (ptr->flags & IFF_NOTRAILERS) +- printf(_("NOTRAILERS ")); +- if (ptr->flags & IFF_RUNNING) +- printf(_("RUNNING ")); +- if (ptr->flags & IFF_NOARP) +- printf(_("NOARP ")); +- if (ptr->flags & IFF_PROMISC) +- printf(_("PROMISC ")); +- if (ptr->flags & IFF_ALLMULTI) +- printf(_("ALLMULTI ")); +- if (ptr->flags & IFF_SLAVE) +- printf(_("SLAVE ")); +- if (ptr->flags & IFF_MASTER) +- printf(_("MASTER ")); +- if (ptr->flags & IFF_MULTICAST) +- printf(_("MULTICAST ")); +-#ifdef HAVE_DYNAMIC +- if (ptr->flags & IFF_DYNAMIC) +- printf(_("DYNAMIC ")); +-#endif +- /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */ +- printf(_(" MTU:%d Metric:%d"), +- ptr->mtu, ptr->metric ? ptr->metric : 1); +-#ifdef SIOCSKEEPALIVE +- if (ptr->outfill || ptr->keepalive) +- printf(_(" Outfill:%d Keepalive:%d"), +- ptr->outfill, ptr->keepalive); ++ /* For some hardware types (eg Ash, ATM) we don't print the ++ hardware address if it's null. */ ++ if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) && ++ hw->suppress_null_addr))) ++ printf(_(" %s %s"), hw->name, hw->print(ptr->hwaddr)); ++ else ++ printf(_(" %s"), hw->name); ++ if (ptr->tx_queue_len != -1) ++ printf(_(" txqueuelen %d"), ptr->tx_queue_len); ++ printf(" (%s)\n", hw->title); ++ ++#ifdef IFF_PORTSEL ++ if (ptr->flags & IFF_PORTSEL) { ++ printf(_(" media %s"), if_port_text[ptr->map.port][0]); ++ if (ptr->flags & IFF_AUTOMEDIA) ++ printf(_("autoselect")); ++ printf("\n"); ++ } + #endif +- printf("\n"); ++ + + /* If needed, display the interface statistics. */ + +@@ -845,19 +860,9 @@ + * not for the aliases, although strictly speaking they're shared + * by all addresses. + */ +- printf(" "); +- +- printf(_("RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"), +- ptr->stats.rx_packets, ptr->stats.rx_errors, +- ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors, +- ptr->stats.rx_frame_errors); +- if (can_compress) +- printf(_(" compressed:%lu\n"), ptr->stats.rx_compressed); + + rx = ptr->stats.rx_bytes; +- tx = ptr->stats.tx_bytes; + short_rx = rx * 10; +- short_tx = tx * 10; + if (rx > 1125899906842624ull) { + short_rx /= 1125899906842624ull; + Rext = "PiB"; +@@ -874,6 +879,8 @@ + short_rx /= 1024; + Rext = "KiB"; + } ++ tx = ptr->stats.tx_bytes; ++ short_tx = tx * 10; + if (tx > 1125899906842624ull) { + short_tx /= 1125899906842624ull; + Text = "PiB"; +@@ -891,37 +898,50 @@ + Text = "KiB"; + } + +- printf(" "); +- printf(_("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"), +- ptr->stats.tx_packets, ptr->stats.tx_errors, +- ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors, +- ptr->stats.tx_carrier_errors); +- printf(_(" collisions:%lu "), ptr->stats.collisions); +- if (can_compress) +- printf(_("compressed:%lu "), ptr->stats.tx_compressed); +- if (ptr->tx_queue_len != -1) +- printf(_("txqueuelen:%d "), ptr->tx_queue_len); +- printf("\n "); +- printf(_("RX bytes:%llu (%lu.%lu %s) TX bytes:%llu (%lu.%lu %s)\n"), ++ printf(" "); ++ printf(_("RX packets %llu bytes %llu (%lu.%lu %s)\n"), ++ ptr->stats.rx_packets, + rx, (unsigned long)(short_rx / 10), +- (unsigned long)(short_rx % 10), Rext, +- tx, (unsigned long)(short_tx / 10), +- (unsigned long)(short_tx % 10), Text); ++ (unsigned long)(short_rx % 10), Rext); ++ if (can_compress) { ++ printf(" "); ++ printf(_("RX compressed:%lu\n"), ptr->stats.rx_compressed); ++ } ++ printf(" "); ++ printf(_("RX errors %lu dropped %lu overruns %lu frame %lu\n"), ++ ptr->stats.rx_errors, ptr->stats.rx_dropped, ++ ptr->stats.rx_fifo_errors, ptr->stats.rx_frame_errors); ++ ++ ++ printf(" "); ++ printf(_("TX packets %llu bytes %llu (%lu.%lu %s)\n"), ++ ptr->stats.tx_packets, ++ tx, (unsigned long)(short_tx / 10), ++ (unsigned long)(short_tx % 10), Text); ++ if (can_compress) { ++ printf(" "); ++ printf(_("TX compressed %lu\n"), ptr->stats.tx_compressed); ++ } ++ printf(" "); ++ printf(_("TX errors %lu dropped %lu overruns %lu carrier %lu collisions %lu\n"), ++ ptr->stats.tx_errors, ++ ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors, ++ ptr->stats.tx_carrier_errors, ptr->stats.collisions); + } + + if ((ptr->map.irq || ptr->map.mem_start || ptr->map.dma || + ptr->map.base_addr >= 0x100)) { +- printf(" "); ++ printf(" device "); + if (ptr->map.irq) +- printf(_("Interrupt:%d "), ptr->map.irq); ++ printf(_("interrupt %d "), ptr->map.irq); + if (ptr->map.base_addr >= 0x100) /* Only print devices using it for + I/O maps */ +- printf(_("Base address:0x%x "), ptr->map.base_addr); ++ printf(_("base 0x%x "), ptr->map.base_addr); + if (ptr->map.mem_start) { +- printf(_("Memory:%lx-%lx "), ptr->map.mem_start, ptr->map.mem_end); ++ printf(_("memory 0x%lx-%lx "), ptr->map.mem_start, ptr->map.mem_end); + } + if (ptr->map.dma) +- printf(_("DMA chan:%x "), ptr->map.dma); ++ printf(_(" dma 0x%x"), ptr->map.dma); + printf("\n"); + } + printf("\n"); diff --git a/poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb index 5a376e72f..8bd30fc6d 100644 --- a/poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb +++ b/poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb @@ -17,6 +17,7 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20050312T000000Z/pool/main/ file://net-tools-1.60-sctp3-addrs.patch \ file://0001-lib-inet6.c-INET6_rresolve-various-fixes.patch \ file://net-tools-fix-building-with-linux-4.8.patch \ + file://0001-added-ull-prefix-to-unsigned-long-long-constants-to-.patch \ " # for this package we're mostly interested in tracking debian patches, diff --git a/poky/meta/recipes-extended/pam/libpam/pam.d/common-password b/poky/meta/recipes-extended/pam/libpam/pam.d/common-password index 389605732..52478dae7 100644 --- a/poky/meta/recipes-extended/pam/libpam/pam.d/common-password +++ b/poky/meta/recipes-extended/pam/libpam/pam.d/common-password @@ -10,13 +10,10 @@ # The "sha512" option enables salted SHA512 passwords. Without this option, # the default is Unix crypt. Prior releases used the option "md5". # -# The "obscure" option replaces the old `OBSCURE_CHECKS_ENAB' option in -# login.defs. -# # See the pam_unix manpage for other options. # here are the per-package modules (the "Primary" block) -password [success=1 default=ignore] pam_unix.so obscure sha512 +password [success=1 default=ignore] pam_unix.so sha512 # here's the fallback if no module succeeds password requisite pam_deny.so # prime the stack with a positive return value if there isn't one already; diff --git a/poky/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb b/poky/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb index 79fc8b80b..a8c1539c9 100644 --- a/poky/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb +++ b/poky/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb @@ -14,9 +14,6 @@ PR = "r3" # can add custom users/groups for recipes that use inherit useradd. SRC_URI = "file://login.defs_shadow-sysroot" -SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79" -SRC_URI[sha256sum] = "633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778" - S = "${WORKDIR}" do_install() { -- cgit v1.2.3