commit: 2523c776dec70262b178dffb75443a2093d019fa
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sun Jan 8 01:13:49 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sun Jan 8 01:13:49 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=2523c776
sys-apps/kexec-tools: Version bump to 2.0.13-r1
sys-apps/kexec-tools/Manifest | 4 ++--
.../files/{kexec.init-2.0.12 => kexec.init-2.0.13-r1} | 16 ++++++++++++++--
...-tools-2.0.13.ebuild => kexec-tools-2.0.13-r1.ebuild} | 4 ++--
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 86a038f..f268ada 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -5,8 +5,8 @@ AUX kexec-tools-2.0.4-out-of-source.patch 816 SHA256
f86f053efcd210f7919f458a527
AUX kexec-tools-2.0.9-gnu-source.patch 455 SHA256
08b5bc5b838389d8299a331c6f61ba63fc6705e7169e95c323b325ab45855dbf SHA512
8f860517a1bae52128648b551ad71306edeefd302b7442761181777ef951163af1b189a16bf507cba9879bf318e3de6973500d9bd799e504c81af7862ac23c34
WHIRLPOOL
00bcc8a5949d6cd9a2b8db0c04164d2a6ce79939525df93860b306fab45dce7146d23cf3f5ca04e73f4824a8d1db1f9346d77b601dc2bb127a116c3dbb0d57e9
AUX kexec.conf 340 SHA256
19d6a02cf0bf3cebf03dc81c3b9fd5f517815ab1060f67cb9019b7e9653a7fc0 SHA512
66beb57ee13dba70f75f12326643270a0c888e178fdfca8ba7a566a874707aebe2afebb6ceae976dfb0aaf3135048daad6277e70580e4c7911b9ddbf74e4f00a
WHIRLPOOL
b77bb59ab16ea67690fa3e551995510b0fb0d82f7e2f10f9ed7d7815eb1e498cdda9ea667d2648b62cd1ae86a3ab67ae2ca1abd1fd2b9fce376b64ac41fb8725
AUX kexec.conf-2.0.4 1013 SHA256
4c1b7e4651cd4be342db48389bc560589c896004f0274f8aba35a92fcd790531 SHA512
96db2834454aa4d038061e9b1f918932da3d3054021487425d0f70c6ad32096b9433ae2f3921e83196b23af901c32e591df3d6a84a6d14e064608d8ad895a599
WHIRLPOOL
3041644bf1688ac6c89e6078adcee987913bce124ea3ae4a2ce342c0956f319cccae93aabf39ee4aed9f23812e575f7f06cbf110bf39d9d961a1a19294108f27
-AUX kexec.init-2.0.12 3368 SHA256
6ca160cf3a8120f6bd609c2ac784a50e0314c0d7030c253929cfb7490bea7966 SHA512
18718ac27ca564e3995c0a43d3ae9cd46148cb3b83048ef132bf35f2480c6bf5487c6cb8ae36f720dc2dbc56de0292e13648001392ee539448dd01fa3b1fb9d0
WHIRLPOOL
2ee9b196f61cd937def36cb8284003e4f3a6b01bb0a127587a64ffa814d2e51bc852048705d510b90158a3a0d3aa7948afaf92dfe1397db5bdf73b27317c7dbe
+AUX kexec.init-2.0.13-r1 3664 SHA256
586ed7bdd519c6159af9327e9761324f861cb0b0e3cf3f4a490c7768f9e90a3b SHA512
ee144155e13993ae9d394e3194df1e53c7bb245c5825f4c90284452124e652e8d10b43e400a62cd3c48721c8ecb80e718da822a90b28ef04fbda3dd9e5113803
WHIRLPOOL
91ae3d7ec985c19ec56b07800c5b1abdd020dfb6615bb3e0d0875c966bd2fb5e2a7a5235b5f204d3da097e12d5417a72268c8234c9ec623e8bfba4fabf00a895
AUX kexec.service 407 SHA256
d95610609301d46e0f67efd78653beabd7dd253d2bf00f5736de5cdfbf2ea94e SHA512
9f0fa6d39c67048fe774fee0f2e8ed10e9e12a2468e7dda193cd8c5bd8b4cf49819d14703efad35c91265cd4e03c6f5460934b5fe92efd06eab8dc619920b1e3
WHIRLPOOL
9a412481d729e7ec7cec3a4142f2159337d61baf22431e4129f1e7798bf2683f1802e51edc92800e6b42b8b9b01cd83ef51f67cbc1cb7a4b209f923f3180948f
DIST kexec-tools-2.0.13.tar.xz 276824 SHA256
874baf421171dbfca0084af2da71ccf5a67749dd2a27c3023da5f72460bae5cc SHA512
19ff83eb25f492de5d87c0d5c3df9189ec5af225c3343ae61ae595fcb02638c0d7b8474edfa569c46e7203ae68e6c358db929a7dcfbf908518a00d6b5a597081
WHIRLPOOL
9281a2141892972657a02d6374dfa42474ce7c83955d9d54a1fd50456c34b8b2018aa3ab179a393e365c7ed2bfd43b2a94d3397e2bb09e25e9751eb19eace4e7
-EBUILD kexec-tools-2.0.13.ebuild 1743 SHA256
3dd9479307a25d2b434b84683e6f5cec16172701b64bbe1e60ff12d67b980365 SHA512
5da831105989f9d1cebcff20a755ef1de137c1bb81ee4d49cff42d0a46eda91cd90e5ca3daf6c4e0208e986821a60e029c5866fa9d0761a0a3309af90d9fcd03
WHIRLPOOL
197581a330d574a71e25495ac5b4fc6961cd6d44635157c63e38639912482d31a2a94dc351b5e32834001ed313b67feee3377660bbe7d393b8565cabb399ff04
+EBUILD kexec-tools-2.0.13-r1.ebuild 1746 SHA256
ce993e7e7debafa790e9134db1718da7291a95a3b849a14d6bae4f70ab9101fb SHA512
bcc162b4215498599121aa0c3a004460dd6adf1a44bbe35157026e3801790c374c27be5ef11326a7440a30298fbf2dd458667f07420ca2f6833285a563e2ec51
WHIRLPOOL
6c45ad5f58e20ad708980b2ae9891d3dbbb458d6b363513f6b0fcf2145999b5fb0043339384b3affbe34b2953b2f8b9c1efdfd00d0a6bfb437c8cbac48580fa9
MISC metadata.xml 490 SHA256
7c27519c83a0610e3e576265116392d298620be323c61a45a7634f29714cf265 SHA512
6f4b25178cc6b8ff3fea664f2717eb7268d9e71c4ca46c170887eb836f9d78dff7e64067968175d018dc22bbcc2bb8cd6fd5f44edba0966fa568f9fd827a1cff
WHIRLPOOL
45f2c1810f7717b0845b2003fea19be5cf9df3f3f2de22a686be9b961a6ebdcdad45cf12097b26b569dadf9a0e7300dcc735b9a4b0b64458f915a88fa8344c58
diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.12
b/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1
similarity index 89%
rename from sys-apps/kexec-tools/files/kexec.init-2.0.12
rename to sys-apps/kexec-tools/files/kexec.init-2.0.13-r1
index 87863b3..1f18f67 100755
--- a/sys-apps/kexec-tools/files/kexec.init-2.0.12
+++ b/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -20,6 +20,14 @@ auto_prefix_bootpath() {
esac
}
+get_genkernel_arch() {
+ case $1 in
+ x86_64) echo "amd64" ;;
+ i[3456]86) echo "x86" ;;
+ *) echo "$1" ;;
+ esac
+}
+
image_path() {
# Do no sanity checking if the user has set a value.
if [ -n "${KNAME}" ]; then
@@ -27,13 +35,15 @@ image_path() {
return
fi
- local x kver="$(uname -r)" karch="$(uname -m)"
+ local x kver="$(uname -r)" karch="$(uname -m)"
+ local gkarch="$(get_genkernel_arch $karch)"
for x in \
"bzImage" \
"vmlinuz" \
"bzImage-${kver}" \
"vmlinuz-${kver}" \
"kernel-genkernel-${karch}-${kver}" \
+ "kernel-genkernel-${gkarch}-${kver}" \
"kernel-${kver}" \
"kernel-${karch}"; do
if [ -e "${BOOTPART}/${x}" ]; then
@@ -53,6 +63,7 @@ initrd_path() {
fi
local x kver="$(uname -r)" karch="$(uname -m)"
+ local gkarch="$(get_genkernel_arch $karch)"
for x in \
"initrd" \
"initrd.img-${kver}" \
@@ -60,6 +71,7 @@ initrd_path() {
"initrd-${kver}" \
"initramfs-${kver}.img" \
"initramfs-genkernel-${karch}-${kver}"; do
+ "initramfs-genkernel-${gkarch}-${kver}"; do
if [ -e "${BOOTPART}/${x}" ]; then
echo "${BOOTPART}/${x}"
return 0
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.13.ebuild
b/sys-apps/kexec-tools/kexec-tools-2.0.13-r1.ebuild
similarity index 94%
rename from sys-apps/kexec-tools/kexec-tools-2.0.13.ebuild
rename to sys-apps/kexec-tools/kexec-tools-2.0.13-r1.ebuild
index 8f28a67..f52057f 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.13.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -57,7 +57,7 @@ src_install() {
dodoc "${FILESDIR}"/README.Gentoo
- newinitd "${FILESDIR}"/kexec.init-2.0.12 kexec
+ newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec
newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
insinto /etc
