From 245dd5ffc4094b060d8057318ba3563c4aed627c6d91745286dcab57fdf90631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Tue, 7 Jun 2022 09:18:54 +0000 Subject: [PATCH] Accepting request 973259 from home:dirkmueller:Factory - update to 2.0.24: * arm64: fix static data relocations in machine_apply_elf_rel() * kexec/elf: assign one to align if sh_addralign equals zero * arm64/crashdump-arm64: explicit type conversion to suppress compiler warning * arm64/kexec-arm64: add support for R_AARCH64_MOVW_UABS_G* rela * arm64/kexec-arm64: use enum to organize the reloc type * arm64/kexec-arm64: add support for R_AARCH64_LDST128_ABS_LO12_NC rela * kexec-tools: fix leak FILE pointer. * purgatory: do not enable vectorization automatically for purgatory compiling * kexec-tools: Determine if the image is lzma commpressed * util_lib/elf_info: harden parsing of printk buffer * github: run apt-get update before installing packages * kexec-xen: Allow xen_kexec_exec() to return in case of Live Update * kexec-tools: print error if kexec_file_load fails * kexec-tools: mips: Concatenate --reuse-cmdline and --append * kexec-tools: mips: Add some debug info * arm64: fix PAGE_OFFSET calc for flipped mm * arm64: read VA_BITS from kcore for 52-bits VA kernel * arm64/crashdump: unify routine to get page_offset * arm64: make phys_offset signed * s390: add support for --reuse-cmdline * use slurp_proc_file() in get_command_line() * add slurp_proc_file() * s390: use KEXEC_ALL_OPTIONS * s390: add variable command line size * arm64: support more than one crash kernel regions * s390: handle R_390_PLT32DBL reloc entries in machine_apply_elf_rel() * arm64/crashdump: deduce paddr of _text based on kernel code size - drop kexec-tools-print-error-if-kexec_file_load-fails.patch, kexec-tools-remove-duplicate-ramdisk-definition.patch (upstream) OBS-URL: https://build.opensuse.org/request/show/973259 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=143 --- kexec-tools-2.0.22.tar.xz | 3 - kexec-tools-2.0.24.tar.sign | Bin 0 -> 566 bytes kexec-tools-2.0.24.tar.xz | 3 + ...print-error-if-kexec_file_load-fails.patch | 36 --------- ...-remove-duplicate-ramdisk-definition.patch | 23 ------ kexec-tools.changes | 36 +++++++++ kexec-tools.keyring | 76 ++++++++++++++++++ kexec-tools.spec | 11 +-- 8 files changed, 121 insertions(+), 67 deletions(-) delete mode 100644 kexec-tools-2.0.22.tar.xz create mode 100644 kexec-tools-2.0.24.tar.sign create mode 100644 kexec-tools-2.0.24.tar.xz delete mode 100644 kexec-tools-print-error-if-kexec_file_load-fails.patch delete mode 100644 kexec-tools-remove-duplicate-ramdisk-definition.patch create mode 100644 kexec-tools.keyring diff --git a/kexec-tools-2.0.22.tar.xz b/kexec-tools-2.0.22.tar.xz deleted file mode 100644 index 00096c2..0000000 --- a/kexec-tools-2.0.22.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:96c97f49ed86049f8b72722cb53e7fe3693e5a4f31e78a3a6249e3d18dac49c2 -size 303564 diff --git a/kexec-tools-2.0.24.tar.sign b/kexec-tools-2.0.24.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..56c85325928eae6812b35e526069cc456667c3c325e52f92a6a66ca93f245d2d GIT binary patch literal 566 zcmV-60?GY}0y6{v0SW*e79j-UeA%J(tiu0G{&I!a&tz$8H&4C=0%B2ZVE_sV5ZBLS zX=*o5zMzi~0HnJ?{Dt?t>m)H-#~P2sf5-gp$z2xHvlqgc-+wQ6XpmlJ(sNG4!PA`? z2p=jr(UR?9I3$D+Vd%VmF7X-M36J%|l+=Hs0N~mW-$IiSvurPAxn0zsq3)!x;VxVK zjtxlpKUGI(YEB9a5gFP1n94g*({tnj>j6JSaluct37F|=HP#|Er*{JbYxVaklX=R~ zh${d%-mCJBS59(c#p}LJ-69f!8TIo^uZ-+VSvpp1r-`rL_M1ysJ72xqQ87=5Nw|k} zal~ao#FC2vWyfKJf2=frHoLZTNQ~0%_LzfIxKoUS)A0PS4x2qzU>h<+1}$xYQAX*u z*zB6DQ6b-cTdX0T-F<)6V$S0<0f)&|TE!G{c)Xi*;6p>>RsR%@7mP(7=t(xa^(#F`Ej4{9!P2w?Bvr>xhGR(blos!*=Xa=z#mA5Z z?Xeg;IVat6Lp4Z2YjSM`g3>%#T*0p81fV2)KNwf|jy1tG!c?#y_~(Aq;F&^}k1LFs z6`p=EwMA@?IF&{dkcpBV|zIbNg4ZkH>JIzZ2-|btDxmJRp0`!!MWgvpS~3d E0|Q -Date: Wed Mar 16 16:03:05 2022 +0530 -Subject: kexec-tools: print error if kexec_file_load fails -References: bsc#1197176 -Git-commit: 1d7a308bf7349fcf1627e950159029dfccf85891 -Upstream: merged - -Commit 4f77da634035 ("kexec-tools: Fix kexec_file_load(2) error -handling") introduced EFALLBACK for scenarios where fallbacking back -to kexec_load syscall is likely to work and dropped printing error -message for these scenarios. But printing error message for other -failure scenarios was inadvertently dropped. Restore printing error -message for such cases. - -Fixes: 4f77da634035 ("kexec-tools: Fix kexec_file_load(2) error handling") -Cc: Petr Tesarik -Reported-by: Nageswara R Sastry -Tested-by: Nageswara R Sastry -Signed-off-by: Hari Bathini -Reviewed-by: Petr Tesarik -Signed-off-by: Simon Horman - ---- - kexec/kexec.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/kexec/kexec.c -+++ b/kexec/kexec.c -@@ -1294,6 +1294,7 @@ static int do_kexec_file_load(int filein - case EMSGSIZE: - /* Reject by default. */ - default: -+ fprintf(stderr, "kexec_file_load failed: %s\n", strerror(errno)); - ret = EFAILED; - break; - diff --git a/kexec-tools-remove-duplicate-ramdisk-definition.patch b/kexec-tools-remove-duplicate-ramdisk-definition.patch deleted file mode 100644 index 80b77fc..0000000 --- a/kexec-tools-remove-duplicate-ramdisk-definition.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Petr Tesarik -Subject: Remove duplicate definition of ramdisk -Upstream: merged -Git-commit: 5e7ce27626a44428c01e0e5ab3fe60ef98ca788c - -The ramdisk variable is defined in kexec/arch/ppc/kexec-ppc.c. This -other definition is not needed and breaks build with -fno-common. - -Signed-off-by: Petr Tesarik ---- - kexec/arch/ppc/kexec-elf-ppc.c | 1 - - 1 file changed, 1 deletion(-) - ---- a/kexec/arch/ppc/kexec-elf-ppc.c -+++ b/kexec/arch/ppc/kexec-elf-ppc.c -@@ -33,7 +33,6 @@ - static const int probe_debug = 0; - - unsigned char reuse_initrd; --const char *ramdisk; - int create_flatten_tree(struct kexec_info *, unsigned char **, unsigned long *, - char *); - diff --git a/kexec-tools.changes b/kexec-tools.changes index e69aa4d..6afdf68 100644 --- a/kexec-tools.changes +++ b/kexec-tools.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Wed Apr 27 20:16:19 UTC 2022 - Dirk Müller + +- update to 2.0.24: + * arm64: fix static data relocations in machine_apply_elf_rel() + * kexec/elf: assign one to align if sh_addralign equals zero + * arm64/crashdump-arm64: explicit type conversion to suppress compiler warning + * arm64/kexec-arm64: add support for R_AARCH64_MOVW_UABS_G* rela + * arm64/kexec-arm64: use enum to organize the reloc type + * arm64/kexec-arm64: add support for R_AARCH64_LDST128_ABS_LO12_NC rela + * kexec-tools: fix leak FILE pointer. + * purgatory: do not enable vectorization automatically for purgatory compiling + * kexec-tools: Determine if the image is lzma commpressed + * util_lib/elf_info: harden parsing of printk buffer + * github: run apt-get update before installing packages + * kexec-xen: Allow xen_kexec_exec() to return in case of Live Update + * kexec-tools: print error if kexec_file_load fails + * kexec-tools: mips: Concatenate --reuse-cmdline and --append + * kexec-tools: mips: Add some debug info + * arm64: fix PAGE_OFFSET calc for flipped mm + * arm64: read VA_BITS from kcore for 52-bits VA kernel + * arm64/crashdump: unify routine to get page_offset + * arm64: make phys_offset signed + * s390: add support for --reuse-cmdline + * use slurp_proc_file() in get_command_line() + * add slurp_proc_file() + * s390: use KEXEC_ALL_OPTIONS + * s390: add variable command line size + * arm64: support more than one crash kernel regions + * s390: handle R_390_PLT32DBL reloc entries in machine_apply_elf_rel() + * arm64/crashdump: deduce paddr of _text based on kernel code size +- drop kexec-tools-print-error-if-kexec_file_load-fails.patch, + kexec-tools-remove-duplicate-ramdisk-definition.patch (upstream) +- add homepage url +- add gpg validation + ------------------------------------------------------------------- Wed Apr 13 07:10:02 UTC 2022 - Petr Tesařík diff --git a/kexec-tools.keyring b/kexec-tools.keyring new file mode 100644 index 0000000..f1de293 --- /dev/null +++ b/kexec-tools.keyring @@ -0,0 +1,76 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBE7S0JsBEAC2bQSzrFOJxmDJMEjB90vt5tbmio8ZcY1z+0JuL4evVP2V1Xke +3dJMHl8eYj0pv7Wj6rbqVRTSyOYkaRBmqHhNfvYJe79SJg0rm9WjcdboNxhPMPIS +MH9zMhs8V3UlbentImu+nNCdLFRAupaegAnvCMkEmBe3lQO5Syd8Xu6kOtMNSXRq +inANKBxS330PVK8QWbjzu8fdUx+Fz/0aCbsIujo6IY29Nt/DaSuw6Bpd/dlm6zh3 +jbeukJ/j0sAiLPareQB7ZGBez1M0M8tHqT8pew8GBV/vhd3oL3Bt32yMQsb40PA7 +BxCg5bAPUBIa0yJy9ARaOJIU6//FSlyl+cHfoaGw1kHDPG8Z4C/uRzkanqrHiN8G +Y52fDdIw7k6aoWvo40m1YbjmezpTWomA3ltZ23GEdUjsXeRWBRAz6C2hDwok4ofV +Yt7b1WY2i7MgYrcEXBx3ykk/rHQUsdX9YQ5CZOPNXWgQ2dKru8GGq4amTBFojyT9 +shJyInH+rVP51XR6tIL4iMESRUwtAeaEvSfgYi3DW2EvlAKEtL09HgTPKG383bma +CA1rHI0B/o9IJN6+llkMcjo7zoJOGA2NrYCjTCzk5yye5TuENjpQtnrueAFBrLWS +PbWAqa0TJIP21Ta15U+LQdyMYcMzx4STG6HIo1BU26HtZY1YgpXSVra53QARAQAB +tB9TaW1vbiBIb3JtYW4gPGhvcm1zQGRlYmlhbi5vcmc+iQI4BBMBAgAiBQJO0uFN +AhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRDXz2RpajdPvuWAD/94UGjy +HSEM3Rlf09Aq0bqIT/CYUYVe61Ktqfk+vBdvDeL+tAlt7WCjaIXkGDr5Kvx2lypR +KG7EIDTvX/bNWuHsFL0o0RNdLj+VdiFK8jaQ1ZdYYgg68mdLYWg5iEzWpOf2UI5X +X5NDSJYmWJhNoQAKQcrDaSiSl1KE0GRTbD9lwG6psitk/l8dz77dMuqwMoJ8s/rx +fg8Gtn2FzwD/k7ODXwksGiqJT4Zw6P3lAw29/ejGYIRzDb5lh3SqdKT/us393NAL +12DK1tkK7JeLi+yyzsHtDYDWhbM0qTjwdRohnMIQUdg+6sAOUldaOXRKvr9JNWKz +bTgj6EVUUakKvCYA2ppUWVjjUgLHKu6U3+qnBkA9AbgPfQf9RiBGJj3rC4g2GpTn +4bOIex4QWI+7S66hOyBWAoX9hqVK1kYefOt5k2xH97zFuZqPAbzsJqryES+PP8cV +1qCCxRrF8o+LTnLZpzUB3PP96J7CeSmzgcIjWBQwd0u+9xa00djcpq2F8YI3YnYK +gb0OZfN7xFvOEtXFWH868MBS1gdazSUNlLpjryx6OS5QHr0kc4hQGh7wEfNIHetS +tlBt7hSXiQVs/RDRYttW9ekilkYHhQKaCLQg/wvRDoazcbGpKLILbNYFO/tww5QH +s0PgX6t5hhrqSoype+61PbOKuxa1UGbkunRCDbQeU2ltb24gSG9ybWFuIDxzaW1v +bkBob3Jtcy5uZXQ+iQI4BBMBAgAiBQJO0uE8AhsDBgsJCAcDAgYVCAIJCgsEFgID +AQIeAQIXgAAKCRDXz2RpajdPvgM0D/wJofm/xCspUyDPUiRSuLjQvVwFlwnZURfA +SGUp45rlw+zKncPLguaBGAo18tTIy9rX5EO2y8R0oufVY2DhmopLNuEIDCdIEOyA +nP3sYgYqXmxxbADkHFMlLDtn07hUPuUoPNCFFZ9nytqe0hcVpeU7ZN/Qt2e9n8dn +pyVsw/eQwwyAlwW6wbqfFFJC969/BEWMMozVOLxM13XTvkMZprqI3QfFdd4NsSuh +Y7Jwp937D8nk+sT4VDpuVaMi62WkdGjbqTWxF0PCTEiCog2txWNzIo4PhWXQAgqH +bWveQA9117U9sMI2BWTKmjXbpl48WZayvSam7JPQ2h4DVvhOpwZrIrJ51GUAefn6 +zxJkPedTSro57HYUCIc6P3A2LaaF7+lt938H9eCy9s0Ju3yG7IQMKxH2+g1j/vCA +iKw1F+d8q8LbJKyPa7eg4zSh7OnCsWwCJQtYPCQWgu+OZaA+g4VulWMprv8UfHYd +AImRTMn9VvFK2HinUmfiR3o83NULGYTT/SC3+0TQ/WLtSr0BbgJ/Ibj1puzHhK9Q +A8wGuV9BEmnO3w7IxgJ0uGvgTxtZsM+IlNZKj38g8qHpE9V3AIgDHZQ8Yb8Bzfq+ +Q6g+V16a4tiN55RH//ab3mJY18UyX31mPqfxoAYNAVTlDcbxPUeGjhzMJgr7j7LW +sh6w+z0u0bQhU2ltb24gSG9ybWFuIDxob3Jtc0B2ZXJnZS5uZXQuYXU+iQI4BBMB +AgAiBQJO0tCbAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRDXz2RpajdP +vr0tD/9cwP7In2RC/7FQKR8oIHElLU9qXGQgzkknZaJKAp9+kiwVqyPlKlDrQ0qz +BnmiOtDK4c/WpBk8ze30iE7z26on6zKRk0g4uPrpjadvOgx2m+XYa9YvAMnIzsoz +DutdJjUM8Icb7Qk4iz0s1uS2eNyw/ee6WNn8jKXt/iKyDgffCs7qVqJ8bE5IkxH4 +IMGsFtcA2y04KY1iyQCaurppD9+3TLiFQlOJMjuiEsO8s6FdnwCixxII4XKA6CYa +VY3neX4Nnb4Mu42vCuSEiYQEe6Tpe+O8RGgfzAmMS5zFRKz0ZYCzFf/YfEM6aQmE +LnLjt1Ri2O+jddiqjTePVEu+2ATx0W2hr2dXH/ZhZvnv0F2V2c9l0ywEWSRW2njQ +lCzkT3J5YQ8CaHogXF/Osj6coCo9QgGRbPy3T4Akcs8XpNDIy8eDF177mp7jQo96 +Mm2446w0LHPnzumFr9P87CeuWymr/It//SMsfDN6HLh6MRI9aTA0ZirrQ/K7IBAA ++MvM5+pgHja425L4CmfjsJie2F/jwss93quFH1Dj3MUUlvQveez24Lf2hatm2t3e +t66bskEUuMiEi2GsvqoAtky86MNTywKM9krDX/Vald6874Nkf/4cgKCzTGYp2fBk +49dzjIUngnLHqLT134KWHuX+JBqttCdCw5lWpfx7CdYreAsAdbkCDQRO0tCbARAA +vdhCOjynQO6/+jtXrOap6CrE2tjvom5UFc291znL9XT4cpbnw3OxBrM62HgBOaBZ +0Kjzi/pyrZtnpM0lIx9wQVWhTVVeLb5LGP/PCe5TPOG3BFEokE1/DrL1vAvmJFhh +xA0KpvOPWB/YDpDVAXPfCNT28UWn1gPoAUl4+lQBxlRcZf7L+mzFqpei3z32vl1f +M7NZInnRZR67hdEBb2jo1MEAQNhCNfs7mC9ENkQhlsCwFDw/id7DNAOuKDNw3j/e +0fU/z+cL9mHuvK7nP4bUyU5micm3Q7PWse23dCueBxm4STB2Y+fnHijWh33h9a91 +HbFsAqyKxgo39dvuMqh4FNkfXgHCeZ/GszzpOws54eC8Sso1lM9B5ixjPvrh3jVw +5mF7cKPIdiojJ8vsWn0lK0Fv4yCc8cm8boZO5M89np7y2hE5SNUeZJ9NyQudbfGv +8yIBUPqQwEd1XdV8tjT+V24fc1MBe+ZM1m/a5W+/tf1QGBe0cJI9ncZhxrDmm5TD +aP7k8Nth2Mt05JKXpkIQVGUXp2oLiWT2cQQXjrVmcXOKWlPlI4YwXkrBfn4HoITB +24ppTwTtFIOlXzVa7WdfoCYBzy7hQ7mBxALRBbMAvh8yj9jZFEWc9GFHJodkPQ3Q +jBe/B7EoxX4o2AiyoeRnQ9lAAYDl0vEufxV9nI3pLlcAEQEAAYkCHwQYAQIACQUC +TtLQmwIbDAAKCRDXz2RpajdPviq1D/wJN+kmB5mqbMc3wScGqPOyIqWIBk06TPpD +uYpg3+c/AuIFfxM33v3S/N6pivzNnldd7CLQaEdqJfX/Au6insvpKAbXg9pHxwwV +OcskRSNQC9d4mFDESbYSI3HvZzOAEZQrrJRKuxH1KYX16YAWGrSVXmexr1tAucG0 +DXYgSkRzNEkxMmo1EOUBDa2ZnoKsbeaQ5kpLgKsTho3OU0FqJwpbIOmEM4kQb/i8 +irbGSqXOaS3ALZkWynoL0K2qKQG4RzaGPJtZCi6d+WP7503jge+/KjiY0xlwmR82 +3wq6xKUHn6xFwOYV5JYUQH77cNpqy8Pc0t0ikETc51g16KmpAIGFPHCoLvvxWIhk +fifhQEdQmr7arp43bxED6UhxPTpg1RLFKHmCiKIeEhQodnjHH/qIS+By4BcW0dwi +jMgl4O+A12uxGEX+OanBz0ER8pu+LdaTUPy0pHG3aK2b+kn15n3hKDpLHQlmEqNG +ZgI0GOmFfFizZuqUzlAnlCNHhCqCslCjIOgeCF4V73F8rYpAlLNdC44h8nw3JN6n +v2yqBbVxowLjYaz8gE4Hl5LyxndIbgRfjszow01l+Oa6XjVYix6j6UVlbooAcHiN +zi8b45Y1q9d2Bu+sKFFrQP2ADbSDjjPlmX2nhwuJLZ9F7mhkQ/n0aW+KBj0NQ1Rc +qsHVD2+G7g== +=h5iz +-----END PGP PUBLIC KEY BLOCK----- diff --git a/kexec-tools.spec b/kexec-tools.spec index e5457ad..282ab13 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -17,12 +17,15 @@ Name: kexec-tools -Version: 2.0.22 +Version: 2.0.24 Release: 0 Summary: Tools for loading replacement kernels into memory License: GPL-2.0-or-later Group: System/Kernel +URL: https://projects.horms.net/projects/kexec/ Source: https://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz +Source100: https://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.sign +Source101: kexec-tools.keyring Source1: kexec-bootloader Source2: kexec-bootloader.8 Source3: kexec-load.service @@ -30,8 +33,6 @@ Source4: %{name}-rpmlintrc Patch3: %{name}-disable-test.patch Patch4: %{name}-vmcoreinfo-in-xen.patch Patch10: %{name}-SYS_getrandom.patch -Patch11: %{name}-remove-duplicate-ramdisk-definition.patch -Patch12: %{name}-print-error-if-kexec_file_load-fails.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: systemd-rpm-macros @@ -63,7 +64,7 @@ export CFLAGS="%{optflags} -fPIC" export BUILD_CFLAGS="%{optflags}" export LDFLAGS="-pie" %configure -make %{?_smp_mflags} +%make_build %install %make_install @@ -102,7 +103,7 @@ ln -s %{_sbindir}/kexec %{buildroot}/sbin %else # filesystem before SLE12 SP3 lacks /usr/share/licenses %if 0%(test ! -d %{_defaultlicensedir} && echo 1) -%define _defaultlicensedir %_defaultdocdir +%define _defaultlicensedir %{_defaultdocdir} %endif %endif # End of compatibility cruft