diff options
| author | Phil Blundell <philb@gnu.org> | 2012-09-09 11:48:45 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-12 14:44:52 +0100 |
| commit | 2b4b5f3259be4b790c098fc98cae0275ac6804a0 (patch) | |
| tree | e0ef40a34ac0fc8539463cb3dd782775e00e7bae | |
| parent | d4e62e164ef73b47c178edcbc2579f5358934afc (diff) | |
| download | openembedded-core-2b4b5f3259be4b790c098fc98cae0275ac6804a0.tar.gz openembedded-core-2b4b5f3259be4b790c098fc98cae0275ac6804a0.tar.bz2 openembedded-core-2b4b5f3259be4b790c098fc98cae0275ac6804a0.zip | |
shadow-native: Ensure that ${sbindir} and ${base_sbindir} are respected
These values need to be passed on the command line to "make install" otherwise
shadow will use its own built-in idea of where those directories are located.
Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb index cd5605f81c..0469306ab0 100644 --- a/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb +++ b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb @@ -7,7 +7,7 @@ LICENSE = "BSD | Artistic-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \ file://src/passwd.c;firstline=8;endline=30;md5=2899a045e90511d0e043b85a7db7e2fe" -PR = "r7" +PR = "r8" SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ file://shadow.automake-1.11.patch \ @@ -30,7 +30,14 @@ EXTRA_OECONF += "--without-audit \ --without-selinux \ --without-nscd" -do_install_append() { +do_install() { + oe_runmake DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install + + # Info dir listing isn't interesting at this point so remove it if it exists. + if [ -e "${D}${infodir}/dir" ]; then + rm -f ${D}${infodir}/dir + fi + # Enable CREATE_HOME by default. sed -i 's/#CREATE_HOME/CREATE_HOME/g' ${D}${sysconfdir}/login.defs |