pseudo 1.6.5: less pointlessly chatty - openembedded-core-contrib - OpenEmbedded Core user contribution trees

diff options

author	Peter Seebach <peter.seebach@windriver.com>	2015-05-04 15:55:49 -0500
committer	Richard Purdie <richard.purdie@linuxfoundation.org>	2015-05-05 22:14:09 +0100
commit	f1d086bb7204ad37160e814eaf2504dc867cabff (patch)
tree	1e643855ccebed015b639e327b54420ab2f44717 /meta/recipes-devtools/pseudo
parent	a4d530bcf55f03258078c10a123e2717444e1060 (diff)
download	openembedded-core-contrib-f1d086bb7204ad37160e814eaf2504dc867cabff.tar.gz

pseudo 1.6.5: less pointlessly chatty

There was a stupid logic error controlling the diagnostic for a "possible" mismatch involving trailing slashes and whether or not a node was believed to be a directory. Specifically, a diagnostic got printed any time a lookup for a directory *didn't* have a trailing slash, as well as in the (actually intended) case where a non-directory lookup *did*. No other changes, but that one is probably significant. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Diffstat (limited to 'meta/recipes-devtools/pseudo')

-rw-r--r--

meta/recipes-devtools/pseudo/pseudo_1.6.5.bb (renamed from meta/recipes-devtools/pseudo/pseudo_1.6.4.bb)

-rw-r--r--

meta/recipes-devtools/pseudo/pseudo_git.bb

2 files changed, 4 insertions, 4 deletions

inherit useradd_base # base-passwd-cross provides the default passwd and group files in the # target sysroot, and shadow -native and -sysroot provide the utilities # and support files needed to add and modify user and group accounts DEPENDS_append = "${USERADDDEPENDS}" USERADDDEPENDS = " base-files base-passwd shadow-native shadow-sysroot shadow" USERADDDEPENDS_class-cross = "" USERADDDEPENDS_class-native = "" USERADDDEPENDS_class-nativesdk = "" # This preinstall function can be run in four different contexts: # # a) Before do_install # b) At do_populate_sysroot_setscene when installing from sstate packages # c) As the preinst script in the target package at do_rootfs time # d) As the preinst script in the target package on device as a package upgrade # useradd_preinst () { OPT="" SYSROOT="" if test "x$D" != "x"; then # Installing into a sysroot SYSROOT="$D" OPT="--root $D" fi # If we're not doing a special SSTATE/SYSROOT install # then set the values, otherwise use the environment if test "x$UA_SYSROOT" = "x"; then # Installing onto a target # Add groups and users defined only for this package GROUPADD_PARAM="${GROUPADD_PARAM}" USERADD_PARAM="${USERADD_PARAM}" GROUPMEMS_PARAM="${GROUPMEMS_PARAM}" fi # Perform group additions first, since user additions may depend # on these groups existing if test "x$GROUPADD_PARAM" != "x"; then echo "Running groupadd commands..." # Invoke multiple instances of groupadd for parameter lists # separated by ';' opts=`echo "$GROUPADD_PARAM" | cut -d ';' -f 1` remaining=`echo "$GROUPADD_PARAM" | cut -d ';' -f 2-` while test "x$opts" != "x"; do perform_groupadd "$SYSROOT" "$OPT $opts" 10 if test "x$opts" = "x$remaining"; then break fi opts=`echo "$remaining" | cut -d ';' -f 1` remaining=`echo "$remaining" | cut -d ';' -f 2-` done fi if test "x$USERADD_PARAM" != "x"; then echo "Running useradd commands..." # Invoke multiple instances of useradd for parameter lists # separated by ';' opts=`echo "$USERADD_PARAM" | cut -d ';' -f 1` remaining=`echo "$USERADD_PARAM" | cut -d ';' -f 2-` while test "x$opts" != "x"; do perform_useradd "$SYSROOT" "$OPT $opts" 10 if test "x$opts" = "x$remaining"; then break fi opts=`echo "$remaining" | cut -d ';' -f 1` remaining=`echo "$remaining" | cut -d ';' -f 2-` done fi if test "x$GROUPMEMS_PARAM" != "x"; then echo "Running groupmems commands..." # Invoke multiple instances of groupmems for parameter lists # separated by ';' opts=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 1` remaining=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 2-` while test "x$opts" != "x"; do perform_groupmems "$SYSROOT" "$OPT $opts" 10 if test "x$opts" = "x$remaining"; then break fi opts=`echo "$remaining" | cut -d ';' -f 1` remaining=`echo "$remaining" | cut -d ';' -f 2-` done fi } useradd_sysroot () { # Pseudo may (do_install) or may not (do_populate_sysroot_setscene) be running # at this point so we're explicit about the environment so pseudo can load if # not already present. export PSEUDO="${FAKEROOTENV} PSEUDO_LOCALSTATEDIR=${STAGING_DIR_TARGET}${localstatedir}/pseudo ${STAGING_DIR_NATIVE}${bindir}/pseudo" # Explicitly set $D since it isn't set to anything # before do_install D=${STAGING_DIR_TARGET} # Add groups and users defined for all recipe packages GROUPADD_PARAM="${@get_all_cmd_params(d, 'groupadd')}" USERADD_PARAM="${@get_all_cmd_params(d, 'useradd')}" GROUPMEMS_PARAM="${@get_all_cmd_params(d, 'groupmems')}" # Tell the system to use the environment vars UA_SYSROOT=1 useradd_preinst } useradd_sysroot_sstate () { if [ "${BB_CURRENTTASK}" = "package_setscene" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] then useradd_sysroot fi } do_install[prefuncs] += "${SYSROOTFUNC}" SYSROOTFUNC = "useradd_sysroot" SYSROOTFUNC_class-cross = "" SYSROOTFUNC_class-native = "" SYSROOTFUNC_class-nativesdk = "" SSTATEPREINSTFUNCS += "${SYSROOTPOSTFUNC}" SYSROOTPOSTFUNC = "useradd_sysroot_sstate" SYSROOTPOSTFUNC_class-cross = "" SYSROOTPOSTFUNC_class-native = "" SYSROOTPOSTFUNC_class-nativesdk = "" USERADDSETSCENEDEPS = "${MLPREFIX}base-passwd:do_populate_sysroot_setscene pseudo-native:do_populate_sysroot_setscene shadow-native:do_populate_sysroot_setscene ${MLPREFIX}shadow-sysroot:do_populate_sysroot_setscene" USERADDSETSCENEDEPS_class-cross = "" USERADDSETSCENEDEPS_class-native = "" USERADDSETSCENEDEPS_class-nativesdk = "" do_package_setscene[depends] += "${USERADDSETSCENEDEPS}" do_populate_sysroot_setscene[depends] += "${USERADDSETSCENEDEPS}" # Recipe parse-time sanity checks def update_useradd_after_parse(d): useradd_packages = d.getVar('USERADD_PACKAGES', True) if not useradd_packages: raise bb.build.FuncFailed("%s inherits useradd but doesn't set USERADD_PACKAGES" % d.getVar('FILE')) for pkg in useradd_packages.split(): if not d.getVar('USERADD_PARAM_%s' % pkg, True) and not d.getVar('GROUPADD_PARAM_%s' % pkg, True) and not d.getVar('GROUPMEMS_PARAM_%s' % pkg, True): bb.fatal("%s inherits useradd but doesn't set USERADD_PARAM, GROUPADD_PARAM or GROUPMEMS_PARAM for package %s" % (d.getVar('FILE'), pkg)) python __anonymous() { if not bb.data.inherits_class('nativesdk', d) \ and not bb.data.inherits_class('native', d): update_useradd_after_parse(d) } # Return a single [GROUP|USER]ADD_PARAM formatted string which includes the # [group|user]add parameters for all USERADD_PACKAGES in this recipe def get_all_cmd_params(d, cmd_type): import string param_type = cmd_type.upper() + "_PARAM_%s" params = [] useradd_packages = d.getVar('USERADD_PACKAGES', True) or "" for pkg in useradd_packages.split(): param = d.getVar(param_type % pkg, True) if param: params.append(param) return "; ".join(params) # Adds the preinst script into generated packages fakeroot python populate_packages_prepend () { def update_useradd_package(pkg): bb.debug(1, 'adding user/group calls to preinst for %s' % pkg) """ useradd preinst is appended here because pkg_preinst may be required to execute on the target. Not doing so may cause useradd preinst to be invoked twice, causing unwanted warnings. """ preinst = d.getVar('pkg_preinst_%s' % pkg, True) or d.getVar('pkg_preinst', True) if not preinst: preinst = '#!/bin/sh\n' preinst += 'bbnote () {\n%s}\n' % d.getVar('bbnote', True) preinst += 'bbwarn () {\n%s}\n' % d.getVar('bbwarn', True) preinst += 'bbfatal () {\n%s}\n' % d.getVar('bbfatal', True) preinst += 'perform_groupadd () {\n%s}\n' % d.getVar('perform_groupadd', True) preinst += 'perform_useradd () {\n%s}\n' % d.getVar('perform_useradd', True) preinst += 'perform_groupmems () {\n%s}\n' % d.getVar('perform_groupmems', True) preinst += d.getVar('useradd_preinst', True) d.setVar('pkg_preinst_%s' % pkg, preinst) # RDEPENDS setup rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or "" rdepends += ' ' + d.getVar('MLPREFIX') + 'base-passwd' rdepends += ' ' + d.getVar('MLPREFIX') + 'shadow' # base-files is where the default /etc/skel is packaged rdepends += ' ' + d.getVar('MLPREFIX') + 'base-files' d.setVar("RDEPENDS_%s" % pkg, rdepends) # Add the user/group preinstall scripts and RDEPENDS requirements # to packages specified by USERADD_PACKAGES if not bb.data.inherits_class('nativesdk', d) \ and not bb.data.inherits_class('native', d): useradd_packages = d.getVar('USERADD_PACKAGES', True) or "" for pkg in useradd_packages.split(): update_useradd_package(pkg) } # Use the following to extend the useradd with custom functions USERADDEXTENSION ?= "" inherit ${USERADDEXTENSION}


context:
space:
mode: