diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-16 11:07:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-16 11:07:13 +0200 |
| commit | 5861b2783c0615345b80a93470312b36d1cb9907 (patch) | |
| tree | 42ded4821e0834063449a5620a1b46bc6f1e509b /package/kexec-tools | |
| parent | e3d296fa18ef060fad7e654cd9308e57ffd0934b (diff) | |
| parent | d8a75c17f7cb861b42f327afc9a9ec3901133d2c (diff) | |
fix conflict
Diffstat (limited to 'package/kexec-tools')
| -rw-r--r-- | package/kexec-tools/Makefile | 28 | ||||
| -rw-r--r-- | package/kexec-tools/patches/patch-kexec_kexec_c | 24 |
2 files changed, 52 insertions, 0 deletions
diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile new file mode 100644 index 000000000..d66da0ff3 --- /dev/null +++ b/package/kexec-tools/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= kexec-tools +PKG_VERSION:= 2.0.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= bc401cf3262b25ff7c9a51fc76c8ab91 +PKG_DESCR:= kexec tools +PKG_SECTION:= misc +PKG_DEPENDS:= zlib +PKG_BUILDEP:= zlib +PKG_URL:= http://kernel.org/pub/linux/utils/kernel/kexec/ +PKG_SITES:= http://kernel.org/pub/linux/utils/kernel/kexec/ + +PKG_CFLINE_KEXEC_TOOLS:= select ADK_KERNEL_KEXEC + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,KEXEC_TOOLS,kexec-tools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +kexec-tools-install: + $(INSTALL_DIR) $(IDIR_KEXEC_TOOLS)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/usr/sbin/kexec \ + $(IDIR_KEXEC_TOOLS)/usr/sbin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/kexec-tools/patches/patch-kexec_kexec_c b/package/kexec-tools/patches/patch-kexec_kexec_c new file mode 100644 index 000000000..68dc2bee9 --- /dev/null +++ b/package/kexec-tools/patches/patch-kexec_kexec_c @@ -0,0 +1,24 @@ +--- kexec-tools-2.0.2.orig/kexec/kexec.c 2010-07-29 06:19:59.000000000 +0200 ++++ kexec-tools-2.0.2/kexec/kexec.c 2011-09-05 18:50:27.679232756 +0200 +@@ -796,17 +796,14 @@ int k_unload (unsigned long kexec_flags) + static int my_shutdown(void) + { + char *args[] = { +- "shutdown", +- "-r", +- "now", ++ "reboot", ++ "-f", + NULL + }; + +- execv("/sbin/shutdown", args); +- execv("/etc/shutdown", args); +- execv("/bin/shutdown", args); ++ execv("/sbin/reboot", args); + +- perror("shutdown"); ++ perror("reboot"); + return -1; + } + |