From 26bdd44576f25d63bf32632369b0cbdd94c93d7a Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 16 Aug 2019 17:08:17 -0400 Subject: subtree updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit meta-openembedded: 64974b8779..c95842cdca: Adrian Bunk (46): modemmanager: Remove the obsolete dependency on dbus-glib gpsd: Remove the obsolete dependency on dbus-glib eggdbus: Remove this obsolete package sanity-meta-gnome: Remove obsolete class gssdp: Merge inc vlc: notify switched to GTK+3 some time ago tremor: Upgrade 20150107 -> 20180319 vlc: Remove the obsolete dependency on dbus-glib blueman: Enable thunar support by default but don't rdepend on it gnome-bluetooth: Drop bluez4 support networkmanager: Drop bluez4 support packagegroup-meta-networking-connectivity: Correct a DISTRO_FEATURES check packagegroup-tools-bluetooth: Remove bluez4 support cpprest: Fix build failure with gcc 8 packagegroup-basic: Remove bluez4 support packagegroup-meta-oe: Remove bogus bluez4 DISTRO_FEATURES checks esound: Remove this obsolete package gpsd: Remove obsolete musl patch gpsd: Don't build without optimization zeromq: Upgrade 4.3.1 -> 4.3.2 obex-data-server: Drop bluez4 support openobex: Drop bluez4 support gpsd: Drop bluez4 support libao: Remove the non-default esound PACKAGECONFIG gpsd: Disable manpage building by config option instead of patching gpsd: Upgrade 3.18.1 -> 3.19 gnome-desktop3: Fix REQUIRED_DISTRO_FEATURES meta-gnome: Remove GNOME_COMPRESS_TYPE = "xz" in recipes jasper: Use the new upstream GitHub location instead of the defunct tarball URL fluidsynth: Add PACKAGECONFIG for readline meta-multimedia: Remove GNOME_COMPRESS_TYPE = "xz" in recipes udisks: Remove this obsolete version gpsd: Switch from python-scons-native to python3-scons-native meta-gnome: Inherit gnomebase instead of gnome meta-oe: Inherit gnomebase instead of gnome libgsf: Drop the obsolete inherit gconf gnome-system-monitor: Add DEPENDS on polkit meta-oe: Change some ftp:// URIs to http(s):// meta-oe: Use GNU_MIRROR in more recipes wireshark: Use an upstream URL that stays valid longer modemmanager: Use a simpler workaround for the clang build network-manager-applet: Remove obsolete do_configure_append network-manager-applet: Remove the obsolete DEPENDS on gconf wv: Remove, abiword was the only user gtkmathview: Remove, abiword was the last user t1lib: Remove, gtkmathview was the last user Alex Kiernan (6): keyutils: Fix build with usrmerge iwd: update to 0.18 libzip: Upgrade 1.5.1 -> 1.5.2 zstd: New recipe zstd: Update 1.4.0 -> 1.4.2 iwd: Upgrade 0.18 -> 0.19 Alexander Kanavin (3): python-matplotlib: remove the python 2.x version of the recipe python-oauthlib: remove the 2.x version of the recipe python-pandas: remove the python 2.x version of the recipe Alistair Francis (3): gpsd: Upgrade from 3.17 to 3.18.1 gpsd: Fix the systemd service run paths python: pypi: Add python3-term Anatol Belski (1): gperftools: separate off libtcmalloc-minimal Andreas Müller (2): meta-xfce: Make Kai Kang layer maintainer abiword: remove Andrej Valek (2): nodejs: 10.15.3 -> 10.16.0 nodejs: 10.16.0 -> 10.16.2 André Draszik (1): layer.conf: ignore wireless-regdb->crda dep for siggen purposes Ankit Navik (1): safec: Remove aarch64 from COMPATIBLE_HOST Anuj Mittal (2): xterm: upgrade 330 -> 347 libsdl: import from OE-Core Armin Kuster (5): keyutils: update to 1.6 keyutils: improve ptests keyutils: fix QA WARNING keyutils: fix pulling in glibc when musl enabled keyutils: fix library install path Arturo Buzarra (1): lvm2: Fix RDEPEND on lvm2 to lvm2-udevrules Ayoub Zaki (1): pegtl: Initial recipe Bartosz Golaszewski (2): bats: new package libgpiod: bump version to v1.4.1 Beniamin Sandu (1): unbound: create recipe for version 1.9.2 Callaghan, Dan (1): unixodbc: mysql5 is not required but readline is Changqing Li (15): python-pygobject: fix install dir for python2 dlm: upgrade 4.0.7 -> 4.0.9 uthash: remove uthash-ptest dependencies waf-samba: switch to python3 libtevent: upgrade 0.9.37 -> 0.10.0 libtdb: upgrade 1.3.17 -> 1.4.0 libtalloc: upgrade 2.1.14 -> 2.2.0 samba: upgrade 4.8.12 -> 4.10.5 libldb: upgrade 1.4.1 -> 1.5.4 volume-key: fix "Nothing RPROVIDES" when multilib enabled isomd5sum: fix "Nothing RPROVIDES" when multilib enabled satyr: fix "Nothing RPROVIDES" when multilib enabled libtevent: fix do_package_qa issue libtdb: fix do_package_qa issue fio: Delete redundant tag Chin Huat Ang (1): opencv: 3.4.5 -> 4.1.0 Denys Dmytriyenko (1): ufs-tool: add tool to access UFS (Universal Flash Storage) devices Douglas Royds (2): grpc: DEPENDS on googletest packagegroup-meta-oe: RDEPENDS on googletest Drew Moseley (1): networkmanager: Use ALTERNATIVES for resolv-conf handling. Erik Botö (1): paho-mqtt-c: enable SSL Fabian Klemp (1): openvpn: respect pid file in init.d service start Gianfranco Costamagna (3): iniparser: add initial recipe cpprest: update to 2.10.14 cpprest: Do not export Werror from build system instead of adding -Wno-error to the same build command He Zhe (1): drbd-utils: Fix netlink failure with nested attributes for kernel v5.2 Hongxu Jia (24): packagegroup-xfce-extended: conditional runtime recommends on xfce-polkit xfce-polkit: add required distro feature check to polkit xfce4-session: optional support polkit upower: remove polkit dependency gvfs: add meson option admin and udisks2 to PACKAGECONFIG mongodb: add to PNBLACKLIST itstool: use libxml2 to instead of python3-lxml meta-multimedia: add layer depends on meta-python itstool: use libxml2 to instead of python3-lxml python-six: remove duplicated recipe libauthen-radius-perl: ptest requires meta-networking to be present xfce4-panel: use lxdm to replace dm-tool drop lxdm_%.bbappend python3-pykickstart: 3.18 -> 3.20 python3-blivet: 3.1.2 -> 3.1.4 python-pyparted/python3-pyparted: 3.11.1 -> 3.11.2 libbytesize: 1.4 -> 2.0 libblockdev: 2.20 -> 2.22 network-manager-applet: 1.8.20 -> 1.8.22 thin-provisioning-tools: 0.7.6 -> 0.8.5 libreport: 2.9.7 -> 2.10.0 python3-blivetgui: fix blivet-gui broken php: remove 5.6.40 lmsensors: support package lmsensors Jackie Huang (1): keyutils: add new recipe Jason Wessel (1): libbytesize: Add depends for gettext-native Joshua Lock (3): python-cffi: add missing RDEPENDS on pycparser python-attrs: add native BBCLASSEXTEND python-dateutil: add native BBCLASSEXTEND Kai Kang (39): mozjs: fix configure failure on CentOS 7.6 libvncserver: update to latest commit 1354f7f libxfce4util: 4.13.3 -> 4.13.4 libxfce4ui: 4.13.5 -> 4.13.6 exo: 0.12.5 -> 0.12.6 xfconf: 4.13.7 -> 4.13.8 thunar: 1.8.6 -> 1.8.7 xfce4-session: 4.13.2 -> 4.13.3 xfwm4: 4.13.2 -> 4.13.3 xfdesktop: 4.13.4 -> 4.13.5 xfce4-power-manager: 1.6.2 -> 1.6.3 xfce4-panel: 4.13.5 -> 4.13.6 xfce4-dev-tools: 4.12.0 -> 4.13.0 thunar-volman: 0.9.2 -> 0.9.3 garcon: 0.6.2 -> 0.6.3 xfce4-settings: 4.12.4 -> 4.13.7 xfce4-pulseaudio-plugin: add dependency dbus-glib xfce4-verve-plugin: 1.1.0 -> 2.0.0 net-snmp: update SRC_URI xfwm4: fix assertion error poppler: toggle gobject-introspection support xfce4-settings: rrecommends xfce4-datetime-setter xfce4-datetime-setter: add recipe libxfce4util: 4.13.4 -> 4.14.0 xfconf: 4.13.8 -> 4.14.1 libxfce4ui: 4.13.6 -> 4.14.1 exo: 0.12.6 -> 0.12.8 garcon: 0.6.3 -> 0.6.4 thunar: 1.8.7 -> 1.8.9 thunar-volman: 0.9.3 -> 0.9.5 tumbler: 0.2.0 -> 0.2.7 xfce4-appfinder: 4.13.3 -> 4.14.0 xfce4-dev-tools: 4.13.0 -> 4.14.0 xfce4-panel: 4.13.6 -> 4.14.0 xfce4-power-manager: 1.6.3 -> 1.6.5 xfce4-session: 4.13.3 -> 4.14.0 xfce4-settings: 4.13.7 -> 4.14.0 xfdesktop: 4.13.5 -> 4.14.1 xfwm4: 4.13.3 -> 4.14.0 Khem Raj (44): wvdial: Fix build with musl librelp: Pass Wno-error to compiler recipes: Use BPN instead of PN in SRC_URIs cli11: Refresh patch to fix fuzz sthttpd: Use git SRC_URI instead of github archive arno-iptables-firewall: Switch to git fetcher firewalld: Update to 0.6.3->0.6.4 python-matplotlib: Use git src_uri mpv: Switch to using git fetcher x11vnc: Switch to git fetcher dumb-init: Switch to git fetcher pam-plugin-ldapdb: Use git fetcher libuv: Switch to using git fetcher usbctl: Switch to git fetcher pmdk: Fix libdir which is multi-lib aware kexec-tools-klibc: Refresh patch with no code change log4cplus: Fix build with gold linker orage: Fix build with libical3 pegtl: Fix build with clang/libc++ postfix: Fix build failures with glibc 2.30 snort: Fix build with glibc 2.30 opensaf: Add configure time check to detect gettid API in libc ypbind-mt: Fix build with glibc 2.30 openocd: Fix build with glibc 2.30 netkit-rusers: Add dep on rpcsvc-proto for rpc headers collectd: Fix build with glibc 2.30 alsa-oss: Drop now not needed patch klcc-cross: Recognise --unwindlib clang option libsub-exporter-progressive-perl: Remove unneeded DEPENDS_PN libedit: Delete sjf2410-linux-native: Do not include sys/io.h gradm: Upgrade to 3.1-201903191516 release pmdk: Fix packaging errors when building on non-x86 host klibc: Pass -fno-builtin-bcmp with musl/clang combo graphviz: Fix build error that surfaced with latest pango graphviz: Do not build tcl support for target python-grpcio: Use gettid API from glibc 2.30+ grpc: Update to 1.22.0 android-tools: Fix build with glibc 2.30 iperf2: Upgrade to 2.0.13 netkit-rusers: Depend on rpcsvc-proto-native for rpcgen tool kpatch: Pass ARCH from environment python3-pillow: Provide python3-imaging netkit-rusers: Fix cross-build after glibc dropped rpc Laszlo Toth (1): networkmanager: fix typo in nonarch_base_libdir Liwei Song (2): pm-graph: fix time format parse error fio: fix first direct IO errored when ioengine is splice Luca Boccassi (2): python-pygobject: move python-setuptools from RDEPENDS to DEPENDS python-pygobject: remove build-dependency on setuptools and add dependency on pkgutil Luca Ceresoli (4): fuse-exfat: moved to github exfat-utils: moved to github fuse-exfat: update 1.2.3 -> 1.3.0 exfat-utils: update 1.2.3 -> 1.3.0 Luca Palano (1): Netdata upgrade: 1.8.0 -> 1.16.0 Maciej Pijanowski (8): python3-websockets: upgrade to 8.0.2 python3-multidict: upgrade to 4.5.2 python-engineio: upgrade to 3.9.3 python-socketio: upgrade to 4.3.1 python-aiohttp.inc: add missing RDEPENDS python-async-timeout: add asyncio to RDEPENDS python-socketio.inc: add missing RDEPENDS python3-aiofiles: add recipe Mariano Lopez (1): nftables: 0.9.0 > 0.9.1 Martin Jansa (8): protobuf: fix build with gold SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS add lsb and util-linux for phoronix-test-suite oprofile: drop kernel-vmlinux from RRECOMMENDS libdbi-perl: prevent native libdbi-perl depending on target perl redis: backport a fix for stack trace generation on aarch64 ntop: fix missing return from non-void function python3-twofish: Fix missing return statements in module stubs kernel-selftest: skip -Werror=format-security and fortify Max Krummenacher (1): joe: update to 4.6 Mikko Rapeli (2): protobuf: fix ptest compilation with hardening flags stress-ng: delete recipe Mingli Yu (7): fio: Upgrade to 3.15 crash: Upgrade to 7.2.6 makedumpfile: Upgrade to 1.6.6 hwloc: Upgrade to 1.11.13 iperf3: Upgrade to 3.7 log4cplus: Upgrade to 2.0.4 log4cplus: remove gold linker setting Oleksandr Kravchuk (22): nghttp2: update to 1.39.1 drbd-utils: update to 9.10.0 drbd: update to 9.0.18-1 keepalived: update to 2.0.16 nano: update to 4.3 nuttcp: add systemd unit file mbedtls: update to 2.16.2 dhcpcd: update to 7.2.2 freediameter: update to 1.2.1 sethdlc: set PV in filename miniupnpd: update to 2.1.20190210 ipvsadm: update to 1.30 uftp: update to 4.9.11 libnftnl: update to 1.1.3 dhcpcd: update to 7.2.3 blueman: update to 2.1.1 uftp: update to 4.10 htpdate: update to 1.2.1 dhcpcd: update to 8.0.1 chrony: update to 3.5 wolfssl: update to 4.1.0 dhcpcd: update to 8.0.2 Ovidiu Panait (2): python3-pillow: 5.4.1 -> 6.1 python3-pillow: Add python3-misc/logging/numbers to RDEPENDS Paolo Valente (1): s-suite: push SRCREV to version 3.5 Parthiban Nallathambi (1): python3-matplotlib: add version 3.1.1 Pascal Bach (1): protobuf: 1.3.1 -> 1.3.2 Paul Eggleton (3): mraa: update to 2.0.0 upm: update to 2.0.0 picocom: update to 3.1 Pierre-Jean Texier (2): stunnel: bump to version 5.55 cppzmq: bump to version 4.4.1 Piotr Tworek (1): itstool: Don't use hardcoded, absolute path to python3 binary. Qi.Chen@windriver.com (3): turbostat: set PACKAGE_ARCH as MACHINE_ARCH esmtp: use alternatives to manage /usr/lib/sendmail postfix: use alternatives to manage /usr/lib/sendmail Radovan Scasny (2): dhcpcd: enable udev by default dhcpcd: fix building with pkgconfig Randy MacLeod (2): poppler: update from 0.75.0 to 0.79.0 rsyslog: update from 8.1903.0 to 8.1907.0 Ricardo Ribalda Delgado (1): fwts: Update to 19.06.00 Robert Joslyn (1): cryptsetup: Don't enable udev for native build Roman Stratiienko (1): glmark2: Upgrade SRCREV to latest Ross Burton (2): gtk+: add (from oe-core) gnome-themes-standard: add recipe for GTK+ 2 Adwaita Ruslan Bilovol (2): libnss-nisplus: Add recipe kpatch: fix QA build errors for nativesdk Saravanan Sekar (1): liblightmodbus: Add version 2.0.2 Scott Ellis (1): wireguard: Upgrade 20190406 to 20190702 Slater, Joseph (3): drbd-utils: enable reproducible_build awareness php: remove host specific info from header file mozjs: do not expose intl api for mips64 Tim Orling (9): libencode-perl: upgrade 2.94 -> 3.01; enable ptest libdbi-perl: fix dependencies libtest-nowarnings-perl: add recipe for 1.04 libdbd-sqlite-perl: upgrade 1.54 -> 1.62; enable ptest libsub-uplevel-perl: add recipe for 0.36 libtest-warn-perl: add recipe for 0.36 libcgi-perl: upgrade 4.43 -> 4.44 libnet-ldap-perl: upgrade 0.65 -> 0.66; enable ptest libunicode-linebreak-perl: upgrade 2017.004 -> 2019.001; enable ptest Trevor Gamblin (2): metacity; upgrade from 3.30.1 to 3.32.0 gvfs: upgrade from 1.40.0 to 1.40.2 Vincent Prince (1): mongodb: add mongo shell as a PACKAGECONF option William A. Kennington III via Openembedded-devel (5): gtest: Googletest project is back under github.com/google/googletest googletest: The gtest and gmock projects were combined under googletest in 2015 libtar: Enable libtar-native build fmt: Init at 5.3.0 cli11: 1.7.1 -> 1.8.0 Windel Bouwman (3): python-humanfriendly: Add recipe for the humanfriendly package. Fix python-humanfriendly recipe for python2. Add recipe for the coloredlogs python package. Yi Zhao (7): strongswan: upgrade 5.7.1 -> 5.8.0 snort: fix compile-host-path QA issue cryptsetup: set the default luks format to LUKS1 libldb: upgrade 1.5.4 -> 1.5.5 samba: upgrade 4.10.5 -> 4.10.6 snort: upgrade 2.9.13 -> 2.9.14 snort: upgrade 2.9.14 -> 2.9.14.1 Yong, Jonathan (1): icewm: add recipe Yongxin Liu (3): keyutils: move recipe and patches from meta-security to meta-oe ndctl: v63 -> v65 pmdk: update from 1.4.2 to 1.6 Yuan Chao (9): python-pycodestyle: upgrade 2.4.0 -> 2.5.0 python-lxml: upgrade 4.3.4 -> 4.4.0 python-configparser: upgrade 3.5.0 -> 3.7.4 protobuf: upgrade 3.9.0 -> 3.9.1 python-markupsafe: upgrade 1.0 -> 1.1.1 hostapd: upgrade 2.8 -> 2.9 python-configparser: upgrade 3.7.4 -> 3.8.1 python-lxml: upgrade 4.4.0 -> 4.4.1 python-pip: upgrade 19.2.1 -> 19.2.2 Zang Ruochen (47): postgresql: upgrade 11.3 -> 11.4 wireshark: upgrade 3.0.1 -> 3.0.2 python-pygobject: upgrade 3.32.1 -> 3.32.2 python-alembic: upgrade 1.0.10 -> 1.0.11 logwatch: upgrade 7.4.3 -> 7.5.1 tcsh: upgrade 6.20.00 -> 6.21.00 python-cython: upgrade 0.29.10 -> 0.29.11 dialog: upgrade 1.3-20180621 -> 1.3-20190211 php: upgrade 7.3.6 -> 7.3.7 sessreg: upgrade 1.1.1 -> 1.1.2 python-typing: upgrade 3.6.6 -> 3.7.4 python-mako: upgrade 1.0.12 -> 1.0.13 python-pbr: upgrade 5.2.1 -> 5.4.0 python-cython: upgrade 0.29.11 -> 0.29.12 adcli: added new recipe. python-pyflakes: upgrade 1.6.0 -> 2.1.1 python-protobuf: upgrade 3.8.0 -> 3.9.0 protobuf: upgrade 3.8.0 -> 3.9.0 setxkbmap: upgrade 1.3.1 -> 1.3.2 uftrace: upgrade 0.9.2 -> 0.9.3 wireshark: upgrade 3.0.2 -> 3.0.3 python-pbr: upgrade 5.4.0 -> 5.4.1 dstat: upgrade 0.7.3 -> 0.7.4 python-mako: upgrade 1.0.13 -> 1.0.14 xfsprogs: upgrade 5.0.0 -> 5.1.0 python-beautifulsoup4: upgrade 4.7.1 -> 4.8.0 xterm: upgrade 347 -> 348 python-pip: upgrade 19.1.1 -> 19.2.1 python-paste: upgrade 3.0.8 -> 3.1.0 syslog-ng: append syslog-ng.service dialog: upgrade 1.3-20190211 -> 1.3-20190728 openldap: upgrade 2.4.47 -> 2.4.48 python-cython: upgrade 0.29.12 -> 0.29.13 libsodium: upgrade 1.0.17 -> 1.0.18 hwdata: upgrade 0.322 -> 0.326 python-jsonpatch: upgrade 1.23 -> 1.24 python-pyasn1: upgrade 0.4.5 -> 0.4.6 python-pyasn1-modules: upgrade 0.2.2 -> 0.2.6 python-pyparsing: upgrade 2.4.0 -> 2.4.2 python-pytest-runner: upgrade 4.2 -> 5.1 python-pytz: upgrade 2019.1 -> 2019.2 itstool: upgrade 2.0.5 -> 2.0.6 opensaf: upgrade 5.19.03 -> 5.19.07 libkcapi: upgrade 1.1.4 -> 1.1.5 mcelog: upgrade 162 -> 164 php: upgrade 7.3.7 -> 7.3.8 kpatch: upgrade 0.61 -> 0.71 Zheng Ruoqin (3): python-mako: upgrade 1.0.14 -> 1.1.0 python-pbr: upgrade 5.4.1 -> 5.4.2 dnf-plugin-tui: new recipe wouterlucas (1): python-jsonref: add recipe meta-phosphor: fbd01b6e08..fe8cee7488: Brad Bishop (1): meta-phosphor: sdk: react to upstream gtest rename meta-xilinx: 64aa3d35ae..f3c8b1c9a8: Alejandro Enedino Hernandez Samaniego (7): opencl-clhpp: Allow empty packages to be built opencl-headers: Allow empty packages to be built gcc-8: rebase microblaze patches for gcc 8.2.0 gcc8: update microblaze patches gcc: update microblaze patches update gcc-8 patches gcc: Remove xilinx.ld requirement Jaewon Lee (6): zc1254-zynqmp.conf: Add support for zc1254 evaluation board zc1275-zynqmp.conf: Add support for zc1275 evaluation board zcu102-zynqmp.conf: Changing qemu boot mode Adding FPGA_MNGR_RECONFIG_ENABLE to control enabling fpga manager gcc: Removing already upstreamed patch Rebasing binutils patches from 2.31 to 2.32 Madhurkiran Harikrishnan (2): kernel-module-mali: Fix errors associated with kernel upgrade to 4.19 xf86-video-armsoc: Remove the recipe for xf86-video-armsoc Manjukumar Matha (10): libmali-xlnx_git.bb: Fix the package arch for libmali zcu111-zynqmp.conf: Add support for ZCU111 evaluation board qemu-system-aarch64-multiarch: Enable plm argument in runqemu arm-trusted-firmware.inc: Add support to build ATF for versal devices linux-xlnx.inc: Add support to build kernel for versal devices linux-xlnx.inc: Use KBUILD_DEFCONFIG in externalsrc mode if defined kernel-simpleimage.bbclass: Use dts for simpleImage generation for Microblaze kernel-simpleimage.bbclass: Deploy simpleImage unstrip file kernel-simpleimage.bbclass: Deploy simpleImage strip binutils%.bbappend: Update Microblaze binutils patches to v2.31 Min Ma (4): ocl-icd_git.bb: Add recipe for OpenCL ICD loaders opencl-clhpp_git.bb: Recipe for OpenCL Host API C++ bindings zocl: Recipe for Xilinx runtime driver module xrt: Xilinx Runtime User Space Libraries and headers Sai Hari Chandana Kalluri (1): xilinx-testimage.bbclass: Include IMAGE_AUTOLOGIN and IMAGE_FSTYPES values for runqemu Sreeja Vadakattu (1): machine-xilinx-default.inc: Make u-boot.elf as UBOOT_ELF for zynq Vineeth Chowdary Karumanchi (1): tune-zynq.inc: Build zImage in addition to uImage meta-security: c28b72e91d..ecb526ffab: Armin Kuster (34): linux-bbappends: simplify layers: set warrior only security-test-image: add a testing image runtime: clamav test cleanup packagegroup-core-security: cleanup and remove ptest test-image: add packagegroup-core-security-ptest test-image: add a few more packages to image ima-evm-utils: update to tip runtime: tpm2 fix names in packagecheck tpm2 images: create tpm2 image and fix packagegroup tpm image: split out tpm2 tpm2-pkcs11/tpm2-pkcs11: update to tip tpm2-tcti-uefi: update to tip tpm2-tools: update to 3.2.0 tpm2-tss: update to 2.2.3 tpm2-totp: update to offical release v0.1.1 tpm2-tss-engine: update to 1.0.0 libmspack: update SRC_URI and package clamav: minor recipe cleanup lynis: update to 2.7.5 meta-security-compliance: update README openscap_git: update to 1.3.0 openscap: add 1.3.1 recipes for upstream source scap-security-guide: update to 0.1.44 meta-security-compliance: add meta-python libldb: remove recipe waf-cross-answers: remove files samhain: update to 4.3.3 keyutils: remove from meta-security linux-%: remove kernel fragments now in cache meta-integrity: remove kernel fragments now in cache linux-stable/5.2: add stable bbappend linux-yocto: use 4.19 kernel cache now linux-yocto-dev: update to use kernel cache Dmitry Eremin-Solenikov (11): packagegroup-security-tpm2: stop including tpm2-tcti-uefi tpm2-tss: fix compilation when using updated AX_CODE_COVERAGE macro tpm2-tcti-uefi: add autoconf-archive-native dependency tpm2-tcti-uefi: fix configure arguments tpm2-tcti-uefi: stop inserting host directories into build path tpm2-tcti-uefi: build and install examples meta-integrity: rename IMA_EVM_BASE to INTEGRITY_BASE ima-evm-utils: bump to release 1.2.1 kernel-modsign.bbclass: add support for kernel modules signing linux: add support for kernel modules signing layer.conf: switch to keyutils from meta-oe He Zhe (1): kernel: Add conditional inclusion of fragments for linux-yocto-dev Mark Asselstine (1): openscap/scap-security-guide: use _git instead of versioned filenames Yi Zhao (5): openscap: update recipe scap-security-guide: update recipe openscap: cleanup DEPENDS scap-security-guide: fix typo xmlsec1: upgrade 1.2.27 -> 1.2.28 lumag (3): layer.conf: add dependency on meta-security ima-evm-utils: bump version ima-evm-utils: refresh xattr patch meta-raspberrypi: 8636b63752..b112816e95: Andrei Gherzan (46): rpi-base.inc: Include rpi4 dtb raspberrypi3.conf: Clarify machine mode linux-raspberrypi: Include configuration for RaspberryPi3 defconfig linux-raspberrypi: Update 4.19 kernel to 4.19.56 rpi-base: Rename the rpi0w dtb firmware: Update to 20190620 raspberrypi4.conf: Add initial machine 32 bit configuration linux-firmware-rpidistro: Fix WiFi on RaspberryPi 4 rpi-base.inc: Include the "fake" KMS dtbo raspberrypi4: Use vc4-fkms-v3d linux-raspberrypi: Bump 4.19 revision to fix RPi 4 arm64 builds raspberrypi4-64.conf: Introduce RPi arm64 machine firmware: Rename firmware inc file to raspberrypi-firmware.inc armstubs: Add support for compiling ARM stubs rpi-config: Handle ARMSTUB sdcard_image-rpi.bbclass: Include in the SD card image the armstub file raspberrypi4-64.conf: Initial machine configuration raspberrypi-tools: Update to remove Makefile patch linux-raspberrypi: Fix defconfig for RPi4-64 linux-raspberrypi.inc: Explicitly set defconfig for raspberrypi4-64 sdcard_image-rpi.bbclass: Fix typo linux-raspberrypi: Bump 4.19 revision to have proper coherent_pool set raspberrypi4-64.conf: Define a machine feature for armstubs sdcard_image-rpi.bbclass: Use armstub machine feature linux-raspberrypi: Bump 4.19.57 revision raspberrypi4.conf: Define uboot defconfig raspberrypi4-64.conf: Uboot configuration and drop armstub u-boot: Use a temporary fork for RPi4 support raspberrypi-firmware: Update to 20190709 raspberrypi4.conf: The firmware uses kernel7l.img when LPAE is supported linux-raspberrypi: Bump 4.19 to 4.19.58 linux-raspberrypi: Build dtbs with dtbs make target for all 64bit targets linux-raspberrypi: Bump 4.19 revision raspberrypi4-64.conf: Remove memory limitation u-boot: Replace custom fork by patches u-boot: Update patches for RPi4 rpi-config: Check for armstub based on machine feature sdcard_image-rpi: Check for armstub based on machine feature armstubs: Error out when ARMSTUBS is not defined raspberrypi*: Define ARMSTUB for all machines raspberrypi4-64.conf: Limit RAM to 3G README.md: Use matrix chat room raspberrypi-firmware.inc: Update to 20190718 linux-raspberrypi: Update 4.19 recipe to 4.19.66 mesa: Add v3d and kmsro driver as well raspberrypi4-64: Remove the 3G RAM limitation Carton (2): bluez5: Fixed typo (RC_URI -> SRC_URI) rpi-config: Check some config values against "1" Francesco Giancane (1): linux-raspberrypi: update to 4.14.114 Khem Raj (8): linux-raspberrypi: Upgrade to 4.19.57 userland: Upgrade to latest webkitgtk: Remove -DUSE_GSTREAMER_GL=OFF for vc4graphics layer.conf: Add meta-networking to dynamic layers drbd: Disable for rpi machines packagegroup-rpi-test: Depend on wireless-regdb instead of crda xorg-xserver: Adapt bbappend to latest OE-core python-rtimu,python-sense-hat: Convert to py3 modules Kirill Goncharov (1): omxplayer: Bump revision Martin Jansa (1): sdcard_image-rpi.bbclass: use -v for all mcopy calls and add bbfatal in case mcopy fails Riyaz (1): rpi-base.inc: Enabling open-source vc4graphics driver for all RPI platforms Change-Id: I9e37b5952a2e2e30745275fc89e4dd7c47b851e2 Signed-off-by: Brad Bishop --- .../meta-oe/recipes-kernel/crash/crash_7.2.5.bb | 120 --------------------- .../meta-oe/recipes-kernel/crash/crash_7.2.6.bb | 120 +++++++++++++++++++++ .../kernel-selftest/kernel-selftest.bb | 11 ++ .../meta-oe/recipes-kernel/kpatch/kpatch.inc | 2 + ...patch-build-add-cross-compilation-support.patch | 52 ++++----- ...tch-build-allow-overriding-of-distro-name.patch | 24 +++-- .../meta-oe/recipes-kernel/kpatch/kpatch_git.bb | 4 +- ...0001-makedumpfile-replace-hardcode-CFLAGS.patch | 41 +++---- ...-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch | 23 ++-- .../makedumpfile/makedumpfile_1.6.5.bb | 57 ---------- .../makedumpfile/makedumpfile_1.6.6.bb | 57 ++++++++++ .../meta-oe/recipes-kernel/oprofile/oprofile.inc | 1 - .../pm-graph/pm-graph/0001-bootgraph.py.patch | 32 ++++++ .../recipes-kernel/pm-graph/pm-graph_5.3.bb | 4 +- .../recipes-kernel/turbostat/turbostat_3.4.bb | 1 + 15 files changed, 305 insertions(+), 244 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.6.bb delete mode 100644 meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch (limited to 'meta-openembedded/meta-oe/recipes-kernel') diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.5.bb b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.5.bb deleted file mode 100644 index e124db19c..000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.5.bb +++ /dev/null @@ -1,120 +0,0 @@ -SUMMARY = "Kernel analysis utility for live systems, netdump, diskdump, kdump, LKCD or mcore dumpfiles" -DESCRIPTION = "The core analysis suite is a self-contained tool that can be used to\ -investigate either live systems, kernel core dumps created from the\ -netdump, diskdump and kdump packages from Red Hat Linux, the mcore kernel patch\ -offered by Mission Critical Linux, or the LKCD kernel patch." - -HOMEPAGE = "http://people.redhat.com/anderson" -SECTION = "devel" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING3;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = "zlib readline coreutils-native" - -S = "${WORKDIR}/git" -SRC_URI = "git://github.com/crash-utility/${BPN}.git \ - http://ftp.gnu.org/gnu/gdb/gdb-7.6.tar.gz;name=gdb;subdir=git \ - file://7001force_define_architecture.patch \ - file://7003cross_ranlib.patch \ - file://0001-cross_add_configure_option.patch \ - file://sim-ppc-drop-LIBS-from-psim-dependency.patch \ - file://sim-common-sim-arange-fix-extern-inline-handling.patch \ - file://donnot-extract-gdb-during-do-compile.patch \ - file://gdb_build_jobs_and_not_write_crash_target.patch \ - file://remove-unrecognized-gcc-option-m32-for-mips.patch \ - file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \ - file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \ - " -SRCREV = "c0a2fc9d322cf0c5f569ce54e9201d2f586edb0c" - -SRC_URI[gdb.md5sum] = "a9836707337e5f7bf76a009a8904f470" -SRC_URI[gdb.sha256sum] = "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36" - -UPSTREAM_CHECK_URI = "https://github.com/crash-utility/crash/releases" - -inherit gettext - -BBCLASSEXTEND = "native cross" -TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}" - -# crash 7.1.3 and before don't support mips64 -COMPATIBLE_HOST = "^(?!mips64).*" - -EXTRA_OEMAKE = 'RPMPKG="${PV}" \ - GDB_TARGET="${TARGET_SYS}" \ - GDB_HOST="${BUILD_SYS}" \ - GDB_MAKE_JOBS="${PARALLEL_MAKE}" \ - LDFLAGS="${LDFLAGS}" \ - ' - -EXTRA_OEMAKE_class-cross = 'RPMPKG="${PV}" \ - GDB_TARGET="${BUILD_SYS} \ - \${GDB_CONF_FLAGS} \ - --target=${TARGET_SYS}" \ - GDB_HOST="${BUILD_SYS}" \ - GDB_MAKE_JOBS="${PARALLEL_MAKE}" \ - ' - -EXTRA_OEMAKE_append_class-native = " LDFLAGS='${BUILD_LDFLAGS}'" -EXTRA_OEMAKE_append_class-cross = " LDFLAGS='${BUILD_LDFLAGS}'" - -REMOVE_M32 = "sed -i -e 's/#define TARGET_CFLAGS_ARM_ON_X86_64.*/#define TARGET_CFLAGS_ARM_ON_X86_64\t\"TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64\"/g' ${S}/configure.c" - -REMOVE_M32_class-cross = "" - -do_configure() { - : -} - -do_compile_prepend() { - case ${TARGET_ARCH} in - aarch64*) ARCH=ARM64 ;; - arm*) ARCH=ARM ;; - i*86*) ARCH=X86 ;; - x86_64*) ARCH=X86_64 ;; - powerpc64*) ARCH=PPC64 ;; - powerpc*) ARCH=PPC ;; - mips*) ARCH=MIPS ;; - esac - - sed -i s/FORCE_DEFINE_ARCH/"${ARCH}"/g ${S}/configure.c - ${REMOVE_M32} - sed -i 's/>/>/g' ${S}/Makefile -} - -do_compile() { - oe_runmake ${EXTRA_OEMAKE} RECIPE_SYSROOT=${RECIPE_SYSROOT} -} - -do_install_prepend () { - install -d ${D}${bindir} - install -d ${D}/${mandir}/man8 - install -d ${D}${includedir}/crash - - install -m 0644 ${S}/crash.8 ${D}/${mandir}/man8/ - install -m 0644 ${S}/defs.h ${D}${includedir}/crash -} - -do_install_class-target () { - oe_runmake DESTDIR=${D} install -} - -do_install_class-native () { - oe_runmake DESTDIR=${D}${STAGING_DIR_NATIVE} install -} - -do_install_class-cross () { - install -m 0755 ${S}/crash ${D}/${bindir} -} - -RDEPENDS_${PN} += "liblzma" -RDEPENDS_${PN}_class-native = "" -RDEPENDS_${PN}_class-cross = "" - -# Causes gcc to get stuck and eat all available memory in qemuarm builds -# jenkins 15161 100 12.5 10389596 10321284 ? R 11:40 28:17 /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.2/cc1 -quiet -I . -I . -I ./common -I ./config -I ./../include/opcode -I ./../opcodes/.. -I ./../readline/.. -I ../bfd -I ./../bfd -I ./../include -I ../libdecnumber -I ./../libdecnumber -I ./gnulib/import -I build-gnulib/import -isysroot /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm -MMD eval.d -MF .deps/eval.Tpo -MP -MT eval.o -D LOCALEDIR="/usr/local/share/locale" -D CRASH_MERGE -D HAVE_CONFIG_H -D TUI=1 eval.c -quiet -dumpbase eval.c -march=armv5te -mthumb -mthumb-interwork -mtls-dialect=gnu -auxbase-strip eval.o -g -O2 -Wall -Wpointer-arith -Wformat-nonliteral -Wno-pointer-sign -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wmissing-prototypes -Wdeclaration-after-statement -Wempty-body -feliminate-unused-debug-types -o - -ARM_INSTRUCTION_SET = "arm" - -# http://errors.yoctoproject.org/Errors/Details/186964/ -EXCLUDE_FROM_WORLD_libc-musl = "1" diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.6.bb b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.6.bb new file mode 100644 index 000000000..0a7c384a7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.6.bb @@ -0,0 +1,120 @@ +SUMMARY = "Kernel analysis utility for live systems, netdump, diskdump, kdump, LKCD or mcore dumpfiles" +DESCRIPTION = "The core analysis suite is a self-contained tool that can be used to\ +investigate either live systems, kernel core dumps created from the\ +netdump, diskdump and kdump packages from Red Hat Linux, the mcore kernel patch\ +offered by Mission Critical Linux, or the LKCD kernel patch." + +HOMEPAGE = "http://people.redhat.com/anderson" +SECTION = "devel" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING3;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = "zlib readline coreutils-native" + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/crash-utility/${BPN}.git \ + ${GNU_MIRROR}/gdb/gdb-7.6.tar.gz;name=gdb;subdir=git \ + file://7001force_define_architecture.patch \ + file://7003cross_ranlib.patch \ + file://0001-cross_add_configure_option.patch \ + file://sim-ppc-drop-LIBS-from-psim-dependency.patch \ + file://sim-common-sim-arange-fix-extern-inline-handling.patch \ + file://donnot-extract-gdb-during-do-compile.patch \ + file://gdb_build_jobs_and_not_write_crash_target.patch \ + file://remove-unrecognized-gcc-option-m32-for-mips.patch \ + file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \ + file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \ + " +SRCREV = "4076ebea6626e3f0a20150602c6ffab999ea5c90" + +SRC_URI[gdb.md5sum] = "a9836707337e5f7bf76a009a8904f470" +SRC_URI[gdb.sha256sum] = "8070389a5dcc104eb0be483d582729f98ed4d761ad19cedd3f17b5d2502faa36" + +UPSTREAM_CHECK_URI = "https://github.com/crash-utility/crash/releases" + +inherit gettext + +BBCLASSEXTEND = "native cross" +TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}" + +# crash 7.1.3 and before don't support mips64 +COMPATIBLE_HOST = "^(?!mips64).*" + +EXTRA_OEMAKE = 'RPMPKG="${PV}" \ + GDB_TARGET="${TARGET_SYS}" \ + GDB_HOST="${BUILD_SYS}" \ + GDB_MAKE_JOBS="${PARALLEL_MAKE}" \ + LDFLAGS="${LDFLAGS}" \ + ' + +EXTRA_OEMAKE_class-cross = 'RPMPKG="${PV}" \ + GDB_TARGET="${BUILD_SYS} \ + \${GDB_CONF_FLAGS} \ + --target=${TARGET_SYS}" \ + GDB_HOST="${BUILD_SYS}" \ + GDB_MAKE_JOBS="${PARALLEL_MAKE}" \ + ' + +EXTRA_OEMAKE_append_class-native = " LDFLAGS='${BUILD_LDFLAGS}'" +EXTRA_OEMAKE_append_class-cross = " LDFLAGS='${BUILD_LDFLAGS}'" + +REMOVE_M32 = "sed -i -e 's/#define TARGET_CFLAGS_ARM_ON_X86_64.*/#define TARGET_CFLAGS_ARM_ON_X86_64\t\"TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64\"/g' ${S}/configure.c" + +REMOVE_M32_class-cross = "" + +do_configure() { + : +} + +do_compile_prepend() { + case ${TARGET_ARCH} in + aarch64*) ARCH=ARM64 ;; + arm*) ARCH=ARM ;; + i*86*) ARCH=X86 ;; + x86_64*) ARCH=X86_64 ;; + powerpc64*) ARCH=PPC64 ;; + powerpc*) ARCH=PPC ;; + mips*) ARCH=MIPS ;; + esac + + sed -i s/FORCE_DEFINE_ARCH/"${ARCH}"/g ${S}/configure.c + ${REMOVE_M32} + sed -i 's/>/>/g' ${S}/Makefile +} + +do_compile() { + oe_runmake ${EXTRA_OEMAKE} RECIPE_SYSROOT=${RECIPE_SYSROOT} +} + +do_install_prepend () { + install -d ${D}${bindir} + install -d ${D}/${mandir}/man8 + install -d ${D}${includedir}/crash + + install -m 0644 ${S}/crash.8 ${D}/${mandir}/man8/ + install -m 0644 ${S}/defs.h ${D}${includedir}/crash +} + +do_install_class-target () { + oe_runmake DESTDIR=${D} install +} + +do_install_class-native () { + oe_runmake DESTDIR=${D}${STAGING_DIR_NATIVE} install +} + +do_install_class-cross () { + install -m 0755 ${S}/crash ${D}/${bindir} +} + +RDEPENDS_${PN} += "liblzma" +RDEPENDS_${PN}_class-native = "" +RDEPENDS_${PN}_class-cross = "" + +# Causes gcc to get stuck and eat all available memory in qemuarm builds +# jenkins 15161 100 12.5 10389596 10321284 ? R 11:40 28:17 /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.2/cc1 -quiet -I . -I . -I ./common -I ./config -I ./../include/opcode -I ./../opcodes/.. -I ./../readline/.. -I ../bfd -I ./../bfd -I ./../include -I ../libdecnumber -I ./../libdecnumber -I ./gnulib/import -I build-gnulib/import -isysroot /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm -MMD eval.d -MF .deps/eval.Tpo -MP -MT eval.o -D LOCALEDIR="/usr/local/share/locale" -D CRASH_MERGE -D HAVE_CONFIG_H -D TUI=1 eval.c -quiet -dumpbase eval.c -march=armv5te -mthumb -mthumb-interwork -mtls-dialect=gnu -auxbase-strip eval.o -g -O2 -Wall -Wpointer-arith -Wformat-nonliteral -Wno-pointer-sign -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wmissing-prototypes -Wdeclaration-after-statement -Wempty-body -feliminate-unused-debug-types -o - +ARM_INSTRUCTION_SET = "arm" + +# http://errors.yoctoproject.org/Errors/Details/186964/ +EXCLUDE_FROM_WORLD_libc-musl = "1" diff --git a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index 181e97cac..7370f9fb4 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -121,3 +121,14 @@ FILES_${PN} += "/usr/kernel-selftest" RDEPENDS_${PN} += "python3" # tools/testing/selftests/vm/Makefile doesn't respect LDFLAGS and tools/testing/selftests/Makefile explicitly overrides to empty INSANE_SKIP_${PN} += "ldflags" + +# userfaultfd.c:126:2: error: format not a string literal and no format arguments [-Werror=format-security] +# fprintf(stderr, examples); +# ^~~~~~~ +SECURITY_STRINGFORMAT = "" + +# https://errors.yoctoproject.org/Errors/Details/261657/ +# kernel-selftest/1.0-r0/recipe-sysroot/usr/include/bits/fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute error: open with O_CREAT or O_TMPFILE in second argument needs 3 arguments +# __open_missing_mode (); +# ^~~~~~~~~~~~~~~~~~~~~~ +lcl_maybe_fortify = "" diff --git a/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch.inc b/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch.inc index cd819f31f..1f70f7205 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch.inc +++ b/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch.inc @@ -15,7 +15,9 @@ EXTRA_OEMAKE = " \ LIBDIR=${D}${libdir} \ MANDIR=${D}${mandir}/man1 \ SYSTEMDDIR=${D}${systemd_system_unitdir} \ + UPSTARTDIR=${D}${sysconfdir}/init \ DESTDIR=${D} \ + ARCH=${TARGET_ARCH} \ BUILDMOD=no \ CC='${CC}' \ " diff --git a/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch b/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch index ab3b12764..348d82acc 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch +++ b/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch @@ -1,6 +1,6 @@ -From 70de3fecbc551907c4fd504cfff385c73be8db75 Mon Sep 17 00:00:00 2001 -From: Ruslan Bilovol -Date: Tue, 19 Dec 2017 15:59:04 +0200 +From 21909e3f9096fa8e4825df8c65114ee92ab3d532 Mon Sep 17 00:00:00 2001 +From: Zang Ruochen +Date: Wed, 7 Aug 2019 02:57:35 +0900 Subject: [PATCH] kpatch-build: add cross-compilation support This patch introduces new option for kpatch-build @@ -17,44 +17,45 @@ possible to pass multy-component strings like Upstream-Status: Pending Signed-off-by: Ruslan Bilovol - --- kpatch-build/kpatch-build | 13 +++++++++++-- kpatch-build/kpatch-gcc | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build -index a76913f..4a011aa 100755 +index 9ef3809..463dab1 100755 --- a/kpatch-build/kpatch-build +++ b/kpatch-build/kpatch-build -@@ -197,7 +197,7 @@ gcc_version_check() { +@@ -198,7 +198,7 @@ gcc_version_check() { # gcc --version varies between distributions therefore extract version # by compiling a test file and compare it to vmlinux's version. echo 'void main(void) {}' > "$c" - out="$(gcc -c -pg -ffunction-sections -o "$o" "$c" 2>&1)" + out="$(${KPATCH_CROSS_COMPILE}gcc -c -pg -ffunction-sections -o "$o" "$c" 2>&1)" gccver="$(gcc_version_from_file "$o")" - kgccver="$(gcc_version_from_file "$VMLINUX")" - rm -f "$c" "$o" -@@ -392,12 +392,14 @@ usage() { - echo " -d, --debug Enable 'xtrace' and keep scratch files" >&2 - echo " in /tmp" >&2 + if [[ -n "$OOT_MODULE" ]]; then + kgccver="$(gcc_version_from_file "$OOT_MODULE")" +@@ -411,6 +411,8 @@ usage() { echo " (can be specified multiple times)" >&2 + echo " -e, --oot-module Enable patching out-of-tree module," >&2 + echo " specify current version of module" >&2 + echo " --cross-compile Specify the prefix used for all executables" >&2 + echo " used during compilation" >&2 echo " --skip-cleanup Skip post-build cleanup" >&2 - echo " --skip-gcc-check Skip gcc version matching check" >&2 + echo " --skip-gcc-check Skip gcc version matching check" >&2 + echo " (not recommended)" >&2 +@@ -416,7 +418,7 @@ usage() { echo " (not recommended)" >&2 } --options="$(getopt -o ha:r:s:c:v:j:t:n:o:d -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,debug,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed" -+options="$(getopt -o ha:r:s:c:v:j:t:n:o:d -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,debug,cross-compile:,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed" +-options="$(getopt -o ha:r:s:c:v:j:t:n:o:de: -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,oot-module:,debug,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed" ++options="$(getopt -o ha:r:s:c:v:j:t:n:o:de: -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,oot-module:,debug,cross-compile:,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed" eval set -- "$options" -@@ -455,6 +457,10 @@ while [[ $# -gt 0 ]]; do - echo "DEBUG mode enabled" - fi +@@ -479,6 +481,10 @@ while [[ $# -gt 0 ]]; do + OOT_MODULE="$(readlink -f "$2")" + shift ;; + --cross-compile) + KPATCH_CROSS_COMPILE="$2" @@ -63,17 +64,17 @@ index a76913f..4a011aa 100755 --skip-cleanup) echo "Skipping cleanup" SKIPCLEANUP=1 -@@ -710,6 +716,8 @@ if [[ $DEBUG -ge 4 ]]; then +@@ -757,6 +763,8 @@ if [[ $DEBUG -ge 4 ]]; then export KPATCH_GCC_DEBUG=1 fi +export KPATCH_CROSS_COMPILE + - echo "Building original kernel" - ./scripts/setlocalversion --save-scmversion || die + echo "Building original source" + [[ -n "$OOT_MODULE" ]] || ./scripts/setlocalversion --save-scmversion || die unset KPATCH_GCC_TEMPDIR -@@ -874,6 +882,7 @@ cd "$TEMPDIR/patch" || die - KPATCH_BUILD="$SRCDIR" KPATCH_NAME="$MODNAME" \ +@@ -940,6 +948,7 @@ fi + KPATCH_BUILD="$KPATCH_BUILD" KPATCH_NAME="$MODNAME" \ KBUILD_EXTRA_SYMBOLS="$KBUILD_EXTRA_SYMBOLS" \ KPATCH_LDFLAGS="$KPATCH_LDFLAGS" \ +CROSS_COMPILE="$KPATCH_CROSS_COMPILE" \ @@ -81,7 +82,7 @@ index a76913f..4a011aa 100755 if ! "$KPATCH_MODULE"; then diff --git a/kpatch-build/kpatch-gcc b/kpatch-build/kpatch-gcc -index 2d56da1..59a4255 100755 +index 9663290..56e6c8f 100755 --- a/kpatch-build/kpatch-gcc +++ b/kpatch-build/kpatch-gcc @@ -8,7 +8,7 @@ TOOLCHAINCMD="$1" @@ -93,9 +94,12 @@ index 2d56da1..59a4255 100755 fi declare -a args=("$@") -@@ -82,4 +82,4 @@ elif [[ "$TOOLCHAINCMD" = "ld" ]] ; then +@@ -84,4 +84,4 @@ elif [[ "$TOOLCHAINCMD" = "ld" ]] ; then done fi -exec "$TOOLCHAINCMD" "${args[@]}" +exec ${KPATCH_CROSS_COMPILE}${TOOLCHAINCMD} "${args[@]}" +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch b/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch index 13cdc6bfb..603a1475a 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch +++ b/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch @@ -1,6 +1,6 @@ -From 15838a86d5ea94fa05976ea32fd847b18261b403 Mon Sep 17 00:00:00 2001 -From: Ruslan Bilovol -Date: Tue, 2 Jan 2018 14:50:03 +0200 +From 4143fa0092fe4cafee10b24a97d3ad0b41ab7a30 Mon Sep 17 00:00:00 2001 +From: Zang Ruochen +Date: Wed, 7 Aug 2019 03:24:39 +0900 Subject: [PATCH] kpatch-build: allow overriding of distro name It is sometimes useful to have ability to override @@ -14,17 +14,16 @@ implements all needed functionality Upstream-Status: Pending Signed-off-by: Ruslan Bilovol - --- kpatch-build/kpatch-build | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build -index 4a011aa..eb6cd64 100755 +index 39933fc..c0258a2 100755 --- a/kpatch-build/kpatch-build +++ b/kpatch-build/kpatch-build -@@ -394,12 +394,13 @@ usage() { - echo " (can be specified multiple times)" >&2 +@@ -413,12 +413,13 @@ usage() { + echo " specify current version of module" >&2 echo " --cross-compile Specify the prefix used for all executables" >&2 echo " used during compilation" >&2 + echo " --distro Override distro name" >&2 @@ -33,12 +32,12 @@ index 4a011aa..eb6cd64 100755 echo " (not recommended)" >&2 } --options="$(getopt -o ha:r:s:c:v:j:t:n:o:d -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,debug,cross-compile:,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed" -+options="$(getopt -o ha:r:s:c:v:j:t:n:o:d -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,debug,cross-compile:,distro:,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed" +-options="$(getopt -o ha:r:s:c:v:j:t:n:o:de: -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,oot-module:,debug,cross-compile:,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed" ++options="$(getopt -o ha:r:s:c:v:j:t:n:o:de: -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,oot-module:,debug,cross-compile:,distro:,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed" eval set -- "$options" -@@ -461,6 +462,10 @@ while [[ $# -gt 0 ]]; do +@@ -485,6 +486,10 @@ while [[ $# -gt 0 ]]; do KPATCH_CROSS_COMPILE="$2" shift ;; @@ -49,7 +48,7 @@ index 4a011aa..eb6cd64 100755 --skip-cleanup) echo "Skipping cleanup" SKIPCLEANUP=1 -@@ -539,7 +544,7 @@ fi +@@ -571,7 +576,7 @@ fi # Don't check external file. # shellcheck disable=SC1091 source /etc/os-release @@ -58,3 +57,6 @@ index 4a011aa..eb6cd64 100755 if [[ "$DISTRO" = fedora ]] || [[ "$DISTRO" = rhel ]] || [[ "$DISTRO" = ol ]] || [[ "$DISTRO" = centos ]]; then [[ -z "$VMLINUX" ]] && VMLINUX="/usr/lib/debug/lib/modules/$ARCHVERSION/vmlinux" [[ -e "$VMLINUX" ]] || die "kernel-debuginfo-$ARCHVERSION not installed" +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch_git.bb b/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch_git.bb index 024cca655..dc247942f 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch_git.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch_git.bb @@ -2,9 +2,9 @@ require kpatch.inc LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "7f550f01bd308cf058ae782327d29c8916cc5602" +SRCREV = "d7c5810e2a6acacfa5fec1e38d2f75af8e8c818c" -PV = "0.6.1+git${SRCPV}" +PV = "0.7.1+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch index a47806526..c0f82f321 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch +++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch @@ -1,4 +1,4 @@ -From 8eeb1b15608ce1a9a1f0d5417938fd6da4504406 Mon Sep 17 00:00:00 2001 +From af97e2ad643334b4c7c3d66f971ce9ebb2b596af Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Thu, 21 Jul 2016 18:06:21 +0800 Subject: [PATCH] makedumpfile: replace hardcode CFLAGS @@ -13,30 +13,28 @@ Subject: [PATCH] makedumpfile: replace hardcode CFLAGS Upstream-Status: Inappropriate[oe specific] Signed-off-by: Mingli Yu - --- - Makefile | 46 +++++++++++++++++++++++----------------------- - 1 file changed, 23 insertions(+), 23 deletions(-) + Makefile | 45 +++++++++++++++++++++++---------------------- + 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile -index 612b9d0..f6d6265 100644 +index 1fdb628..5dce589 100644 --- a/Makefile +++ b/Makefile -@@ -8,13 +8,6 @@ ifeq ($(strip $CC),) +@@ -8,12 +8,6 @@ ifeq ($(strip $CC),) CC = gcc endif --CFLAGS = -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \ -- -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \ -- -DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(DATE)"' --CFLAGS_ARCH = -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \ -- -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE +-CFLAGS_BASE := $(CFLAGS) -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \ +- -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE +-CFLAGS := $(CFLAGS_BASE) -DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(DATE)"' +-CFLAGS_ARCH := $(CFLAGS_BASE) -# LDFLAGS = -L/usr/local/lib -I/usr/local/include - HOST_ARCH := $(shell uname -m) # Use TARGET as the target architecture if specified. # Defaults to uname -m -@@ -22,29 +15,36 @@ ifeq ($(strip($TARGET)),) +@@ -21,29 +15,36 @@ ifeq ($(strip($TARGET)),) TARGET := $(HOST_ARCH) endif @@ -72,18 +70,18 @@ index 612b9d0..f6d6265 100644 endif +CFLAGS_ARCH += $(CFLAGS) \ -+ -D_FILE_OFFSET_BITS=64 \ -+ -D_LARGEFILE_SOURCE \ -+ -D_LARGEFILE64_SOURCE ++ -D_FILE_OFFSET_BITS=64 \ ++ -D_LARGEFILE_SOURCE \ ++ -D_LARGEFILE64_SOURCE + +CFLAGS_COMMON = $(CFLAGS_ARCH) \ -+ -DVERSION='"$(VERSION)"' \ -+ -DRELEASE_DATE='"$(DATE)"' ++ -DVERSION='"$(VERSION)"' \ ++ -DRELEASE_DATE='"$(DATE)"' + SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART)) -@@ -53,17 +53,17 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) +@@ -52,17 +53,17 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz ifneq ($(LINKTYPE), dynamic) @@ -104,7 +102,7 @@ index 612b9d0..f6d6265 100644 endif LIBS := -lpthread $(LIBS) -@@ -71,14 +71,14 @@ LIBS := -lpthread $(LIBS) +@@ -82,14 +83,14 @@ LIBS := $(LIBS) $(call try-run,\ all: makedumpfile $(OBJ_PART): $(SRC_PART) @@ -121,7 +119,7 @@ index 612b9d0..f6d6265 100644 echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8 grep -v "^.TH MAKEDUMPFILE 8" $(VPATH)makedumpfile.8 >> temp.8 mv temp.8 makedumpfile.8 -@@ -89,7 +89,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH) +@@ -100,7 +101,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH) gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz eppic_makedumpfile.so: extension_eppic.c @@ -130,3 +128,6 @@ index 612b9d0..f6d6265 100644 clean: rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8.gz makedumpfile.conf.5.gz +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch index 156b4d57d..1707df3e3 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch +++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch @@ -1,4 +1,4 @@ -From 0d1cdb59da3603e0a80913617ece0164b05380d2 Mon Sep 17 00:00:00 2001 +From 9045b72bdb703bf58a6586d77461eea8f59f50f7 Mon Sep 17 00:00:00 2001 From: Alexandru Moise Date: Fri, 29 Apr 2016 07:40:46 +0000 Subject: [PATCH] mem_section: Support only 46 bit for MAX_PHYSMEM_BITS on @@ -23,18 +23,20 @@ Signed-off-by: Yi Zhao [hqBai: adjusted patch for context, no logical change] Signed-off-by: Haiqing Bai +Signed-off-by: Mingli Yu --- - arch/ppc64.c | 33 ++------------------------------- - 1 file changed, 2 insertions(+), 31 deletions(-) + arch/ppc64.c | 38 ++------------------------------------ + 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/arch/ppc64.c b/arch/ppc64.c -index 947a125..458f06b 100644 +index 9d8f252..6f4860f 100644 --- a/arch/ppc64.c +++ b/arch/ppc64.c -@@ -463,42 +463,13 @@ ppc64_vtop_level4(unsigned long vaddr) +@@ -462,48 +462,14 @@ ppc64_vtop_level4(unsigned long vaddr) + return paddr; } - int +-int -set_ppc64_max_physmem_bits(void) -{ - long array_len = ARRAY_LENGTH(mem_section); @@ -58,10 +60,15 @@ index 947a125..458f06b 100644 - || (array_len == (NR_MEM_SECTIONS() / _SECTIONS_PER_ROOT()))) - return TRUE; - +- info->max_physmem_bits = _MAX_PHYSMEM_BITS_4_20; +- if ((array_len == (NR_MEM_SECTIONS() / _SECTIONS_PER_ROOT_EXTREME())) +- || (array_len == (NR_MEM_SECTIONS() / _SECTIONS_PER_ROOT()))) +- return TRUE; +- - return FALSE; -} - --int + int get_machdep_info_ppc64(void) { unsigned long vmlist, vmap_area_list, vmalloc_start; @@ -77,5 +84,5 @@ index 947a125..458f06b 100644 if (SYMBOL(_stext) == NOT_FOUND_SYMBOL) { -- -2.7.4 +2.21.0 diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.5.bb b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.5.bb deleted file mode 100644 index 413b413a9..000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.5.bb +++ /dev/null @@ -1,57 +0,0 @@ -SUMMARY = "VMcore extraction tool" -DESCRIPTION = "\ - This program is used to extract a subset of the memory available either \ - via /dev/mem or /proc/vmcore (for crashdumps). It is used to get memory \ - images without extra uneeded information (zero pages, userspace programs, \ - etc). \ -" -HOMEPAGE = "http://makedumpfile.sourceforge.net" - -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -LICENSE = "GPLv2.0" - -DEPENDS = "bzip2 zlib elfutils" -RDEPENDS_${PN}-tools = "perl ${PN}" - -# arm and aarch64 would compile but has never been tested upstream. mips would not compile. -# -COMPATIBLE_HOST = "(x86_64|i.86|powerpc|arm|aarch64).*-linux" - -PACKAGES =+ "${PN}-tools" -FILES_${PN}-tools = "${bindir}/*.pl" - -SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/makedumpfile/${BPN}-${PV}.tar.gz \ - file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ - file://0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch \ -" -SRC_URI[md5sum] = "1737f8e8904d565629f0c9e702f92d02" -SRC_URI[sha256sum] = "5d4f1d6ded8dca6951eeabcf4bb1ebf6575288fee947529397103c040eb5c760" - -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/makedumpfile/files/makedumpfile/" -UPSTREAM_CHECK_REGEX = "makedumpfile/(?P\d+(\.\d+)+)/" - -SECTION = "base" - -# If we do not specify TARGET, makedumpfile will build for the host but use the -# target gcc. -# -EXTRA_OEMAKE = "\ - LINKTYPE=static \ - TARGET=${TARGET_ARCH} \ -" - -do_install () { - mkdir -p ${D}/usr/bin - install -m 755 ${S}/makedumpfile ${D}/usr/bin - install -m 755 ${S}/makedumpfile-R.pl ${D}/usr/bin - - mkdir -p ${D}/usr/share/man/man8 - install -m 644 ${S}/makedumpfile.8.gz ${D}/usr/share/man/man8 - - mkdir -p ${D}/usr/share/man/man5 - install -m 644 ${S}/makedumpfile.conf.5.gz ${D}/usr/share/man/man5 - - mkdir -p ${D}/etc/ - install -m 644 ${S}/makedumpfile.conf ${D}/etc/makedumpfile.conf.sample -} diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.6.bb b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.6.bb new file mode 100644 index 000000000..9c357bf6e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.6.bb @@ -0,0 +1,57 @@ +SUMMARY = "VMcore extraction tool" +DESCRIPTION = "\ + This program is used to extract a subset of the memory available either \ + via /dev/mem or /proc/vmcore (for crashdumps). It is used to get memory \ + images without extra uneeded information (zero pages, userspace programs, \ + etc). \ +" +HOMEPAGE = "http://makedumpfile.sourceforge.net" + +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +LICENSE = "GPLv2.0" + +DEPENDS = "bzip2 zlib elfutils" +RDEPENDS_${PN}-tools = "perl ${PN}" + +# arm and aarch64 would compile but has never been tested upstream. mips would not compile. +# +COMPATIBLE_HOST = "(x86_64|i.86|powerpc|arm|aarch64).*-linux" + +PACKAGES =+ "${PN}-tools" +FILES_${PN}-tools = "${bindir}/*.pl" + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/makedumpfile/${BPN}-${PV}.tar.gz \ + file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ + file://0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch \ +" +SRC_URI[md5sum] = "6fd632b97ad78d9a0a3b0f0989094064" +SRC_URI[sha256sum] = "d007eec05cb14f0155f2d06a0d4dc70d321dbb2aec65fccdce953145c8230324" + +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/makedumpfile/files/makedumpfile/" +UPSTREAM_CHECK_REGEX = "makedumpfile/(?P\d+(\.\d+)+)/" + +SECTION = "base" + +# If we do not specify TARGET, makedumpfile will build for the host but use the +# target gcc. +# +EXTRA_OEMAKE = "\ + LINKTYPE=static \ + TARGET=${TARGET_ARCH} \ +" + +do_install () { + mkdir -p ${D}/usr/bin + install -m 755 ${S}/makedumpfile ${D}/usr/bin + install -m 755 ${S}/makedumpfile-R.pl ${D}/usr/bin + + mkdir -p ${D}/usr/share/man/man8 + install -m 644 ${S}/makedumpfile.8.gz ${D}/usr/share/man/man8 + + mkdir -p ${D}/usr/share/man/man5 + install -m 644 ${S}/makedumpfile.conf.5.gz ${D}/usr/share/man/man5 + + mkdir -p ${D}/etc/ + install -m 644 ${S}/makedumpfile.conf ${D}/etc/makedumpfile.conf.sample +} diff --git a/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile.inc b/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile.inc index 515ea8faf..a9ee775d4 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile.inc +++ b/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile.inc @@ -12,7 +12,6 @@ SECTION = "devel" DEPENDS = "popt binutils" RDEPENDS_${PN} = "binutils-symlinks" -RRECOMMENDS_${PN} = "kernel-vmlinux" FILES_${PN} = "${bindir} ${libdir}/${BPN}/lib*${SOLIBS} ${datadir}/${BPN}" FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la" diff --git a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch new file mode 100644 index 000000000..d49ce0138 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch @@ -0,0 +1,32 @@ +From 0c94e32b218c31f31a7988577fb9bec595034e7b Mon Sep 17 00:00:00 2001 +From: Todd Brandt +Date: Fri, 10 May 2019 15:10:35 -0700 +Subject: [PATCH] bootgraph.py: - handle boot time start grep better, the regex + needs more complexity + +Upstream-Status: Backport [https://github.com/intel/pm-graph/commit/0c94e32b218c31f31a7988577fb9bec595034e7b] + +Signed-off-by: Liwei Song +--- + bootgraph.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/bootgraph.py b/bootgraph.py +index a2b1b1897307..d7f4bd152bf1 100755 +--- a/bootgraph.py ++++ b/bootgraph.py +@@ -333,9 +333,9 @@ def parseKernelLog(): + if(not sysvals.stamp['kernel']): + sysvals.stamp['kernel'] = sysvals.kernelVersion(msg) + continue +- m = re.match('.* setting system clock to (?P.*) UTC.*', msg) ++ m = re.match('.* setting system clock to (?P[0-9\-]*)[ A-Z](?P[0-9:]*) UTC.*', msg) + if(m): +- bt = datetime.strptime(m.group('t'), '%Y-%m-%d %H:%M:%S') ++ bt = datetime.strptime(m.group('d')+' '+m.group('t'), '%Y-%m-%d %H:%M:%S') + bt = bt - timedelta(seconds=int(ktime)) + data.boottime = bt.strftime('%Y-%m-%d_%H:%M:%S') + sysvals.stamp['time'] = bt.strftime('%B %d %Y, %I:%M:%S %p') +-- +2.22.0 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb index ea12e054d..a9f540ab8 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" SRCREV = "5be9a16547234cef5aca8bfaccd920490ea1cfa7" SRC_URI = "git://github.com/intel/pm-graph.git \ - file://0001-Makefile-fix-multilib-build-failure.patch" + file://0001-Makefile-fix-multilib-build-failure.patch \ + file://0001-bootgraph.py.patch \ +" S = "${WORKDIR}/git" COMPATIBLE_HOST='(i.86|x86_64).*' diff --git a/meta-openembedded/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb b/meta-openembedded/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb index 3f25e6f00..5f6588de5 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb @@ -20,6 +20,7 @@ SRC_URI += "\ file://COPYING \ " +PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "virtual/kernel" # This looks in S, so we better make sure there's -- cgit v1.2.3