images/qemuarm/glibc/core-image-full-cmdline: Changes to /etc/group: --- /etc/group +++ /etc/group @@ -44,8 +44,8 @@ systemd-resolve:x:992: systemd-network:x:993: systemd-journal:x:994: -messagebus:x:995: -sshd:x:996: +sshd:x:995: +messagebus:x:996: crontab:x:997: rpcuser:x:998: rpc:x:999: -- images/qemuarm/glibc/core-image-full-cmdline: Changes to /etc/passwd: --- /etc/passwd +++ /etc/passwd @@ -19,8 +19,8 @@ systemd-timesync:x:993:991::/:/bin/nologin systemd-resolve:x:994:992::/:/bin/nologin systemd-network:x:995:993::/:/bin/nologin -messagebus:x:996:995::/var/lib/dbus:/bin/false -sshd:x:997:996::/var/run/sshd:/bin/false +sshd:x:996:995::/var/run/sshd:/bin/false +messagebus:x:997:996::/var/lib/dbus:/bin/false rpcuser:x:998:998::/var/lib/nfs:/bin/false rpc:x:999:999::/:/bin/false nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -- Changes to images/qemuarm/glibc/core-image-sato-sdk (files-in-image.txt): /var/cache/fontconfig/26217940-14d3-4a04-84a7-06aaa8aed502-le32d8.cache-7 was added /var/cache/fontconfig/2ac4640f-87a0-4175-9bce-1ca2dd38c80d-le32d8.cache-7 was added /var/cache/fontconfig/7cdaba41-ff73-4285-ad80-b1dcd9a19a12-le32d8.cache-7 was added /var/cache/fontconfig/8423d479-e5dd-47ad-97c8-edb42af2dd00-le32d8.cache-7 was added /var/cache/fontconfig/8da3f190-db66-4acb-ae13-ae5ce1d0639d-le32d8.cache-7 was added /var/cache/fontconfig/d2adfc2f-5239-4e6d-99b5-ef62f91dcce7-le32d8.cache-7 was added /var/cache/fontconfig/db0dc2a9-2a39-40a9-8083-91f94fc83d64-le32d8.cache-7 was added /var/cache/fontconfig/076ece20-6b76-4a30-949b-9c7c502fa596-le32d8.cache-7 was removed /var/cache/fontconfig/23a8ed66-a72e-437d-95ad-0347e4cef7aa-le32d8.cache-7 was removed /var/cache/fontconfig/34081307-48ac-4b2d-a96f-4268c2a982d0-le32d8.cache-7 was removed /var/cache/fontconfig/58c6c895-8319-4855-9067-e3f84a76c9d9-le32d8.cache-7 was removed /var/cache/fontconfig/73d96411-51d2-45e6-bf9c-c89096d3cd8f-le32d8.cache-7 was removed /var/cache/fontconfig/7b7a7271-bf79-4ab9-a91e-b737cf449cf3-le32d8.cache-7 was removed /var/cache/fontconfig/961286da-8e86-4062-a700-c066c157bdd2-le32d8.cache-7 was removed images/qemuarm/glibc/core-image-sato-sdk: Changes to /etc/group: --- /etc/group +++ /etc/group @@ -40,15 +40,15 @@ shutdown:x:70: users:x:100: pulse:x:989:pulse -avahi:x:990: -systemd-bus-proxy:x:991: -systemd-timesync:x:992: -systemd-resolve:x:993: -systemd-network:x:994: -systemd-journal:x:995: -messagebus:x:996: -sshd:x:997: -rpc:x:998: +systemd-bus-proxy:x:990: +systemd-timesync:x:991: +systemd-resolve:x:992: +systemd-network:x:993: +systemd-journal:x:994: +sshd:x:995: +avahi:x:996: +rpc:x:997: +messagebus:x:998: crontab:x:999: tracing:x:1000: nogroup:x:65534: -- images/qemuarm/glibc/core-image-sato-sdk: Changes to /etc/passwd: --- /etc/passwd +++ /etc/passwd @@ -16,12 +16,12 @@ irc:x:39:39:ircd:/var/run/ircd:/bin/sh gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh pulse:x:991:989::/var/run/pulse:/bin/false -avahi:x:992:990::/run/avahi-daemon:/bin/false -systemd-bus-proxy:x:993:991::/:/bin/nologin -systemd-timesync:x:994:992::/:/bin/nologin -systemd-resolve:x:995:993::/:/bin/nologin -systemd-network:x:996:994::/:/bin/nologin -messagebus:x:997:996::/var/lib/dbus:/bin/false -sshd:x:998:997::/var/run/sshd:/bin/false -rpc:x:999:998::/:/bin/false +systemd-bus-proxy:x:992:990::/:/bin/nologin +systemd-timesync:x:993:991::/:/bin/nologin +systemd-resolve:x:994:992::/:/bin/nologin +systemd-network:x:995:993::/:/bin/nologin +sshd:x:996:995::/var/run/sshd:/bin/false +avahi:x:997:996::/run/avahi-daemon:/bin/false +rpc:x:998:997::/:/bin/false +messagebus:x:999:998::/var/lib/dbus:/bin/false nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -- Changes to images/qemuarm/glibc/core-image-sato (files-in-image.txt): /var/cache/fontconfig/913ad801-8599-42c1-8d64-6f3f8399b009-le32d8.cache-7 was added /var/cache/fontconfig/e6c51916-c955-4cb1-989f-04296d292aa3-le32d8.cache-7 was added /var/cache/fontconfig/3f21d1ad-6da5-4eae-9ec3-940c0f983d77-le32d8.cache-7 was removed /var/cache/fontconfig/5b379a6c-7635-435d-8b3d-93fe1d433dc7-le32d8.cache-7 was removed images/qemuarm/glibc/core-image-sato: Changes to /etc/group: --- /etc/group +++ /etc/group @@ -40,12 +40,12 @@ shutdown:x:70: users:x:100: pulse:x:991:pulse -avahi:x:992: -systemd-bus-proxy:x:993: -systemd-timesync:x:994: -systemd-resolve:x:995: -systemd-network:x:996: -systemd-journal:x:997: -messagebus:x:998: -rpc:x:999: +systemd-bus-proxy:x:992: +systemd-timesync:x:993: +systemd-resolve:x:994: +systemd-network:x:995: +systemd-journal:x:996: +rpc:x:997: +avahi:x:998: +messagebus:x:999: nogroup:x:65534: -- images/qemuarm/glibc/core-image-sato: Changes to /etc/passwd: --- /etc/passwd +++ /etc/passwd @@ -16,11 +16,11 @@ irc:x:39:39:ircd:/var/run/ircd:/bin/sh gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh pulse:x:992:991::/var/run/pulse:/bin/false -avahi:x:993:992::/run/avahi-daemon:/bin/false -systemd-bus-proxy:x:994:993::/:/bin/nologin -systemd-timesync:x:995:994::/:/bin/nologin -systemd-resolve:x:996:995::/:/bin/nologin -systemd-network:x:997:996::/:/bin/nologin -messagebus:x:998:998::/var/lib/dbus:/bin/false -rpc:x:999:999::/:/bin/false +systemd-bus-proxy:x:993:992::/:/bin/nologin +systemd-timesync:x:994:993::/:/bin/nologin +systemd-resolve:x:995:994::/:/bin/nologin +systemd-network:x:996:995::/:/bin/nologin +rpc:x:997:997::/:/bin/false +avahi:x:998:998::/run/avahi-daemon:/bin/false +messagebus:x:999:999::/var/lib/dbus:/bin/false nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -- packages/armv7vet2hf-neon-poky-linux-gnueabi/dbus/dbus-common: RDEPENDS: added "base-files shadow base-passwd" packages/armv7vet2hf-neon-poky-linux-gnueabi/dbus/dbus: latest.pkg_preinst changed from "#!/bin/sh set -e bbnote () { echo "NOTE: $*" } bbwarn () { echo "WARNING: $*" } bbfatal () { echo "ERROR: $*" exit 1 } perform_groupadd () { local rootdir="$1" local opts="$2" bbnote "dbus: Performing groupadd with [$opts]" local groupname=`echo "$opts" | awk '{ print $NF }'` local group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" if test "x$group_exists" = "x"; then eval flock -x $rootdir/etc -c \"$PSEUDO groupadd \$opts\" || true group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" if test "x$group_exists" = "x"; then bbfatal "dbus: groupadd command did not succeed." fi else bbnote "dbus: group $groupname already exists, not re-creating it" fi } perform_useradd () { local rootdir="$1" local opts="$2" bbnote "dbus: Performing useradd with [$opts]" local username=`echo "$opts" | awk '{ print $NF }'` local user_exists="`grep "^$username:" $rootdir/etc/passwd || true`" if test "x$user_exists" = "x"; then eval flock -x $rootdir/etc -c \"$PSEUDO useradd \$opts\" || true user_exists="`grep "^$username:" $rootdir/etc/passwd || true`" if test "x$user_exists" = "x"; then bbfatal "dbus: useradd command did not succeed." fi else bbnote "dbus: user $username already exists, not re-creating it" fi } perform_groupmems () { local rootdir="$1" local opts="$2" bbnote "dbus: Performing groupmems with [$opts]" local groupname=`echo "$opts" | awk '{ for (i = 1; i < NF; i++) if ($i == "-g" || $i == "--group") print $(i+1) }'` local username=`echo "$opts" | awk '{ for (i = 1; i < NF; i++) if ($i == "-a" || $i == "--add") print $(i+1) }'` bbnote "dbus: Running groupmems command with group $groupname and user $username" local mem_exists="`grep "^$groupname:[^:]*:[^:]*:\([^,]*,\)*$username\(,[^,]*\)*$" $rootdir/etc/group || true`" if test "x$mem_exists" = "x"; then eval flock -x $rootdir/etc -c \"$PSEUDO groupmems \$opts\" || true mem_exists="`grep "^$groupname:[^:]*:[^:]*:\([^,]*,\)*$username\(,[^,]*\)*$" $rootdir/etc/group || true`" if test "x$mem_exists" = "x"; then bbfatal "dbus: groupmems command did not succeed." fi else bbnote "dbus: group $groupname already contains $username, not re-adding it" fi } OPT="" SYSROOT="" if test "x$D" != "x"; then # Installing into a sysroot SYSROOT="$D" OPT="--root $D" # Make sure login.defs is there, this is to make debian package backend work # correctly while doing rootfs. # The problem here is that if /etc/login.defs is treated as a config file for # shadow package, then while performing preinsts for packages that depend on # shadow, there might only be /etc/login.def.dpkg-new there in root filesystem. if [ ! -e $D/etc/login.defs -a -e $D/etc/login.defs.dpkg-new ]; then cp $D/etc/login.defs.dpkg-new $D/etc/login.defs fi # user/group lookups should match useradd/groupadd --root export PSEUDO_PASSWD="$SYSROOT" 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="--system --home /var/lib/dbus --no-create-home --shell /bin/false --user-group messagebus" GROUPMEMS_PARAM="${GROUPMEMS_PARAM}" fi # Perform group additions first, since user additions may depend # on these groups existing if test "x`echo $GROUPADD_PARAM | tr -d '[:space:]'`" != "x"; then echo "Running groupadd commands..." # Invoke multiple instances of groupadd for parameter lists # separated by ';' opts=`echo "$GROUPADD_PARAM" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$GROUPADD_PARAM" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` while test "x$opts" != "x"; do perform_groupadd "$SYSROOT" "$OPT $opts" if test "x$opts" = "x$remaining"; then break fi opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` done fi if test "x`echo $USERADD_PARAM | tr -d '[:space:]'`" != "x"; then echo "Running useradd commands..." # Invoke multiple instances of useradd for parameter lists # separated by ';' opts=`echo "$USERADD_PARAM" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$USERADD_PARAM" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` while test "x$opts" != "x"; do perform_useradd "$SYSROOT" "$OPT $opts" if test "x$opts" = "x$remaining"; then break fi opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` done fi if test "x`echo $GROUPMEMS_PARAM | tr -d '[:space:]'`" != "x"; then echo "Running groupmems commands..." # Invoke multiple instances of groupmems for parameter lists # separated by ';' opts=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` while test "x$opts" != "x"; do perform_groupmems "$SYSROOT" "$OPT $opts" if test "x$opts" = "x$remaining"; then break fi opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` done fi " to "#!/bin/sh set -e bbnote () { echo "NOTE: $*" } bbwarn () { echo "WARNING: $*" } bbfatal () { echo "ERROR: $*" exit 1 } perform_groupadd () { local rootdir="$1" local opts="$2" bbnote "dbus: Performing groupadd with [$opts]" local groupname=`echo "$opts" | awk '{ print $NF }'` local group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" if test "x$group_exists" = "x"; then eval flock -x $rootdir/etc -c \"$PSEUDO groupadd \$opts\" || true group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" if test "x$group_exists" = "x"; then bbfatal "dbus: groupadd command did not succeed." fi else bbnote "dbus: group $groupname already exists, not re-creating it" fi } perform_useradd () { local rootdir="$1" local opts="$2" bbnote "dbus: Performing useradd with [$opts]" local username=`echo "$opts" | awk '{ print $NF }'` local user_exists="`grep "^$username:" $rootdir/etc/passwd || true`" if test "x$user_exists" = "x"; then eval flock -x $rootdir/etc -c \"$PSEUDO useradd \$opts\" || true user_exists="`grep "^$username:" $rootdir/etc/passwd || true`" if test "x$user_exists" = "x"; then bbfatal "dbus: useradd command did not succeed." fi else bbnote "dbus: user $username already exists, not re-creating it" fi } perform_groupmems () { local rootdir="$1" local opts="$2" bbnote "dbus: Performing groupmems with [$opts]" local groupname=`echo "$opts" | awk '{ for (i = 1; i < NF; i++) if ($i == "-g" || $i == "--group") print $(i+1) }'` local username=`echo "$opts" | awk '{ for (i = 1; i < NF; i++) if ($i == "-a" || $i == "--add") print $(i+1) }'` bbnote "dbus: Running groupmems command with group $groupname and user $username" local mem_exists="`grep "^$groupname:[^:]*:[^:]*:\([^,]*,\)*$username\(,[^,]*\)*$" $rootdir/etc/group || true`" if test "x$mem_exists" = "x"; then eval flock -x $rootdir/etc -c \"$PSEUDO groupmems \$opts\" || true mem_exists="`grep "^$groupname:[^:]*:[^:]*:\([^,]*,\)*$username\(,[^,]*\)*$" $rootdir/etc/group || true`" if test "x$mem_exists" = "x"; then bbfatal "dbus: groupmems command did not succeed." fi else bbnote "dbus: group $groupname already contains $username, not re-adding it" fi } OPT="" SYSROOT="" if test "x$D" != "x"; then # Installing into a sysroot SYSROOT="$D" OPT="--root $D" # Make sure login.defs is there, this is to make debian package backend work # correctly while doing rootfs. # The problem here is that if /etc/login.defs is treated as a config file for # shadow package, then while performing preinsts for packages that depend on # shadow, there might only be /etc/login.def.dpkg-new there in root filesystem. if [ ! -e $D/etc/login.defs -a -e $D/etc/login.defs.dpkg-new ]; then cp $D/etc/login.defs.dpkg-new $D/etc/login.defs fi # user/group lookups should match useradd/groupadd --root export PSEUDO_PASSWD="$SYSROOT" 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="--system --home /var/lib/dbus --no-create-home --shell /bin/false --user-group messagebus" GROUPMEMS_PARAM="${GROUPMEMS_PARAM}" fi # Perform group additions first, since user additions may depend # on these groups existing if test "x`echo $GROUPADD_PARAM | tr -d '[:space:]'`" != "x"; then echo "Running groupadd commands..." # Invoke multiple instances of groupadd for parameter lists # separated by ';' opts=`echo "$GROUPADD_PARAM" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$GROUPADD_PARAM" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` while test "x$opts" != "x"; do perform_groupadd "$SYSROOT" "$OPT $opts" if test "x$opts" = "x$remaining"; then break fi opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` done fi if test "x`echo $USERADD_PARAM | tr -d '[:space:]'`" != "x"; then echo "Running useradd commands..." # Invoke multiple instances of useradd for parameter lists # separated by ';' opts=`echo "$USERADD_PARAM" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$USERADD_PARAM" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` while test "x$opts" != "x"; do perform_useradd "$SYSROOT" "$OPT $opts" if test "x$opts" = "x$remaining"; then break fi opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` done fi if test "x`echo $GROUPMEMS_PARAM | tr -d '[:space:]'`" != "x"; then echo "Running groupmems commands..." # Invoke multiple instances of groupmems for parameter lists # separated by ';' opts=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` while test "x$opts" != "x"; do perform_groupmems "$SYSROOT" "$OPT $opts" if test "x$opts" = "x$remaining"; then break fi opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` done fi " packages/armv7vet2hf-neon-poky-linux-gnueabi/dbus/dbus: RDEPENDS: removed "base-files shadow base-passwd"