From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-we0-f173.google.com ([74.125.82.173]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1UJ6Eh-0007hX-7F for openembedded-core@lists.openembedded.org; Fri, 22 Mar 2013 18:58:44 +0100 Received: by mail-we0-f173.google.com with SMTP id x51so3465653wey.18 for ; Fri, 22 Mar 2013 10:41:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references:x-gm-message-state; bh=3TcpnVljUIlsSwgzo7kVk1BBwRNQYV5370rWOrlUH2Y=; b=Mg+Nc6t4vXkR2SXqnaEYEMvlP2GOD5Vuu6QI6D8kLcjbgW+cMexzCKyN1GiswaCHwW VQiqecWh34FKLE8AMWVWvQhHZh2nYLd2B7fi06PKOaQsXg8B3LF02ielKn1qTXo+Izgu f2WczCZcgmqGsO2LNGsH0GFCZzVx+uxvDSnlpyL4eFUoYh0XrVN2xa9HrTH1Exv+N7Dt 8YeY4f3yM5wF4gzqM9pjKxJhEBiogKdsqNDBV41O6RzyO2Y/aWz/0MTFVeUrqGosq/5Z w8iTjzyD4ElOxkpg+l0Eaw6TLigyZTUtd0zD3s0XSTX459upxsySPuq0YZennOwk1iDu F7CQ== X-Received: by 10.180.24.229 with SMTP id x5mr4640562wif.17.1363974105406; Fri, 22 Mar 2013 10:41:45 -0700 (PDT) Received: from melchett.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by mx.google.com with ESMTPS id dm9sm12260880wib.3.2013.03.22.10.41.44 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 22 Mar 2013 10:41:44 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 22 Mar 2013 17:38:31 +0000 Message-Id: X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQmqCHvUIfykqcaGbTPhdsgyE7eDfBi/t8hMUo3KN7v5i9CzftXkDiB3DjoYXOn7rXIsIpNR Cc: openembedded-devel@lists.openembedded.org Subject: [PATCH 11/22] update-rcd: drop depends to recommends, check for update-rcd in scripts X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Mar 2013 17:59:32 -0000 Signed-off-by: Ross Burton --- meta/classes/update-rc.d.bbclass | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index 06b91c1..0997702 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass @@ -6,7 +6,7 @@ UPDATERCD_virtclass-cross = "" UPDATERCD_class-native = "" UPDATERCD_class-nativesdk = "" -RDEPENDS_${UPDATERCPN}_append = " ${UPDATERCD}" +RRECOMMENDS_${UPDATERCPN}_append = " ${UPDATERCD}" INITSCRIPT_PARAMS ?= "defaults" @@ -18,7 +18,9 @@ if test "x$D" != "x"; then else OPT="-s" fi -update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} +if type update-rc.d >/dev/null; then + update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} +fi } updatercd_prerm() { @@ -28,10 +30,13 @@ fi } updatercd_postrm() { -if [ "$D" != "" ]; then - update-rc.d -f -r $D ${INITSCRIPT_NAME} remove +if test "$D" != ""; then + OPT="-f -r $D" else - update-rc.d ${INITSCRIPT_NAME} remove + OPT="" +fi +if type update-rc.d >/dev/null; then + update-rc.d $OPT ${INITSCRIPT_NAME} remove fi } -- 1.7.10.4