From f8eb8a381767f7b7c64c7f190890d874538b7272 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Tue, 17 Nov 2009 21:31:15 +0000
Subject: [PATCH] insserv: Convert to BBCLASSEXTEND, mark do_install as safe
 for native staging

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/packages/insserv/insserv-native_1.11.0.bb | 17 -----------------
 meta/packages/insserv/insserv_1.11.0.bb        |  7 +++++--
 2 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 meta/packages/insserv/insserv-native_1.11.0.bb

diff --git a/meta/packages/insserv/insserv-native_1.11.0.bb b/meta/packages/insserv/insserv-native_1.11.0.bb
deleted file mode 100644
index f46948bb3e..0000000000
--- a/meta/packages/insserv/insserv-native_1.11.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-LICENSE = "GPL"
-SECTION = "base"
-
-SRC_URI = "ftp://ftp.suse.com/pub/projects/init/insserv-${PV}.tar.gz \
-        file://40_segfault_virtprov.dpatch;patch=1 \
-        file://42_loopnochangemsg.dpatch;patch=1 \
-        file://make.patch;patch=1 \
-        file://insserv.conf"
-
-S = "${WORKDIR}/insserv-${PV}"
-
-inherit native
-
-do_stage () {
-	oe_runmake 'DESTDIR=${STAGING_DIR_NATIVE}' install
-        install -m0644 ${WORKDIR}/insserv.conf ${STAGING_ETCDIR_NATIVE}/insserv.conf
-}
diff --git a/meta/packages/insserv/insserv_1.11.0.bb b/meta/packages/insserv/insserv_1.11.0.bb
index b5938b25ba..0fe439ba69 100644
--- a/meta/packages/insserv/insserv_1.11.0.bb
+++ b/meta/packages/insserv/insserv_1.11.0.bb
@@ -2,14 +2,17 @@ LICENSE = "GPL"
 SECTION = "base"
 PR = "r1"
 
-SRC_URI = "ftp://ftp.suse.com/pub/projects/init/${PN}-${PV}.tar.gz \
+SRC_URI = "ftp://ftp.suse.com/pub/projects/init/${BPN}-${PV}.tar.gz \
         file://40_segfault_virtprov.dpatch;patch=1 \
         file://42_loopnochangemsg.dpatch;patch=1 \
         file://make.patch;patch=1 \
         file://crosscompile_fix.patch;patch=1 \
         file://insserv.conf"
 
+NATIVE_INSTALL_WORKS = "1"
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
-        install -m0644 ${WORKDIR}/insserv.conf ${D}${sysconfdir}/insserv.conf
+	install -m0644 ${WORKDIR}/insserv.conf ${D}${sysconfdir}/insserv.conf
 }
+
+BBCLASSEXTEND = "native"