| Submitter | Phil Blundell |
|---|---|
| Date | Sept. 9, 2012, 10:48 a.m. |
| Message ID | <1347187725.4396.259.camel@x121e.pbcl.net> |
| Download | mbox | patch |
| Permalink | /patch/36169/ |
| State | Accepted |
| Commit | 2b4b5f3259be4b790c098fc98cae0275ac6804a0 |
| Headers | show |
Comments
On Sun, Sep 9, 2012 at 3:48 AM, Phil Blundell <philb@gnu.org> wrote: > 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. > why would we care for it in a native recipe. > Signed-off-by: Phil Blundell <pb@pbcl.net> > --- > .../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 cd5605f..0469306 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 > > -- > 1.7.9 > > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
On Sun, 2012-09-09 at 08:35 -0700, Khem Raj wrote: > On Sun, Sep 9, 2012 at 3:48 AM, Phil Blundell <philb@gnu.org> wrote: > > 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. > > > > why would we care for it in a native recipe. Because the binaries won't get staged into the sysroot if they are in the wrong place. p.
On (09/09/12 18:58), Phil Blundell wrote: > On Sun, 2012-09-09 at 08:35 -0700, Khem Raj wrote: > > On Sun, Sep 9, 2012 at 3:48 AM, Phil Blundell <philb@gnu.org> wrote: > > > 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. > > > > > > > why would we care for it in a native recipe. > > Because the binaries won't get staged into the sysroot if they are in > the wrong place. OK. it seems its not respecting $prefix ? > > p. > >
Patch
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 cd5605f..0469306 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
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> --- .../shadow/shadow-native_4.1.4.3.bb | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-)