From d0ef19ca9ab26886a2818ddd502039cfed0a1c96 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Sat, 3 Jul 2004 22:21:41 +0000 Subject: wrap generated ldconfig calls in $D checks BKrev: 40e7317582sPh3mSU2gflgzY91cHpw --- classes/package.oeclass | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/package.oeclass b/classes/package.oeclass index 0a960f8409..1c9cc53cbb 100644 --- a/classes/package.oeclass +++ b/classes/package.oeclass @@ -224,6 +224,14 @@ python populate_packages () { oe.build.exec_func("read_subpackage_metadata", d) } +ldconfig_postinst_fragment() { +if [ x"$D" != "x" ]; then + exit 1 +else + ldconfig +fi +} + python package_do_shlibs() { import os, re, os.path @@ -301,7 +309,7 @@ python package_do_shlibs() { postinst = oe.data.getVar('pkg_postinst_%s' % pkg, d, 1) or oe.data.getVar('pkg_postinst', d, 1) if not postinst: postinst = '#!/bin/sh\n' - postinst += 'ldconfig\n' + postinst += oe.data.getVar('ldconfig_postinst_fragment', d, 1) oe.data.setVar('pkg_postinst_%s' % pkg, postinst, d) for pkg in packages.split(): -- cgit v1.2.3