From: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
Date: Wed, 14 May 2014 14:45:22 +0000 (+0200)
Subject: Correct pwdutils build recipe
X-Git-Tag: demo_release_0.1~103^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=864a53f284c7e1a7a37af110c4b1a0e231f482d3;p=scm%2Fbb%2Fmeta-tizen.git

Correct pwdutils build recipe

Override do_configure() and do_compile() in pwdutils-extraconf.inc.
Using the generated recipe (pwdutils.inc) there is an issue during the
configure process. The origin of this issue is still unknown so, instead
of calling autotools_do_configure we manualy call autoreconf and
./configure which does the trick. Finding the origin of this issue and a
better solution would be appreciable.

Some files are also not added in the package using the generated recipe,
also for an unknown reason which is very likely to be found in the
spec2yocto recipe generator. Those files are manually added in
pwdutils-extraconf.inc.

Change-Id: I7fea88cba28aa5c7604bc0d20975d65808777d3d
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
---

diff --git a/recipes-tizen/pwdutils/pwdutils-extraconf.inc b/recipes-tizen/pwdutils/pwdutils-extraconf.inc
index e69de29..07c44f8 100644
--- a/recipes-tizen/pwdutils/pwdutils-extraconf.inc
+++ b/recipes-tizen/pwdutils/pwdutils-extraconf.inc
@@ -0,0 +1,31 @@
+
+do_configure() {
+    autoreconf -v --install --force
+    ./configure --disable-ldap --libdir=${prefix}/lib --disable-nls --disable-pam_rpasswd --host=${HOST_SYS}
+}
+
+do_compile() {
+ cd ${S}
+ LANG=C
+ export LANG
+ unset DISPLAY
+ CFLAGS="-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables" ; export CFLAGS ;
+ CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ;
+ FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ;
+ LD_AS_NEEDED=1; export LD_AS_NEEDED ;
+
+ make -j16
+}
+
+pwdutils_files += "${sysconfdir}/init.d"
+pwdutils_files += "${prefix}/bin/passwd"
+pwdutils_files += "${prefix}/bin/chsh"
+pwdutils_files += "${prefix}/bin/chage"
+pwdutils_files += "${prefix}/bin/expiry"
+pwdutils_files += "${prefix}/bin/newgrp"
+pwdutils_files += "${prefix}/bin/chfn"
+pwdutils_files += "${prefix}/bin/gpasswd"
+pwdutils_files += "${prefix}/sbin/userdel-post.local"
+pwdutils_files += "${prefix}/sbin/useradd.local"
+pwdutils_files += "${prefix}/sbin/groupadd.local"
+pwdutils_files += "${prefix}/sbin/userdel-pre.local"
diff --git a/recipes-tizen/pwdutils/pwdutils.inc b/recipes-tizen/pwdutils/pwdutils.inc
index f53da50..c2490aa 100644
--- a/recipes-tizen/pwdutils/pwdutils.inc
+++ b/recipes-tizen/pwdutils/pwdutils.inc
@@ -87,22 +87,21 @@ do_install() {
  rm -rf ${D} 
  mkdir -p ${D} 
  
- make install DESTDIR=$RPM_BUILD_ROOT
- rm -f $RPM_BUILD_ROOT${prefix}/lib/pwdutils/lib*.so
- #mkdir $RPM_BUILD_ROOT/lib
- #mv $RPM_BUILD_ROOT${prefix}/lib/security $RPM_BUILD_ROOT/lib
+ make install DESTDIR=${D}
+ rm -f ${D}${prefix}/lib/pwdutils/lib*.so
  /sbin/ldconfig -n ${prefix}/lib/pwdutils
- rm -f $RPM_BUILD_ROOT${prefix}/lib/pwdutils/*a
- rm -f $RPM_BUILD_ROOT/lib/security/*a
  
- rm -f ${D}/etc/init.d/rpasswdd
- rm -f ${D}/etc/pam.d/rpasswd
- rm -f ${D}/etc/rpasswd.conf
- rm -f ${D}/usr/bin/rpasswd
- rm -f ${D}/usr/sbin/rpasswdd
- ln -sf newgrp $RPM_BUILD_ROOT${prefix}/bin/sg
- install -m 644 $RPM_SOURCE_DIR/useradd.default $RPM_BUILD_ROOT/etc/default/useradd
- echo ".so man8/useradd.8" > $RPM_BUILD_ROOT${mandir}/man8/adduser.8
+ rm -f ${D}${prefix}/lib/pwdutils/*a
+ rm -f ${D}lib/security/*a
+ rm -f ${D}${sysconfdir}/init.d/rpasswdd
+ rm -f ${D}${sysconfdir}/pam.d/rpasswd
+ rm -f ${D}${sysconfdir}/rpasswd.conf
+ rm -f ${D}${prefix}/bin/rpasswd
+ rm -f ${D}${prefix}/sbin/rpasswdd
+ 
+ ln -sf newgrp ${D}${prefix}/bin/sg
+ install -m 644 ${S}/packaging/useradd.default ${D}${sysconfdir}/default/useradd
+ echo ".so man8/useradd.8" > ${D}${mandir}/man8/adduser.8
  
  
  
@@ -114,17 +113,17 @@ pwdutils-docs_files = ""
 
 pwdutils_files = ""
 pwdutils_files += "pwdutils.manifest"
-pwdutils_files += "/etc/login.defs"
-pwdutils_files += "/etc/pam.d/chage"
-pwdutils_files += "/etc/pam.d/chfn"
-pwdutils_files += "/etc/pam.d/chsh"
-pwdutils_files += "/etc/pam.d/passwd"
-pwdutils_files += "/etc/pam.d/shadow"
-pwdutils_files += "/etc/pam.d/useradd"
-pwdutils_files += "/etc/default/useradd"
-pwdutils_files += "/etc/default/passwd"
-pwdutils_files += "/etc/pwdutils"
-pwdutils_files += "/etc/pwdutils/logging"
+pwdutils_files += "${sysconfdir}/login.defs"
+pwdutils_files += "${sysconfdir}/pam.d/chage"
+pwdutils_files += "${sysconfdir}/pam.d/chfn"
+pwdutils_files += "${sysconfdir}/pam.d/chsh"
+pwdutils_files += "${sysconfdir}/pam.d/passwd"
+pwdutils_files += "${sysconfdir}/pam.d/shadow"
+pwdutils_files += "${sysconfdir}/pam.d/useradd"
+pwdutils_files += "${sysconfdir}/default/useradd"
+pwdutils_files += "${sysconfdir}/default/passwd"
+pwdutils_files += "${sysconfdir}/pwdutils"
+pwdutils_files += "${sysconfdir}/pwdutils/logging"
 pwdutils_files += "${prefix}/bin/sg"
 pwdutils_files += "${prefix}/sbin/chpasswd"
 pwdutils_files += "${prefix}/sbin/groupadd"