From 0219e9fd2fdb945dcaa6e24c7ce3e07d269d9ecc Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Sun, 21 Jun 2009 00:25:46 +0200
Subject: kexec-tools: rename static recipes built against klibc

---
 .../initramfs-module-kexecboot_1.0.bb              |  2 +-
 recipes/kexec/kexec-tools-klibc-static_1.101.bb    | 22 ++++++++++++++++++++
 recipes/kexec/kexec-tools-klibc-static_2.0.0.bb    | 24 ++++++++++++++++++++++
 recipes/kexec/kexec-tools-static_1.101.bb          | 23 ---------------------
 recipes/kexec/kexec-tools-static_2.0.0.bb          | 24 ----------------------
 recipes/kexecboot/kexecboot.inc                    |  2 +-
 6 files changed, 48 insertions(+), 49 deletions(-)
 create mode 100644 recipes/kexec/kexec-tools-klibc-static_1.101.bb
 create mode 100644 recipes/kexec/kexec-tools-klibc-static_2.0.0.bb
 delete mode 100644 recipes/kexec/kexec-tools-static_1.101.bb
 delete mode 100644 recipes/kexec/kexec-tools-static_2.0.0.bb

diff --git a/recipes/initrdscripts/initramfs-module-kexecboot_1.0.bb b/recipes/initrdscripts/initramfs-module-kexecboot_1.0.bb
index 3080269920..7f1e7cd5f9 100644
--- a/recipes/initrdscripts/initramfs-module-kexecboot_1.0.bb
+++ b/recipes/initrdscripts/initramfs-module-kexecboot_1.0.bb
@@ -1,7 +1,7 @@
 SRC_URI = "file://87-kexecboot.sh"
 PR = "r2"
 DESCRIPTION = "An initramfs module for kexecing kernel from rootfs."
-RDEPENDS = "initramfs-uniboot kexec-static"
+RDEPENDS = "initramfs-uniboot kexec-klibc-static"
 
 do_install() {
 	install -d ${D}/initrd.d
diff --git a/recipes/kexec/kexec-tools-klibc-static_1.101.bb b/recipes/kexec/kexec-tools-klibc-static_1.101.bb
new file mode 100644
index 0000000000..4ad59ce257
--- /dev/null
+++ b/recipes/kexec/kexec-tools-klibc-static_1.101.bb
@@ -0,0 +1,22 @@
+# the binaries are statical linked against klibc
+require kexec-tools.inc
+
+PR = "r5"
+DEPENDS = "klibc"
+
+SRC_URI += "file://kexec-klibc.patch;patch=1"
+S = "${WORKDIR}/kexec-tools-${PV}"
+
+EXTRA_OECONF = " --without-zlib"
+
+export CC=${TARGET_PREFIX}klcc
+
+# standart oe cflags don't work with klcc
+export CFLAGS=""
+export CPPFLAGS=""
+export LDFLAGS=""
+
+PACKAGES =+ "kexec-klibc-static kdump-klibc-static"
+
+FILES_kexec-klibc-static = "${sbindir}/kexec"
+FILES_kdump-klibc-static = "${sbindir}/kdump"
diff --git a/recipes/kexec/kexec-tools-klibc-static_2.0.0.bb b/recipes/kexec/kexec-tools-klibc-static_2.0.0.bb
new file mode 100644
index 0000000000..da12db185b
--- /dev/null
+++ b/recipes/kexec/kexec-tools-klibc-static_2.0.0.bb
@@ -0,0 +1,24 @@
+# the binaries are statical linked against klibc
+require kexec-tools2.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+PR = "r0"
+DEPENDS = "klibc"
+
+SRC_URI += "file://kexec2-klibc.patch;patch=1"
+S = "${WORKDIR}/kexec-tools-${PV}"
+
+EXTRA_OECONF = " --without-zlib"
+
+export CC=${TARGET_PREFIX}klcc
+
+# standart oe cflags don't work with klcc
+export CFLAGS=""
+export CPPFLAGS=""
+export LDFLAGS=""
+
+PACKAGES =+ "kexec-klibc-static kdump-klibc-static"
+
+FILES_kexec-klibc-static = "${sbindir}/kexec"
+FILES_kdump-klibc-static = "${sbindir}/kdump"
diff --git a/recipes/kexec/kexec-tools-static_1.101.bb b/recipes/kexec/kexec-tools-static_1.101.bb
deleted file mode 100644
index ea44b57cf1..0000000000
--- a/recipes/kexec/kexec-tools-static_1.101.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-# the binaries are statical linked against klibc
-require kexec-tools.inc
-
-PR = "r5"
-DEPENDS = "klibc"
-
-SRC_URI += "file://kexec-klibc.patch;patch=1"
-S = "${WORKDIR}/kexec-tools-${PV}"
-
-EXTRA_OECONF = " --without-zlib"
-
-export CC=${TARGET_PREFIX}klcc
-
-# standart oe cflags don't work with klcc
-export CFLAGS=""
-export CPPFLAGS=""
-export LDFLAGS=""
-
-PACKAGES =+ "kexec-static kdump-static"
-
-FILES_kexec-static = "${sbindir}/kexec"
-FILES_kdump-static = "${sbindir}/kdump"
-
diff --git a/recipes/kexec/kexec-tools-static_2.0.0.bb b/recipes/kexec/kexec-tools-static_2.0.0.bb
deleted file mode 100644
index a0d02aa9ac..0000000000
--- a/recipes/kexec/kexec-tools-static_2.0.0.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-# the binaries are statical linked against klibc
-require kexec-tools2.inc
-
-DEFAULT_PREFERENCE = "-1"
-
-PR = "r0"
-DEPENDS = "klibc"
-
-SRC_URI += "file://kexec2-klibc.patch;patch=1"
-S = "${WORKDIR}/kexec-tools-${PV}"
-
-EXTRA_OECONF = " --without-zlib"
-
-export CC=${TARGET_PREFIX}klcc
-
-# standart oe cflags don't work with klcc
-export CFLAGS=""
-export CPPFLAGS=""
-export LDFLAGS=""
-
-PACKAGES =+ "kexec-static kdump-static"
-
-FILES_kexec-static = "${sbindir}/kexec"
-FILES_kdump-static = "${sbindir}/kdump"
diff --git a/recipes/kexecboot/kexecboot.inc b/recipes/kexecboot/kexecboot.inc
index fdcbf55621..ebd193beea 100644
--- a/recipes/kexecboot/kexecboot.inc
+++ b/recipes/kexecboot/kexecboot.inc
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 
 DEPENDS = "klibc"
-RDEPENDS_${PN} = "kexec-static"
+RDEPENDS_${PN} = "kexec-klibc-static"
 
 inherit autotools
 
-- 
cgit v1.2.3