diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-05 13:18:31 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-08 10:50:18 +0100 |
commit | 9df3cdf42d8c1216682f497f0b166a43ef9f4184 (patch) | |
tree | 0d541abdea34c5e414898d5688a214bc63cfa5a7 /meta/recipes-devtools/pseudo/pseudo.inc | |
parent | a14d30f7de192b9a2bffc65f567483abff962f22 (diff) | |
download | poky-9df3cdf42d8c1216682f497f0b166a43ef9f4184.tar.gz |
pseudo: Upgrade to 1.8.1
* Drop patches where the changes exist upstream
* Fetch from git as no tarball is available for 1.8.1
* Move common code to pseudo.inc
* Update patchset in git recipe
(From OE-Core rev: 0c36984d4c501d12fa91cf7371511641585cc256)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/pseudo/pseudo.inc')
-rw-r--r-- | meta/recipes-devtools/pseudo/pseudo.inc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc index 16c57c9caa..18ce9f9259 100644 --- a/meta/recipes-devtools/pseudo/pseudo.inc +++ b/meta/recipes-devtools/pseudo/pseudo.inc | |||
@@ -26,6 +26,8 @@ do_configure () { | |||
26 | NO32LIBS ??= "1" | 26 | NO32LIBS ??= "1" |
27 | NO32LIBS_class-nativesdk = "1" | 27 | NO32LIBS_class-nativesdk = "1" |
28 | 28 | ||
29 | PSEUDO_EXTRA_OPTS ?= "--enable-force-async --without-passwd-fallback" | ||
30 | |||
29 | # Compile for the local machine arch... | 31 | # Compile for the local machine arch... |
30 | do_compile () { | 32 | do_compile () { |
31 | if [ "${SITEINFO_BITS}" = "64" ]; then | 33 | if [ "${SITEINFO_BITS}" = "64" ]; then |
@@ -112,10 +114,15 @@ do_install () { | |||
112 | oe_runmake 'DESTDIR=${D}' ${MAKEOPTS} 'LIB=lib/pseudo/lib$(MARK64)' install | 114 | oe_runmake 'DESTDIR=${D}' ${MAKEOPTS} 'LIB=lib/pseudo/lib$(MARK64)' install |
113 | } | 115 | } |
114 | 116 | ||
115 | # Two below are the same | ||
116 | # If necessary install for the alternative machine arch. This is only | ||
117 | # necessary in a native build. | ||
118 | do_install_append_class-native () { | 117 | do_install_append_class-native () { |
118 | install -d ${D}${sysconfdir} | ||
119 | # The fallback files should never be modified | ||
120 | install -m 444 ${WORKDIR}/fallback-passwd ${D}${sysconfdir}/passwd | ||
121 | install -m 444 ${WORKDIR}/fallback-group ${D}${sysconfdir}/group | ||
122 | |||
123 | # Two native/nativesdk entries below are the same | ||
124 | # If necessary install for the alternative machine arch. This is only | ||
125 | # necessary in a native build. | ||
119 | maybe_make32 | 126 | maybe_make32 |
120 | if $make32; then | 127 | if $make32; then |
121 | mkdir -p ${D}${prefix}/lib/pseudo/lib | 128 | mkdir -p ${D}${prefix}/lib/pseudo/lib |