recipes: Use BPN instead of PN in SRC_URIs
PATCH 1/14 recipes: Use BPN instead of PN in SRC_URIs
Makes it work for multilib case and fixes QA error
SRC_URI uses PN not BPN [src-uri-bad]
--- meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb | 2 +- meta-oe/recipes-devtools/geany/geany-plugins_1.34.bb | 4 ++-- meta-oe/recipes-extended/nana/nana_2.5.bb | 2 +- meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb | 2 +- meta-oe/recipes-support/uhubctl/uhubctl_2.0.0.bb | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb +1 -1
@@ -8,7 +8,7 @@ PR = "r1" PROVIDES = "virtual/libintl" SRC_URI = " \ - http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/${PN}-dev_${PV}_win32.zip \ + http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/${BPN}-dev_${PV}_win32.zip \ " SRC_URI[md5sum] = "aef407c2b97ee829383aadd867c61d1e" SRC_URI[sha256sum] = "291ac350cc5eb4a01b0d651ca99fae64cee8a1c06b2005277fab5a4356f9ae91"
meta-oe/recipes-devtools/geany/geany-plugins_1.34.bb +2 -2
@@ -29,7 +29,7 @@ inherit distro_features_check autotools pkgconfig gtk-icon-cache REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = " \ - http://plugins.geany.org/${PN}/${PN}-${PV}.tar.bz2 \ + http://plugins.geany.org/${BPN}/${BP}.tar.bz2 \ file://0001-Use-pkg-config-to-find-gpgme.patch \ " SRC_URI[md5sum] = "bf5fdd50727ad8bbbfe00027ccf2dac5"
@@ -40,7 +40,7 @@ do_configure_prepend() { } FILES_${PN} += "${datadir}/icons" -FILES_${PN}-dev += "${libdir}/geany/*.la ${libdir}/${PN}/*/*.la" +FILES_${PN}-dev += "${libdir}/geany/*.la ${libdir}/${BPN}/*/*.la" PLUGINS += "${PN}-addons" LIC_FILES_CHKSUM += "file://addons/COPYING;md5=4325afd396febcb659c36b49533135d4"
meta-oe/recipes-extended/nana/nana_2.5.bb +1 -1
@@ -4,7 +4,7 @@ checking (as in assert.h) and logging (printf style debugging) in \ GNU C and C++." SECTION = "Development/Languages/C and C++" -SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${BP}.tar.gz \ +SRC_URI = "http://download.savannah.gnu.org/releases/${BPN}/${BP}.tar.gz \ file://change-mandir-to-DESTDIR.patch \ file://modify-acinclude.m4-and-configure.in.patch \ "
meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb +1 -1
@@ -5,7 +5,7 @@ HOMEPAGE = "http://gtkwave.sourceforge.net/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" -SRC_URI = "http://gtkwave.sourceforge.net/${PN}-${PV}.tar.gz" +SRC_URI = "http://gtkwave.sourceforge.net/${BP}.tar.gz" SRC_URI[md5sum] = "eac3073ef381e0c09da33590296ca37f" SRC_URI[sha256sum] = "efa6bbbeb3bd54104425a69a2aa0d079bb5c3ecc1c420ba57dcaa1c97c5a22f6"
meta-oe/recipes-support/uhubctl/uhubctl_2.0.0.bb +1 -1
@@ -6,7 +6,7 @@ DEPENDS = "libusb1" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "https://github.com/mvp/${PN}/archive/v${PV}.tar.gz" +SRC_URI = "https://github.com/mvp/${BPN}/archive/v${PV}.tar.gz" SRC_URI[md5sum] = "5c711911d766d76813333c3812277574" SRC_URI[sha256sum] = "4c31278b2c03e5be5a696c3088bc86cf2557a70e00f697799c163aba18e3c40e"
Signature · 1 line
2.22.0
PATCH 2/14 cli11: Refresh patch to fix fuzz
Fixes
cli11-1.8.0+gitAUTOINC+13becaddb6: Patch log indicates that patches do not apply cleanly. [patch-fuzz]
--- .../cli11/files/0001-Add-CLANG_TIDY-check.patch | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
meta-oe/recipes-support/cli11/files/0001-Add-CLANG_TIDY-check.patch +5 -7
@@ -1,20 +1,21 @@ -From ef6310bc726a53ff6b45071633fa7b37224cae96 Mon Sep 17 00:00:00 2001 +From 902b251fd8d6408ee6623e7a92692948cf90187d Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Tue, 12 Feb 2019 13:22:21 -0800 Subject: [PATCH] Add CLANG_TIDY check Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> + --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 79404b8..f68217d 100644 +index 7073a0b..2dd2c02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -39,7 +39,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) - add_definitions(-Wall -Wextra -pedantic) +@@ -60,7 +60,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) + endif() endif() - if(CMAKE_VERSION VERSION_GREATER 3.6)
@@ -22,6 +23,3 @@ index 79404b8..f68217d 100644 # Add clang-tidy if available option(CLANG_TIDY_FIX "Perform fixes for Clang-Tidy" OFF) find_program( --- -2.20.1 -
Signature · 1 line
2.22.0
PATCH 3/14 sthttpd: Use git SRC_URI instead of github archive
In reply to Khem RajFixesSRC_URI uses unstable GitHub archives [src-uri-bad]
--- meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb +3 -5
@@ -6,18 +6,16 @@ LIC_FILES_CHKSUM = "file://src/thttpd.c;beginline=1;endline=26;md5=0c5762c2c34dc DEPENDS += "base-passwd virtual/crypt" -SRC_URI = "https://github.com/blueness/${BPN}/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz \ +SRCREV = "2845bf5bff2b820d2336c8c8061cbfc5f271e720" +SRC_URI = "git://github.com/blueness/${BPN} \ file://thttpd.service \ file://thttpd.conf \ file://init" -SRC_URI[md5sum] = "3cda1b6c8c8542b1510eadb8e540d8b6" -SRC_URI[sha256sum] = "a1ee2806432eaf5b5dd267a0523701f9f1fa00fefd499d5bec42165a41e05846" - UPSTREAM_CHECK_URI = "https://github.com/blueness/sthttpd/releases/" UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+).tar.gz" -S = "${WORKDIR}/sthttpd-${PV}" +S = "${WORKDIR}/git" inherit autotools update-rc.d systemd update-alternatives
Signature · 1 line
2.22.0
PATCH 4/14 arno-iptables-firewall: Switch to git fetcher
In reply to Khem Rajgithub archives are not reliable
Fixes
arno-iptables-firewall-2.0.3: https://github.com/arno-iptables-firewall/aif/archive/2.0.3.tar.gz: SRC_URI uses unstable GitHub archives [src-uri-bad]
--- .../arno-iptables-firewall/arno-iptables-firewall_2.0.3.bb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.0.3.bb +3 -4
@@ -4,11 +4,10 @@ HOMEPAGE = "http://rocky.eld.leidenuniv.nl/joomla/index.php?option=com_content&v LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://gpl_license.txt;md5=11c7b65c4a4acb9d5175f7e9bf99c403" -SRC_URI = "https://github.com/arno-iptables-firewall/aif/archive/${PV}.tar.gz" -SRC_URI[md5sum] = "71271c08299aacd45ceb9c9400082d03" -SRC_URI[sha256sum] = "e2c4fb88a25f0cae8308a3b2bb922b5e2f52f24d8309b24e15a527a6b326e703" +SRCREV = "ffcb86c30779df58ee057dfe9a3b078adccc1513" +SRC_URI = "git://github.com/arno-iptables-firewall/aif" -S = "${WORKDIR}/aif-${PV}" +S = "${WORKDIR}/git" inherit systemd
Signature · 1 line
2.22.0
PATCH 5/14 firewalld: Update to 0.6.3->0.6.4
In reply to Khem RajForward port patch to work with 0.6.4 and update the status
---
...a-separate-directory-outside-the-sou.patch | 19 +++++--------------
...{firewalld_0.6.3.bb => firewalld_0.6.4.bb} | 8 ++++----
2 files changed, 9 insertions(+), 18 deletions(-)
rename meta-networking/recipes-connectivity/firewalld/{firewalld_0.6.3.bb => firewalld_0.6.4.bb} (93%)meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch +5 -14
@@ -1,10 +1,8 @@ firewalld: fix building in a separate directory outside the source tree -Upstream-Status: Submitted [https://github.com/firewalld/firewalld/pull/456] +Upstream-Status: Accepted [https://github.com/firewalld/firewalld/pull/456] Signed-off-by: Dan Callaghan <[email protected]> -diff --git a/config/Makefile.am b/config/Makefile.am -index 7048d2ee..5270d408 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -377,11 +377,11 @@ install-config:
@@ -24,8 +22,6 @@ index 7048d2ee..5270d408 100644 uninstall-config: rmdir $(DESTDIR)$(sconfdir)/icmptypes -diff --git a/doc/xml/Makefile.am b/doc/xml/Makefile.am -index 8c93ab9c..d0313e3e 100644 --- a/doc/xml/Makefile.am +++ b/doc/xml/Makefile.am @@ -69,7 +69,8 @@ edit = sed \
@@ -38,25 +34,23 @@ index 8c93ab9c..d0313e3e 100644 transform-man.xsl: transform-man.xsl.in $(edit) $< >$@ -diff --git a/doc/xml/firewall-cmd.xml.in b/doc/xml/firewall-cmd.xml.in -index c2606553..24d77858 100644 --- a/doc/xml/firewall-cmd.xml.in +++ b/doc/xml/firewall-cmd.xml.in -@@ -1,9 +1,9 @@ +@@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -<!ENTITY authors SYSTEM "authors.xml"> -<!ENTITY seealso SYSTEM "seealso.xml"> -<!ENTITY notes SYSTEM "notes.xml"> +-<!ENTITY errorcodes SYSTEM "errorcodes.xml"> +<!ENTITY authors SYSTEM "@SRCDIR@/authors.xml"> +<!ENTITY seealso SYSTEM "@SRCDIR@/seealso.xml"> +<!ENTITY notes SYSTEM "@SRCDIR@/notes.xml"> - <!ENTITY errorcodes SYSTEM "errorcodes.xml"> ++<!ENTITY errorcodes SYSTEM "@SRCDIR@/errorcodes.xml"> ]> -diff --git a/doc/xml/firewalld.xml.in b/doc/xml/firewalld.xml.in -index de802059..3d319b04 100644 + <!-- --- a/doc/xml/firewalld.xml.in +++ b/doc/xml/firewalld.xml.in @@ -1,9 +1,9 @@
@@ -72,6 +66,3 @@ index de802059..3d319b04 100644 ]> <!-- --- -2.20.1 -
meta-networking/recipes-connectivity/firewalld/firewalld_0.6.4.bb renamed from meta-networking/recipes-connectivity/firewalld/firewalld_0.6.3.bb +4 -4
@@ -4,12 +4,12 @@ BUGTRACKER = "https://github.com/firewalld/firewalld/issues" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "https://github.com/firewalld/firewalld/archive/v${PV}.tar.gz \ - file://firewalld.init \ +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ file://0001-fix-building-in-a-separate-directory-outside-the-sou.patch \ + file://firewalld.init \ " -SRC_URI[md5sum] = "5ef954d9b6b244ffeabcd226be1867a0" -SRC_URI[sha256sum] = "039ad56ea6d6553aadf33243ea5b39802d73519e46a89c80c648b2bd1ec78aeb" +SRC_URI[md5sum] = "e63bdd65a4d2f6338f60b31e91bb5525" +SRC_URI[sha256sum] = "5a82a72fd9ad4cbbfb805bae615faa9b91a27855245de0fef3bcb06439394852" # glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 # xmlto-native is needed to populate /etc/xml/catalog.xml in the sysroot so that xsltproc finds the docbook xslt
Signature · 1 line
2.22.0
PATCH 6/14 python-matplotlib: Use git src_uri
In reply to Khem RajFixes
python-matplotlib-2.0.2: SRC_URI uses unstable GitHub archives [src-uri-bad]
--- .../recipes-devtools/python/python-matplotlib_2.0.2.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta-python/recipes-devtools/python/python-matplotlib_2.0.2.bb +4 -4
@@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://LICENSE/LICENSE;md5=afec61498aa5f0c45936687da9a53d74" DEPENDS += "python-numpy freetype libpng python-dateutil python-pytz" RDEPENDS_${PN} = "python-core python-distutils python-numpy freetype libpng python-dateutil python-pytz" -SRC_URI = "https://github.com/matplotlib/matplotlib/archive/v${PV}.tar.gz \ +SRCREV = "e175a41cb81880dbc553d9140e6ae5717457afa8" +SRC_URI = "git://github.com/matplotlib/matplotlib \ file://fix_setupext.patch \ " -SRC_URI[md5sum] = "89717c1ef3c6fdcd6fb1f3b597a4858c" -SRC_URI[sha256sum] = "aebed23921562792b68b8ca355de5abc176af4424f1987e2fa95f65e5c5e7e89" -S = "${WORKDIR}/matplotlib-${PV}" +S = "${WORKDIR}/git" + EXTRA_OECONF = "--disable-docs" inherit setuptools pkgconfig
Signature · 1 line
2.22.0
PATCH 7/14 mpv: Switch to using git fetcher
In reply to Khem Rajgithub tarballs are unreliable, fixes
SRC_URI uses unstable GitHub archives [src-uri-bad]
--- meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb +5 -4
@@ -14,15 +14,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=91f1cb870c1cc2d31351a4d2595441cb" # While this item does not require it, it depends on ffmpeg which does LICENSE_FLAGS = "commercial" +SRCREV_mpv = "4db82f04502cbcd20d9a975df9dfde91d8c389e3" SRC_URI = " \ - https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz;name=mpv \ - http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf;downloadfilename=waf;subdir=${BPN}-${PV} \ + git://github.com/mpv-player/mpv;name=mpv \ + http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf;downloadfilename=waf;subdir=git \ " -SRC_URI[mpv.md5sum] = "038d0b660de07ff645ad6a741704ecab" -SRC_URI[mpv.sha256sum] = "daf3ef358d5f260f2269f7caabce27f446c291457ec330077152127133b71b46" SRC_URI[waf.md5sum] = "cef4ee82206b1843db082d0b0506bf71" SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b" +S = "${WORKDIR}/git" + inherit waf pkgconfig pythonnative distro_features_check LUA ?= "lua"
Signature · 1 line
2.22.0
PATCH 8/14 x11vnc: Switch to git fetcher
In reply to Khem RajUsing github archives is not reliable, fixes SRC_URI uses unstable GitHub archives [src-uri-bad]
--- meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb +3 -4
@@ -7,13 +7,12 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://src/x11vnc.h;endline=31;md5=e871a2ad004776794b616822dcab6314" -SRC_URI = "https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz;downloadfilename=x11vnc-${PV}.tar.gz\ +SRCREV = "4ca006fed80410bd9b061a1519bd5d9366bb0bc8" +SRC_URI = "git://github.com/LibVNC/x11vnc \ file://starting-fix.patch \ file://0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch \ " - -SRC_URI[md5sum] = "64172e8f896389ec963fff93415f0d93" -SRC_URI[sha256sum] = "885e5b5f5f25eec6f9e4a1e8be3d0ac71a686331ee1cfb442dba391111bd32bd" +S = "${WORKDIR}/git" DEPENDS = "\ jpeg \
Signature · 1 line
2.22.0
PATCH 9/14 dumb-init: Switch to git fetcher
In reply to Khem Rajgithub archives are not reliable
---
.../dumb-init/{dumb-init_1.2.0.bb => dumb-init_1.2.2.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-oe/recipes-extended/dumb-init/{dumb-init_1.2.0.bb => dumb-init_1.2.2.bb} (63%)meta-oe/recipes-extended/dumb-init/dumb-init_1.2.2.bb renamed from meta-oe/recipes-extended/dumb-init/dumb-init_1.2.0.bb +3 -3
@@ -3,9 +3,9 @@ HOMEPAGE = "https://github.com/Yelp/dumb-init/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5940d39995ea6857d01b8227109c2e9c" -SRC_URI = "https://github.com/Yelp/dumb-init/archive/v${PV}.tar.gz" -SRC_URI[md5sum] = "4eb7f43d7823686723ff7ac1bad097cb" -SRC_URI[sha256sum] = "74486997321bd939cad2ee6af030f481d39751bc9aa0ece84ed55f864e309a3f" +SRCREV = "b1e978e486114797347deefcc03ab12629a13cc3" +SRC_URI = "git://github.com/Yelp/dumb-init" +S = "${WORKDIR}/git" EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS} ${LDFLAGS}'"
Signature · 1 line
2.22.0
PATCH 10/14 pam-plugin-ldapdb: Use git fetcher
In reply to Khem Rajgithub archives are not reliable
--- meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb +3 -4
@@ -10,11 +10,10 @@ DEPENDS = "libpam openldap" inherit distro_features_check REQUIRED_DISTRO_FEATURES = "pam" -SRC_URI = "https://github.com/rmbreak/pam_ldapdb/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz" -SRC_URI[md5sum] = "2dd4f1370fcfe995ee0ad09611109b87" -SRC_URI[sha256sum] = "8ed92b36523556bb5d9bf3eb33a1035e46041d4be767c8d62136930c0ca0e45b" +SRCREV = "84d7b260f1ae6857ae36e014c9a5968e8aa1cbe8" +SRC_URI = "git://github.com/rmbreak/pam_ldapdb" -S = "${WORKDIR}/pam_ldapdb-${PV}" +S = "${WORKDIR}/git" do_install () { oe_runmake install DESTDIR=${D} PAMDIR=${base_libdir}/security
Signature · 1 line
2.22.0
PATCH 11/14 libuv: Switch to using git fetcher
In reply to Khem Rajgithub archives are not reliable
--- meta-oe/recipes-connectivity/libuv/libuv_1.27.0.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta-oe/recipes-connectivity/libuv/libuv_1.27.0.bb +3 -3
@@ -4,9 +4,9 @@ BUGTRACKER = "https://github.com/libuv/libuv/issues" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" -SRC_URI = "https://github.com/libuv/libuv/archive/v${PV}.tar.gz" -SRC_URI[md5sum] = "cc2cf259442fbe85404e75691e8244e1" -SRC_URI[sha256sum] = "4afcdc84cd315b77c8e532e7b3fde43d536af0e2e835eafbd0e75518ed26dbed" +SRCREV = "a4fc9a66cc35256dbc4dcd67c910174f05b6daa6" +SRC_URI = "git://github.com/libuv/libuv" +S = "${WORKDIR}/git" inherit autotools
Signature · 1 line
2.22.0
PATCH 12/14 usbctl: Switch to git fetcher
In reply to Khem Rajgithub archives are not reliable
--- meta-oe/recipes-support/uhubctl/uhubctl_2.0.0.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta-oe/recipes-support/uhubctl/uhubctl_2.0.0.bb +3 -3
@@ -6,9 +6,9 @@ DEPENDS = "libusb1" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "https://github.com/mvp/${BPN}/archive/v${PV}.tar.gz" -SRC_URI[md5sum] = "5c711911d766d76813333c3812277574" -SRC_URI[sha256sum] = "4c31278b2c03e5be5a696c3088bc86cf2557a70e00f697799c163aba18e3c40e" +SRCREV = "6e05aee30e348ae2fd13ce8bfaa10f4f7d45d66f" +SRC_URI = "git://github.com/mvp/${BPN}" +S = "${WORKDIR}/git" # uhubctl gets its program version from "git describe". As we use the source # archive do reduce download size replace the call with our hardcoded version.
Signature · 1 line
2.22.0
PATCH 13/14 pmdk: Fix libdir which is multi-lib aware
In reply to Khem RajOE use 'lib' even on x86_64 when building with multilib support disabled and used 'lib64' with multilib
This fixes packaging errors e.g.
pmdk-1.6: pmdk: Files/directories were installed but not shipped in any package:
/usr/lib64/libpmem.so.1.0.0
/usr/lib64/libpmemblk.so.1.0.0
/usr/lib64/libpmemlog.so.1.0.0
/usr/lib64/libpmemobj.so.1.0.0
/usr/lib64/libvmem.so.1.0.0
....
--- meta-oe/recipes-extended/pmdk/pmdk_1.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-extended/pmdk/pmdk_1.6.bb +1 -1
@@ -26,7 +26,7 @@ inherit autotools-brokensep pkgconfig # | If you meant to cross compile, use `--host'. # # Also fix #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] -EXTRA_OEMAKE = "HOST_SYS='${HOST_SYS}' EXTRA_CFLAGS='${SELECTED_OPTIMIZATION}' LIB_PREFIX=lib64" +EXTRA_OEMAKE = "HOST_SYS='${HOST_SYS}' EXTRA_CFLAGS='${SELECTED_OPTIMIZATION}' LIB_PREFIX=${baselib}" # Fix the missing fts libs when using musl EXTRA_OEMAKE_append_libc-musl = " EXTRA_LIBS='-lfts'"
Signature · 1 line
2.22.0
PATCH 14/14 kexec-tools-klibc: Refresh patch with no code change
In reply to Khem RajFixes
kexec-tools-klibc-2.0.18+gitAUTOINC+5750980cdb: Patch log indicates that patches do not apply cleanly. [patch-fuzz]
--- .../0001-force-static-build.patch | 4 +- ...der-of-headers-to-fix-build-for-musl.patch | 2 +- .../0003-kexec-elf-rel-use-our-elf.h.patch | 6 +-- ...ec-elf-exec.c-replace-with-our-err.h.patch | 2 +- ...work-around-for-sysconf-_SC_NPROCESS.patch | 4 +- ...-work-around-missing-syscall-wrapper.patch | 13 ++---- ...007-kexec.c-add-guard-around-ENOTSUP.patch | 8 ++-- ...-kexec.c-replace-mising-BLKGETSIZE64.patch | 6 +-- ...-dmesg.c-work-around-missing-imaxdiv.patch | 4 +- ...-fs2dt.c-work-around-missing-getline.patch | 2 +- ...011-purgatory-Makefile-adapt-to-klcc.patch | 10 ++-- ...string.c-avoid-inclusion-of-string.h.patch | 5 +- ...256.h-avoid-inclusion-of-sys-types.h.patch | 5 +- .../0014-add-if_nameindex-from-musl.patch | 14 +++--- .../0015-vmcore-dmesg-fix-warning.patch | 10 ++-- .../140-mips_disable_devicetree_support.patch | 6 +-- .../arm64-crashdump-arm64.c-fix-warning.patch | 8 ++-- ...4.c-workaround-for-getrandom-syscall.patch | 11 ++--- ...c-image-header.h-add-missing-le64toh.patch | 7 +-- .../arm_crashdump-fix-buffer-align.patch | 10 ++-- .../kexec-tools-klibc/arm_crashdump.patch | 4 +- .../kexec/kexec-tools-klibc/kexec-x32.patch | 46 +++++++++++-------- .../kexec-tools-klibc/klibc-reboot.patch | 10 ++++ ...gatory-Makefile-remove-unknown-flags.patch | 9 ++-- ...powerpc_change-the-memory-size-limit.patch | 13 +++--- .../kexec-tools-klibc/x86_basename.patch | 4 +- .../kexec-tools-klibc/x86_kexec_test.patch | 4 +- .../kexec/kexec-tools-klibc/x86_sys_io.patch | 2 +- .../kexec/kexec-tools-klibc/x86_vfscanf.patch | 4 +- 29 files changed, 110 insertions(+), 123 deletions(-)
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0001-force-static-build.patch +2 -2
@@ -1,4 +1,4 @@ -From d6af515cfcc8185f423860f80ff28719975b701f Mon Sep 17 00:00:00 2001 +From 2a62d7623e3d4c0eaa44434ab678274fe3a9edb1 Mon Sep 17 00:00:00 2001 From: OpenEmbedded <oe.patch@oe> Date: Wed, 11 Apr 2018 22:51:00 +0200 Subject: [PATCH] force static build
@@ -11,7 +11,7 @@ Signed-off-by: Andrea Adami <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index 54c206f..79188d8 100644 +index fb01134..dbf1fb6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -47,7 +47,7 @@ TARGET_CFLAGS = @TARGET_CFLAGS@
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0002-Adjust-the-order-of-headers-to-fix-build-for-musl.patch +1 -1
@@ -1,4 +1,4 @@ -From 0976d2d5be1ed44c2324b609c7d16c1e93181c4b Mon Sep 17 00:00:00 2001 +From 6843cefb1d1d0017a714a2752bb008efd844f3e4 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 13 Jul 2017 16:20:08 -0700 Subject: [PATCH] Adjust the order of headers to fix build for musl
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0003-kexec-elf-rel-use-our-elf.h.patch +3 -3
@@ -1,4 +1,4 @@ -From 7f91875d65778154709e4fa0ccb23f3b2a98b0dc Mon Sep 17 00:00:00 2001 +From 7e202ea55e8dd803278d9d1eac7ffd355344d6be Mon Sep 17 00:00:00 2001 From: OpenEmbedded <oe.patch@oe> Date: Wed, 11 Apr 2018 22:51:00 +0200 Subject: [PATCH] kexec-elf-rel: use our elf.h
@@ -56,7 +56,7 @@ index 1acbd86..a60c66c 100644 #include "../../kexec-elf.h" diff --git a/kexec/arch/ppc64/kexec-elf-rel-ppc64.c b/kexec/arch/ppc64/kexec-elf-rel-ppc64.c -index 5f8e3f2..765bf6e 100644 +index 51b1354..c85f421 100644 --- a/kexec/arch/ppc64/kexec-elf-rel-ppc64.c +++ b/kexec/arch/ppc64/kexec-elf-rel-ppc64.c @@ -1,5 +1,5 @@
@@ -67,7 +67,7 @@ index 5f8e3f2..765bf6e 100644 #include "../../kexec.h" #include "../../kexec-elf.h" diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c -index 7fdde73..cd5d729 100644 +index db85b44..761a4ed 100644 --- a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c +++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c @@ -1,5 +1,5 @@
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0004-kexec-elf-exec.c-replace-with-our-err.h.patch +1 -1
@@ -1,4 +1,4 @@ -From 8b9da93ac9a4ea79ae953f80f6fe6e4f080341f2 Mon Sep 17 00:00:00 2001 +From 720e24029fca7dcd8e1cd0b556f37aa1dc2b8fe8 Mon Sep 17 00:00:00 2001 From: Andrea Adami <[email protected]> Date: Tue, 17 Apr 2018 10:57:23 +0200 Subject: [PATCH] kexec-elf-exec.c: replace with our elf.h
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0005-crashdump-elf.c-work-around-for-sysconf-_SC_NPROCESS.patch +2 -2
@@ -1,4 +1,4 @@ -From 1cfee75d9662c3382bb7cb8f1c952333837598ae Mon Sep 17 00:00:00 2001 +From 43fb9cec1749b337bfa252fc2c1b0288847e8fa7 Mon Sep 17 00:00:00 2001 From: Andrea Adami <[email protected]> Date: Wed, 18 Apr 2018 02:21:30 +0200 Subject: [PATCH] crashdump-elf.c: work around for _SC_NPROCESSORS_CONF
@@ -18,7 +18,7 @@ Upstream-Status: Inappropriate [klibc specific] Signed-off-by: Andrea Adami <[email protected]> --- - kexec/crashdump-elf.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++ + kexec/crashdump-elf.c | 92 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/kexec/crashdump-elf.c b/kexec/crashdump-elf.c
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0006-kexec-syscall.h-work-around-missing-syscall-wrapper.patch +5 -8
@@ -1,4 +1,4 @@ -From 45a80fe7d247898d83edfeabe32b9de80a50a6be Mon Sep 17 00:00:00 2001 +From ab24f236cbc0aa8a3eadde5d71d9d7ea1d979a51 Mon Sep 17 00:00:00 2001 From: Andrea Adami <[email protected]> Date: Fri, 31 Aug 2018 11:33:51 +0200 Subject: [PATCH] kexec-syscall.h: work around missing syscall() wrapper
@@ -16,10 +16,10 @@ Signed-off-by: Andrea Adami <[email protected]> 1 file changed, 21 insertions(+) diff --git a/kexec/kexec-syscall.h b/kexec/kexec-syscall.h -index 33638c2..204007d 100644 +index b96e02a..2a3794d 100644 --- a/kexec/kexec-syscall.h +++ b/kexec/kexec-syscall.h -@@ -74,11 +74,16 @@ +@@ -77,11 +77,16 @@ struct kexec_segment;
@@ -36,7 +36,7 @@ index 33638c2..204007d 100644 static inline int is_kexec_file_load_implemented(void) { if (__NR_kexec_file_load != 0xffffffff) -@@ -86,6 +91,21 @@ static inline int is_kexec_file_load_implemented(void) { +@@ -89,6 +94,21 @@ static inline int is_kexec_file_load_implemented(void) { return 0; }
@@ -58,7 +58,7 @@ index 33638c2..204007d 100644 static inline long kexec_file_load(int kernel_fd, int initrd_fd, unsigned long cmdline_len, const char *cmdline_ptr, unsigned long flags) -@@ -93,6 +113,7 @@ static inline long kexec_file_load(int kernel_fd, int initrd_fd, +@@ -96,6 +116,7 @@ static inline long kexec_file_load(int kernel_fd, int initrd_fd, return (long) syscall(__NR_kexec_file_load, kernel_fd, initrd_fd, cmdline_len, cmdline_ptr, flags); }
@@ -66,6 +66,3 @@ index 33638c2..204007d 100644 #define KEXEC_ON_CRASH 0x00000001 #define KEXEC_PRESERVE_CONTEXT 0x00000002 --- -2.7.4 -
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0007-kexec.c-add-guard-around-ENOTSUP.patch +4 -4
@@ -1,4 +1,4 @@ -From e6bd7a1bcfbd3e54efc81fbd7d60d915f9af0632 Mon Sep 17 00:00:00 2001 +From 17e9da8d3c3c69f84e11c0457bd9fb8c4ee4274b Mon Sep 17 00:00:00 2001 From: Andrea Adami <[email protected]> Date: Tue, 17 Apr 2018 11:35:14 +0200 Subject: [PATCH] kexec.c: add guard around ENOTSUP
@@ -16,10 +16,10 @@ Signed-off-by: Andrea Adami <[email protected]> 1 file changed, 2 insertions(+) diff --git a/kexec/kexec.c b/kexec/kexec.c -index 313d9fe..b5a8a1e 100644 +index 32ae56c..0764e85 100644 --- a/kexec/kexec.c +++ b/kexec/kexec.c -@@ -1501,6 +1501,7 @@ int main(int argc, char *argv[]) +@@ -1517,6 +1517,7 @@ int main(int argc, char *argv[]) */ case -EINVAL: case -ENOEXEC:
@@ -27,7 +27,7 @@ index 313d9fe..b5a8a1e 100644 /* * ENOTSUP can be unsupported image * type or unsupported PE signature -@@ -1513,6 +1514,7 @@ int main(int argc, char *argv[]) +@@ -1529,6 +1530,7 @@ int main(int argc, char *argv[]) * kernel bug */ case -ENOTSUP:
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0008-kexec.c-replace-mising-BLKGETSIZE64.patch +3 -3
@@ -1,4 +1,4 @@ -From 12c7b09c3152f2b3475d081691a26bd1a5633256 Mon Sep 17 00:00:00 2001 +From 30b61da180286643bea68b09b092744346011801 Mon Sep 17 00:00:00 2001 From: Andrea Adami <[email protected]> Date: Tue, 17 Apr 2018 11:38:42 +0200 Subject: [PATCH] kexec.c: replace missing BLKGETSIZE64
@@ -16,10 +16,10 @@ Signed-off-by: Andrea Adami <[email protected]> 1 file changed, 4 insertions(+) diff --git a/kexec/kexec.c b/kexec/kexec.c -index b5a8a1e..7842f8b 100644 +index 0764e85..157c577 100644 --- a/kexec/kexec.c +++ b/kexec/kexec.c -@@ -54,6 +54,10 @@ +@@ -55,6 +55,10 @@ #define KEXEC_LOADED_PATH "/sys/kernel/kexec_loaded" #define KEXEC_CRASH_LOADED_PATH "/sys/kernel/kexec_crash_loaded"
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0009-vmcore-dmesg.c-work-around-missing-imaxdiv.patch +2 -2
@@ -1,4 +1,4 @@ -From ad598a71ffff6f86462211f252ac0c7b5de53869 Mon Sep 17 00:00:00 2001 +From 20e2c61fc04a291250acee649c2523d2546cedea Mon Sep 17 00:00:00 2001 From: Andrea Adami <[email protected]> Date: Tue, 17 Apr 2018 13:14:12 +0200 Subject: [PATCH] vmcore-dmesg.c: work around missing imaxdiv()
@@ -18,7 +18,7 @@ Signed-off-by: Andrea Adami <[email protected]> 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/vmcore-dmesg/vmcore-dmesg.c b/vmcore-dmesg/vmcore-dmesg.c -index e340ef4..1b27b71 100644 +index 7972788..c63ac4f 100644 --- a/vmcore-dmesg/vmcore-dmesg.c +++ b/vmcore-dmesg/vmcore-dmesg.c @@ -575,8 +575,11 @@ static void dump_dmesg_structured(int fd)
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0010-fs2dt.c-work-around-missing-getline.patch +1 -1
@@ -1,4 +1,4 @@ -From edefda702d906d472ee7a675f6b506d5cfca7ac8 Mon Sep 17 00:00:00 2001 +From 14d4dbd293c75bc81a0dde6e678f9bbefb40b6f1 Mon Sep 17 00:00:00 2001 From: Andrea Adami <[email protected]> Date: Tue, 17 Apr 2018 13:48:25 +0200 Subject: [PATCH] fs2dt.c: work around missing getline()
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0011-purgatory-Makefile-adapt-to-klcc.patch +4 -6
@@ -1,16 +1,17 @@ -From 9b6866b106eb3ad11115bd591a23e65a68dd847d Mon Sep 17 00:00:00 2001 +From b6ebe05dc389b9457e3707401411fd075230b10e Mon Sep 17 00:00:00 2001 From: Andrea Adami <[email protected]> Date: Tue, 21 Aug 2018 16:31:44 +0200 -Subject: [PATCH 11/11] purgatory Makefile: adapt to klcc +Subject: [PATCH] purgatory Makefile: adapt to klcc Upstream-Status: Inappropriate [klibc specific] Signed-off-by: Andrea Adami <[email protected]> + --- purgatory/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/purgatory/Makefile b/purgatory/Makefile -index 49ce80a..72eefaa 100644 +index 49ce80a..1542b3a 100644 --- a/purgatory/Makefile +++ b/purgatory/Makefile @@ -47,7 +47,7 @@ purgatory/sha256.o: $(srcdir)/util_lib/sha256.c
@@ -33,6 +34,3 @@ index 49ce80a..72eefaa 100644 -Wl,-Map=$(PURGATORY_MAP) $(PURGATORY): $(PURGATORY_OBJS) --- -2.7.4 -
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0012-purgatory-string.c-avoid-inclusion-of-string.h.patch +1 -4
@@ -1,4 +1,4 @@ -From 2d2ad16f9328a7cbb3f5b8479ae93eb923a0727f Mon Sep 17 00:00:00 2001 +From 9bb386018257e1e18ffe0e925201946515b31080 Mon Sep 17 00:00:00 2001 From: Andrea Adami <[email protected]> Date: Thu, 19 Apr 2018 00:28:14 +0200 Subject: [PATCH] purgatory/string.c: avoid inclusion of string.h
@@ -26,6 +26,3 @@ index f06c460..c5e978a 100644 size_t strnlen(const char *s, size_t max) { --- -2.7.4 -
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0013-sha256.h-avoid-inclusion-of-sys-types.h.patch +1 -4
@@ -1,4 +1,4 @@ -From ec6000b9f287e62cb0746e26cfa4372c7ea528f4 Mon Sep 17 00:00:00 2001 +From 60098810e1c04be677794bff6a3935011af98934 Mon Sep 17 00:00:00 2001 From: Andrea Adami <[email protected]> Date: Thu, 19 Apr 2018 23:26:43 +0200 Subject: [PATCH] sha256.h: avoid inclusion of sys/types.h
@@ -31,6 +31,3 @@ index 467fb22..40fd3ed 100644 #include <stdint.h> typedef struct --- -2.7.4 -
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0014-add-if_nameindex-from-musl.patch +6 -8
@@ -1,7 +1,7 @@ -From b15e9610b4ab52c381e712241d50dea96d50d873 Mon Sep 17 00:00:00 2001 +From 04eec97b390621f2b3794b0d774b77429eb88cfd Mon Sep 17 00:00:00 2001 From: Andrea Adami <[email protected]> Date: Wed, 2 May 2018 23:14:19 +0200 -Subject: [PATCH 14/14] add if_nameindex from musl +Subject: [PATCH] add if_nameindex from musl Taken from musl, minimal changes. klibc lacks struct and func
@@ -20,10 +20,11 @@ to fix : #define __bitwise __bitwise__ Signed-off-by: Andrea Adami <[email protected]> + --- kexec/Makefile | 2 +- - kexec/if_nameindex.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - kexec/if_nameindex.h | 15 ++++++++++++ + kexec/if_nameindex.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ + kexec/if_nameindex.h | 15 +++++++++++ kexec/ifdown.c | 3 +++ 4 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 kexec/if_nameindex.c
@@ -114,7 +115,7 @@ index 0000000..e586e41 +} diff --git a/kexec/if_nameindex.h b/kexec/if_nameindex.h new file mode 100644 -index 0000000..1725fbd +index 0000000..cf1c061 --- /dev/null +++ b/kexec/if_nameindex.h @@ -0,0 +1,15 @@
@@ -147,6 +148,3 @@ index 82c6141..cc3ca9f 100644 /* * First, we find all shaper devices and down them. Then we --- -2.7.4 -
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/0015-vmcore-dmesg-fix-warning.patch +4 -6
@@ -1,17 +1,18 @@ -From 3294266c6a875c5009065c1ae5d0b86200c4147c Mon Sep 17 00:00:00 2001 +From a2679731a56748de58a4cf0a46b7a15d75543a88 Mon Sep 17 00:00:00 2001 From: Andrea Adami <[email protected]> Date: Sun, 29 Apr 2018 00:52:31 +0200 -Subject: [PATCH 6/6] vmcore-dmesg: fix warning +Subject: [PATCH] vmcore-dmesg: fix warning # define __bitwise Signed-off-by: Andrea Adami <[email protected]> + --- vmcore-dmesg/vmcore-dmesg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vmcore-dmesg/vmcore-dmesg.c b/vmcore-dmesg/vmcore-dmesg.c -index e340ef4..91e4789 100644 +index c63ac4f..a4e3014 100644 --- a/vmcore-dmesg/vmcore-dmesg.c +++ b/vmcore-dmesg/vmcore-dmesg.c @@ -2,6 +2,9 @@
@@ -24,6 +25,3 @@ index e340ef4..91e4789 100644 #include <endian.h> #include <byteswap.h> #include <stdio.h> --- -2.7.4 -
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/140-mips_disable_devicetree_support.patch +2 -4
@@ -1,4 +1,4 @@ -From 5ea7cd78cd252ffd3a9f3fbc8dc795d6e1596084 Mon Sep 17 00:00:00 2001 +From 7bd94a64cd5424e74ad49dbda65a15e83670268f Mon Sep 17 00:00:00 2001 From: Andrea Adami <[email protected]> Date: Mon, 17 Dec 2018 11:25:20 +0100 Subject: [PATCH] kexec-tools: fix non-device tree devices on mips
@@ -14,6 +14,7 @@ Removed ppc change (unwanted ?) Signed-off-by: Konstantin Kuzov <[email protected]> Signed-off-by: Andrea Adami <[email protected]> + --- kexec/arch/mips/include/arch/options.h | 4 +- kexec/arch/mips/kexec-elf-mips.c | 58 ++++++++++++++------------
@@ -158,6 +159,3 @@ index 222c815..90b21c3 100644 }; extern struct memory_ranges usablemem_rgns; --- -2.17.1 -
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64-crashdump-arm64.c-fix-warning.patch +3 -5
@@ -1,7 +1,7 @@ -From 6f69f489a442b3a192e4c08748ee8c4d31c75dae Mon Sep 17 00:00:00 2001 +From 3fd4db2ce1710f45eb297ae6b2c10726b33204f3 Mon Sep 17 00:00:00 2001 From: Andrea Adami <[email protected]> Date: Sun, 29 Apr 2018 00:46:16 +0200 -Subject: [PATCH 5/6] arm64: crashdump-arm64.c: fix warning +Subject: [PATCH] arm64: crashdump-arm64.c: fix warning from ../git/kexec/kexec.h:6, from ../git/kexec/arch/arm64/crashdump-arm64.c:18:
@@ -11,6 +11,7 @@ ng: "__bitwise" redefined # define __bitwise Signed-off-by: Andrea Adami <[email protected]> + --- kexec/arch/arm64/crashdump-arm64.c | 3 +++ 1 file changed, 3 insertions(+)
@@ -29,6 +30,3 @@ index 4fd7aa8..890d88f 100644 #include <linux/elf.h> #include "kexec.h" --- -2.7.4 -
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64_kexec-arm64.c-workaround-for-getrandom-syscall.patch +4 -7
@@ -1,4 +1,4 @@ -From 10afeecd10499fbd64b2c68d3b076c6906df441f Mon Sep 17 00:00:00 2001 +From a99fc685214452aedabf9ac105bb99357006aa26 Mon Sep 17 00:00:00 2001 From: Andrea Adami <[email protected]> Date: Wed, 5 Sep 2018 17:07:48 +0200 Subject: [PATCH] kexec-arm64.c: workaround for getrandom() syscall
@@ -15,15 +15,15 @@ and | ../git/kexec/arch/arm64/kexec-arm64.c:499:12: warning: implicit declaration of function 'getrandom'; did you mean 'srandom'? [-Wimplicit-function-declaration] | result = getrandom(&fdt_val64, - Upstream-Status: Inappropriate [klibc specific] Signed-off-by: Andrea Adami <[email protected]> + --- kexec/arch/arm64/kexec-arm64.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c -index 7a12479..8a7f5c5 100644 +index b143e86..88d4168 100644 --- a/kexec/arch/arm64/kexec-arm64.c +++ b/kexec/arch/arm64/kexec-arm64.c @@ -16,7 +16,11 @@
@@ -54,8 +54,5 @@ index 7a12479..8a7f5c5 100644 + GRND_NONBLOCK); +#endif if(result == -1) { - dbgprintf("%s: Reading random bytes failed.\n", + fprintf(stderr, "%s: Reading random bytes failed.\n", __func__); --- -2.7.4 -
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm64_kexec-image-header.h-add-missing-le64toh.patch +2 -5
@@ -1,7 +1,7 @@ -From af7d06a753a4c377b7ffe587da67a6ba56048bea Mon Sep 17 00:00:00 2001 +From c5e7928217ee73640d25c6471c4619601cb1ba19 Mon Sep 17 00:00:00 2001 From: Andrea Adami <[email protected]> Date: Thu, 19 Apr 2018 10:47:17 +0200 -Subject: [PATCH 2/2] kexec/arm64: image-header.h: add macro for le64toh +Subject: [PATCH] kexec/arm64: image-header.h: add macro for le64toh Fix
@@ -35,6 +35,3 @@ index 158d411..10ed2d6 100644 /** * struct arm64_image_header - arm64 kernel image header. * --- -2.7.4 -
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump-fix-buffer-align.patch +4 -6
@@ -1,15 +1,16 @@ -From 06b0d43c20f7c6200902d4c6db3d33416877f71c Mon Sep 17 00:00:00 2001 +From edf186f45d543e318400195cc25175387ff3f5c4 Mon Sep 17 00:00:00 2001 From: Andrea Adami <[email protected]> Date: Sun, 26 Aug 2018 21:40:06 +0200 -Subject: [PATCH 1/1] arm- backport from oe-core +Subject: [PATCH] arm- backport from oe-core Signed-off-by: Andrea Adami <[email protected]> + --- kexec/arch/arm/crashdump-arm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c -index 2530b29..af2600d 100644 +index daa4788..3f72b38 100644 --- a/kexec/arch/arm/crashdump-arm.c +++ b/kexec/arch/arm/crashdump-arm.c @@ -240,6 +240,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline)
@@ -39,6 +40,3 @@ index 2530b29..af2600d 100644 crash_kernel_mem.start, crash_kernel_mem.end, -1, 0); --- -2.7.4 -
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/arm_crashdump.patch +2 -2
@@ -1,4 +1,4 @@ -From 6dae4752a53973c152b3e91e8a4ca74a486dae8b Mon Sep 17 00:00:00 2001 +From 8ee92bc915d650e188caaa3df0a798ac2002f64e Mon Sep 17 00:00:00 2001 From: OpenEmbedded <oe.patch@oe> Date: Wed, 11 Apr 2018 22:51:00 +0200 Subject: [PATCH] use our elf.h header
@@ -17,7 +17,7 @@ Signed-off-by: Andrea Adami <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c -index daa4788..2530b29 100644 +index 3f72b38..af2600d 100644 --- a/kexec/arch/arm/crashdump-arm.c +++ b/kexec/arch/arm/crashdump-arm.c @@ -21,7 +21,7 @@
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/kexec-x32.patch +26 -20
73 lines not on this page · raw message
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/klibc-reboot.patch +10 -0
@@ -1,3 +1,13 @@ +From 9c99b0748dd0ea1aaf3836378ee75fa5af099a19 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 15 Mar 2019 00:22:40 -0700 + +--- + kexec/kexec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kexec/kexec.c b/kexec/kexec.c +index 157c577..5da0d67 100644 --- a/kexec/kexec.c +++ b/kexec/kexec.c @@ -901,7 +901,7 @@ static int my_exec(void)
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/powerpc-purgatory-Makefile-remove-unknown-flags.patch +3 -6
@@ -1,8 +1,7 @@ -From 709dfe457c07aa0275f3da14634cbce5cf1029dc Mon Sep 17 00:00:00 2001 +From 3683b3f3e318fa711f6018f154d950c51d5b597a Mon Sep 17 00:00:00 2001 From: Andrea Adami <[email protected]> Date: Thu, 19 Apr 2018 19:26:53 +0200 -Subject: [PATCH 3/3] powerpc/purgatory: Makefile: remove unknown flags for - powerpc +Subject: [PATCH] powerpc/purgatory: Makefile: remove unknown flags for powerpc Fix
@@ -12,6 +11,7 @@ Fix Upstream-Status: Inappropriate [klibc specific] Signed-off-by: Andrea Adami <[email protected]> + --- purgatory/arch/ppc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -29,6 +29,3 @@ index c85c58a..cd44a16 100644 dist += purgatory/arch/ppc/Makefile $(ppc_PURGATORY_SRCS) \ purgatory/arch/ppc/purgatory-ppc.h purgatory/arch/ppc/ppc_asm.h --- -2.7.4 -
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/powerpc_change-the-memory-size-limit.patch +7 -6
@@ -1,4 +1,4 @@ -From b19b68eab567aa534cf8dec79fe18e3dc0e14043 Mon Sep 17 00:00:00 2001 +From 6fec72bd7264478c214169b0f30f649304bd39ea Mon Sep 17 00:00:00 2001 From: Quanyang Wang <[email protected]> Date: Tue, 16 Jun 2015 12:59:57 +0800 Subject: [PATCH] powerpc: change the memory size limit
@@ -16,15 +16,16 @@ locate_hole failed Upstream-Status: Pending Signed-off-by: Quanyang Wang <[email protected]> + --- kexec/arch/ppc/kexec-ppc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: kexec-tools-2.0.10/kexec/arch/ppc/kexec-ppc.h -=================================================================== ---- kexec-tools-2.0.10.orig/kexec/arch/ppc/kexec-ppc.h -+++ kexec-tools-2.0.10/kexec/arch/ppc/kexec-ppc.h -@@ -42,7 +42,7 @@ void dol_ppc_usage(void); +diff --git a/kexec/arch/ppc/kexec-ppc.h b/kexec/arch/ppc/kexec-ppc.h +index 04e728e..6bae9ec 100644 +--- a/kexec/arch/ppc/kexec-ppc.h ++++ b/kexec/arch/ppc/kexec-ppc.h +@@ -44,7 +44,7 @@ void dol_ppc_usage(void); * During inital setup the kernel does not map the whole memory but a part of * it. On Book-E that is 64MiB, 601 24MiB or 256MiB (if possible). */
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_basename.patch +2 -2
@@ -1,4 +1,4 @@ -From 5f47c30759684cea9a7a409646686c1a358b78ac Mon Sep 17 00:00:00 2001 +From 7823956149c78e1996c567d1965803456df090f8 Mon Sep 17 00:00:00 2001 From: OpenEmbedded <oe.patch@oe> Date: Wed, 11 Apr 2018 22:51:05 +0200 Subject: [PATCH] replace basename() with sscanf()
@@ -13,7 +13,7 @@ Signed-off-by: Andrea Adami <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c -index 6c7d260..7850083 100644 +index 6cda12c..5514c1c 100644 --- a/kexec/arch/i386/x86-linux-setup.c +++ b/kexec/arch/i386/x86-linux-setup.c @@ -304,9 +304,9 @@ static int add_edd_entry(struct x86_linux_param_header *real_mode,
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_kexec_test.patch +2 -2
@@ -1,4 +1,4 @@ -From 9de68ec5af8db2eff352f12da28145fe5e96244d Mon Sep 17 00:00:00 2001 +From e26fe77b0ac9acc2c8086586d267aa7160969d2d Mon Sep 17 00:00:00 2001 From: OpenEmbedded <oe.patch@oe> Date: Wed, 11 Apr 2018 22:51:05 +0200 Subject: [PATCH] do not build test
@@ -14,7 +14,7 @@ Signed-off-by: Andrea Adami <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index fb01134..440730d 100644 +index dbf1fb6..440730d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -173,8 +173,8 @@ PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s))
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_sys_io.patch +1 -1
@@ -1,4 +1,4 @@ -From a992ee014efacdc98d5658be9930dcab0eaadfd7 Mon Sep 17 00:00:00 2001 +From 444160260a11022ecd84cd605fe8c22b316e6546 Mon Sep 17 00:00:00 2001 From: OpenEmbedded <oe.patch@oe> Date: Wed, 11 Apr 2018 22:51:04 +0200 Subject: [PATCH] i386: replace with our io.h
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/x86_vfscanf.patch +2 -2
@@ -1,4 +1,4 @@ -From 423c3f6f41fe04f4512e2a97a130f072d53dd4cf Mon Sep 17 00:00:00 2001 +From c6934455ec2337e6da7ea9fbc3486ce9beeb5d82 Mon Sep 17 00:00:00 2001 From: OpenEmbedded <oe.patch@oe> Date: Wed, 11 Apr 2018 22:51:05 +0200 Subject: [PATCH] x86-linux-setup.c: replace vfscanf() with vsscanf()
@@ -13,7 +13,7 @@ Signed-off-by: Andrea Adami <[email protected]> 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c -index 7850083..e190356 100644 +index 5514c1c..bdb28c6 100644 --- a/kexec/arch/i386/x86-linux-setup.c +++ b/kexec/arch/i386/x86-linux-setup.c @@ -200,6 +200,8 @@ static int file_scanf(const char *dir, const char *file, const char *scanf_line,
Signature · 1 line
2.22.0
Re: [meta-initramfs][PATCH 14/14] kexec-tools-klibc: Refresh patch with no code change
Quoted 5 lines · Khem Raj
Fixes
kexec-tools-klibc-2.0.18+gitAUTOINC+5750980cdb: Patch log indicates that patches do not apply cleanly. [patch-fuzz]Signed-off-by Khem Raj <[email protected]>
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Thank you Khem.
I hope to find time to catch-up with next kexec-tools 2.0.20. (Klibc recipe itself would need more love now that upstream is active again) Cheers