@@ -1,7 +1,7 @@

 Summary:	Default file system

 Name:		filesystem

 Version:	1.0

-Release:	12%{?dist}

+Release:	13%{?dist}

 License:	GPLv3

 Group:		System Environment/Base

 Vendor:		VMware, Inc.

@@ -543,8 +543,8 @@ EOF

 %attr(664,root,utmp)	/var/log/lastlog

 %attr(600,root,root)	/var/log/btmp

 /var/lock

-%ghost /var/run

-/var/run/lock

+/var/run

+

 #	Symlinks for AMD64

 %ifarch x86_64

 /lib64

@@ -554,6 +554,8 @@ EOF

 /usr/lib/debug/usr/lib64

 %endif

 %changelog

+*   Fri Apr 21 2017 Alexey Makhalov <amakhalov@vmware.com> 1.0-13

+-   make /var/run symlink to /run and keep it in rpm

 *   Thu Apr 20 2017 Bo Gan <ganb@vmware.com> 1.0-12

 -   Fix /usr/local/lib64 symlink

 *   Wed Mar 08 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.0-11

@@ -4,7 +4,7 @@

 Summary:	Main C library

 Name:		glibc

 Version:	2.25

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	LGPLv2+

 URL:		http://www.gnu.org/software/libc

 Group:		Applications/System

@@ -45,6 +45,27 @@ Requires: %{name} = %{version}-%{release}

 %description i18n

 These are the additional internationalization files of glibc.

+%package iconv

+Summary: gconv modules for glibc

+Group: Applications/System

+Requires: %{name} = %{version}-%{release}

+%description iconv

+These is gconv modules for iconv() and iconv tools.

+

+%package tools

+Summary: tools for glibc

+Group: Applications/System

+Requires: %{name} = %{version}-%{release}

+%description tools

+Extra tools for glibc.

+

+%package nscd

+Summary: Name Service Cache Daemon

+Group: Applications/System

+Requires: %{name} = %{version}-%{release}

+%description nscd

+Name Service Cache Daemon

+

 %prep

 %setup -q

 sed -i 's/\\$$(pwd)/`pwd`/' timezone/Makefile

@@ -140,17 +161,19 @@ mkdir -p %{buildroot}/usr/lib/locale

 I18NPATH=. GCONV_PATH=../../glibc-build/iconvdata LC_ALL=C ../../glibc-build/locale/localedef --no-archive --prefix=%{buildroot} -A ../intl/locale.alias -i locales/en_US -c -f charmaps/UTF-8 en_US.UTF-8

 mv %{buildroot}/usr/lib/locale/en_US.utf8 %{buildroot}/usr/lib/locale/en_US.UTF-8

 popd

+# to do not depend on /bin/bash

+sed -i 's@#! /bin/bash@#! /bin/sh@' %{buildroot}/usr/bin/ldd

+sed -i 's@#!/bin/bash@#!/bin/sh@' %{buildroot}/usr/bin/tzselect

 %post

-printf "Creating ldconfig cache\n";/sbin/ldconfig

+/sbin/ldconfig

 %postun

 /sbin/ldconfig

 %files

 %defattr(-,root,root)

-%dir %{_localstatedir}/cache/nscd

 %{_libdir}/locale/*

 %dir %{_sysconfdir}/ld.so.conf.d

 %config(noreplace) %{_sysconfdir}/nsswitch.conf

@@ -158,25 +181,55 @@ printf "Creating ldconfig cache\n";/sbin/ldconfig

 %config(noreplace) %{_sysconfdir}/rpc

 %config(missingok,noreplace) %{_sysconfdir}/ld.so.cache

 %config %{_sysconfdir}/locale-gen.conf

-%config(noreplace) %{_sysconfdir}/nscd.conf

-%ifarch x86_64

 /lib64/*

-%{_lib64dir}/gconv/*

-%{_lib64dir}/audit/*

+%exclude /lib64/libpcprofile.so

 %{_lib64dir}/*.so

-%else

-%{_lib}/*

-%endif

-/sbin/*

+/sbin/ldconfig

+/sbin/locale-gen.sh

 %{_bindir}/*

 %{_libexecdir}/*

-%{_sbindir}/*

 %{_datadir}/i18n/charmaps/UTF-8.gz

 %{_datadir}/i18n/charmaps/ISO-8859-1.gz

 %{_datadir}/i18n/locales/en_US

 %{_datarootdir}/locale/locale.alias

-%{_localstatedir}/lib/nss_db/Makefile

+%exclude %{_localstatedir}/lib/nss_db/Makefile

+%exclude /usr/bin/catchsegv

+%exclude /usr/bin/iconv

 %exclude /usr/bin/mtrace

+%exclude /usr/bin/pcprofiledump

+%exclude /usr/bin/pldd

+%exclude /usr/bin/rpcgen

+%exclude /usr/bin/sotruss

+%exclude /usr/bin/sprof

+%exclude /usr/bin/xtrace

+

+%files iconv

+%defattr(-,root,root)

+%{_lib64dir}/gconv/*

+/usr/bin/iconv

+/usr/sbin/iconvconfig

+

+%files tools

+%defattr(-,root,root)

+/usr/bin/catchsegv

+/usr/bin/mtrace

+/usr/bin/pcprofiledump

+/usr/bin/pldd

+/usr/bin/rpcgen

+/usr/bin/sotruss

+/usr/bin/sprof

+/usr/bin/xtrace

+/usr/sbin/zdump

+/usr/sbin/zic

+/sbin/sln

+%{_lib64dir}/audit/*

+/lib64/libpcprofile.so

+

+%files nscd

+%defattr(-,root,root)

+%config(noreplace) %{_sysconfdir}/nscd.conf

+/usr/sbin/nscd

+%dir %{_localstatedir}/cache/nscd

 %files i18n

 %defattr(-,root,root)

@@ -202,6 +255,8 @@ printf "Creating ldconfig cache\n";/sbin/ldconfig

 %changelog

+*   Fri Apr 21 2017 Alexey Makhalov <amakhalov@vmware.com> 2.25-2

+-   Added -iconv -tools and -nscd subpackages

 *   Wed Mar 22 2017 Alexey Makhalov <amakhalov@vmware.com> 2.25-1

 -   Version update

 *   Wed Dec 14 2016 Alexey Makhalov <amakhalov@vmware.com> 2.24-1

@@ -1,7 +1,7 @@

 Summary:	High-Level Crypto API

 Name:		gpgme

 Version:	1.9.0

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	GPLv2+

 URL:		https://www.gnupg.org/(it)/related_software/gpgme/index.html

 Group:		System Environment/Security

@@ -33,6 +33,8 @@ Static libraries and header files from GPGME, GnuPG Made Easy.

 ./configure \

 	--prefix=%{_prefix} \

  	--disable-fd-passing \

+	--disable-static \

+	--enable-languages=cl \

         --disable-gpgsm-test

 make %{?_smp_mflags}

@@ -51,21 +53,18 @@ cd tests && make check-TESTS

 %files 

 %defattr(-,root,root)

 %{_libdir}/*.so.*

-%{_datadir}/common-lisp/source/gpgme/*.lisp

-%{_datadir}/common-lisp/source/gpgme/gpgme.asd

 %files devel

 %defattr(-,root,root)

 %{_bindir}/*

 %{_includedir}/*.h

-%{_includedir}/gpgme++/*.h

-%{_includedir}/gpgme++/interfaces/*.h

 %{_libdir}/*.so*

-%{_libdir}/cmake/Gpgmepp/*

 %{_datadir}/aclocal/*

 %{_datadir}/common-lisp/source/gpgme/*

 %changelog

+*   Thu Apr 20 2017 Alexey Makhalov <amakhalov@vmware.com> 1.9.0-2

+-   Disabe C++ bindings

 *   Thu Apr 13 2017 Danut Moraru <dmoraru@vmware.com> 1.9.0-1

 -   Update to version 1.9.0

 *   Thu Nov 24 2016 Alexey Makhalov <amakhalov@vmware.com> 1.6.0-3

new file mode 100644

@@ -0,0 +1,356 @@

+#

+# Automatically generated make config: don't edit

+# ToyBox version: KCONFIG_VERSION

+# Sat Apr 22 01:21:21 2017

+#

+# CONFIG_TOYBOX_CONTAINER is not set

+CONFIG_TOYBOX_FIFREEZE=y

+CONFIG_TOYBOX_ICONV=y

+CONFIG_TOYBOX_FALLOCATE=y

+CONFIG_TOYBOX_UTMPX=y

+CONFIG_TOYBOX_SHADOW=y

+# CONFIG_TOYBOX_ON_ANDROID is not set

+CONFIG_TOYBOX_FORK=y

+# CONFIG_TOYBOX_PRLIMIT is not set

+

+#

+# Posix commands

+#

+CONFIG_BASENAME=y

+CONFIG_CAL=y

+CONFIG_CAT=y

+# CONFIG_CAT_V is not set

+CONFIG_CATV=y

+CONFIG_CHGRP=y

+CONFIG_CHOWN=y

+CONFIG_CHMOD=y

+CONFIG_CKSUM=y

+CONFIG_CMP=y

+CONFIG_COMM=y

+CONFIG_CP=y

+CONFIG_CP_PRESERVE=y

+CONFIG_MV=y

+CONFIG_INSTALL=y

+CONFIG_CPIO=y

+CONFIG_CUT=y

+CONFIG_DATE=y

+CONFIG_DF=y

+CONFIG_DIRNAME=y

+CONFIG_DU=y

+CONFIG_ECHO=y

+CONFIG_ENV=y

+CONFIG_EXPAND=y

+CONFIG_FALSE=y

+CONFIG_FILE=y

+CONFIG_FIND=y

+CONFIG_GREP=y

+CONFIG_EGREP=y

+CONFIG_FGREP=y

+CONFIG_HEAD=y

+CONFIG_ID=y

+# CONFIG_ID_Z is not set

+CONFIG_GROUPS=y

+CONFIG_LOGNAME=y

+CONFIG_WHOAMI=y

+CONFIG_KILL=y

+CONFIG_KILLALL5=y

+CONFIG_LINK=y

+CONFIG_LN=y

+CONFIG_LS=y

+CONFIG_LS_COLOR=y

+CONFIG_MKDIR=y

+# CONFIG_MKDIR_Z is not set

+CONFIG_MKFIFO=y

+# CONFIG_MKFIFO_Z is not set

+CONFIG_NICE=y

+CONFIG_NL=y

+CONFIG_NOHUP=y

+CONFIG_OD=y

+CONFIG_PASTE=y

+CONFIG_PATCH=y

+CONFIG_PRINTF=y

+CONFIG_PS=y

+CONFIG_TOP=y

+CONFIG_IOTOP=y

+CONFIG_TOP_COMMON=y

+CONFIG_PGREP=y

+CONFIG_PKILL=y

+CONFIG_PGKILL_COMMON=y

+CONFIG_PWD=y

+CONFIG_RENICE=y

+CONFIG_RM=y

+CONFIG_RMDIR=y

+CONFIG_SED=y

+CONFIG_SLEEP=y

+CONFIG_SLEEP_FLOAT=y

+CONFIG_SORT=y

+CONFIG_SORT_BIG=y

+CONFIG_SORT_FLOAT=y

+CONFIG_SPLIT=y

+CONFIG_STRINGS=y

+CONFIG_TAIL=y

+CONFIG_TAIL_SEEK=y

+CONFIG_TEE=y

+CONFIG_TIME=y

+CONFIG_TOUCH=y

+CONFIG_TRUE=y

+CONFIG_TTY=y

+# CONFIG_ULIMIT is not set

+CONFIG_UNAME=y

+CONFIG_UNIQ=y

+CONFIG_UNLINK=y

+CONFIG_UUDECODE=y

+CONFIG_UUENCODE=y

+CONFIG_WC=y

+CONFIG_WHO=y

+CONFIG_XARGS=y

+# CONFIG_XARGS_PEDANTIC is not set

+

+#

+# pending (see toys/pending/README)

+#

+# CONFIG_ARP is not set

+# CONFIG_ARPING is not set

+# CONFIG_BOOTCHARTD is not set

+# CONFIG_BRCTL is not set

+# CONFIG_CHRT is not set

+# CONFIG_COMPRESS is not set

+# CONFIG_GZIP is not set

+# CONFIG_GZIP_D is not set

+# CONFIG_DECOMPRESS is not set

+# CONFIG_ZCAT is not set

+# CONFIG_GUNZIP is not set

+# CONFIG_CROND is not set

+# CONFIG_CRONTAB is not set

+# CONFIG_DD is not set

+# CONFIG_DHCP6 is not set

+# CONFIG_DHCP is not set

+# CONFIG_DHCPD is not set

+# CONFIG_DEBUG_DHCP is not set

+# CONFIG_DIFF is not set

+# CONFIG_DMESG is not set

+# CONFIG_DUMPLEASES is not set

+# CONFIG_EXPR is not set

+# CONFIG_FDISK is not set

+# CONFIG_FOLD is not set

+# CONFIG_FSCK is not set

+# CONFIG_GETFATTR is not set

+# CONFIG_GETTY is not set

+# CONFIG_GROUPADD is not set

+# CONFIG_GROUPDEL is not set

+# CONFIG_HOST is not set

+# CONFIG_ICONV is not set

+# CONFIG_INIT is not set

+# CONFIG_IP is not set

+# CONFIG_IPCRM is not set

+# CONFIG_IPCS is not set

+# CONFIG_KLOGD is not set

+# CONFIG_KLOGD_SOURCE_RING_BUFFER is not set

+# CONFIG_LAST is not set

+# CONFIG_LOGGER is not set

+# CONFIG_LSOF is not set

+# CONFIG_MDEV is not set

+# CONFIG_MDEV_CONF is not set

+# CONFIG_MKE2FS is not set

+# CONFIG_MKE2FS_JOURNAL is not set

+# CONFIG_MKE2FS_GEN is not set

+# CONFIG_MKE2FS_LABEL is not set

+# CONFIG_MKE2FS_EXTENDED is not set

+# CONFIG_MODPROBE is not set

+# CONFIG_MORE is not set

+# CONFIG_OPENVT is not set

+# CONFIG_DEALLOCVT is not set

+# CONFIG_PING is not set

+# CONFIG_ROUTE is not set

+# CONFIG_SETFATTR is not set

+# CONFIG_SH is not set

+# CONFIG_CD is not set

+# CONFIG_EXIT is not set

+# CONFIG_SULOGIN is not set

+# CONFIG_SYSLOGD is not set

+# CONFIG_TAR is not set

+# CONFIG_TCPSVD is not set

+# CONFIG_TELNET is not set

+# CONFIG_TELNETD is not set

+# CONFIG_TEST is not set

+# CONFIG_TFTP is not set

+# CONFIG_TFTPD is not set

+# CONFIG_TRACEROUTE is not set

+# CONFIG_TR is not set

+# CONFIG_USERADD is not set

+# CONFIG_USERDEL is not set

+# CONFIG_VI is not set

+# CONFIG_WATCH is not set

+# CONFIG_WGET is not set

+# CONFIG_XZCAT is not set

+

+#

+# Other commands

+#

+CONFIG_ACPI=y

+# CONFIG_ASCII is not set

+CONFIG_BASE64=y

+CONFIG_BLKID=y

+CONFIG_FSTYPE=y

+CONFIG_BLOCKDEV=y

+CONFIG_BUNZIP2=y

+CONFIG_BZCAT=y

+# CONFIG_CHCON is not set

+CONFIG_CHROOT=y

+CONFIG_CHVT=y

+# CONFIG_CLEAR is not set

+CONFIG_COUNT=y

+CONFIG_DOS2UNIX=y

+CONFIG_UNIX2DOS=y

+CONFIG_EJECT=y

+CONFIG_FACTOR=y

+CONFIG_FALLOCATE=y

+CONFIG_FLOCK=y

+CONFIG_FREE=y

+CONFIG_FREERAMDISK=y

+CONFIG_FSFREEZE=y

+CONFIG_FSYNC=y

+CONFIG_HELP=y

+CONFIG_HELP_EXTRAS=y

+CONFIG_HEXEDIT=y

+CONFIG_HWCLOCK=y

+CONFIG_INOTIFYD=y

+CONFIG_INSMOD=y

+CONFIG_IONICE=y

+CONFIG_IORENICE=y

+CONFIG_LOGIN=y

+CONFIG_LOSETUP=y

+CONFIG_LSATTR=y

+CONFIG_CHATTR=y

+CONFIG_LSMOD=y

+CONFIG_LSPCI=y

+CONFIG_LSPCI_TEXT=y

+CONFIG_LSUSB=y

+CONFIG_MAKEDEVS=y

+CONFIG_MIX=y

+CONFIG_MKPASSWD=y

+CONFIG_MKSWAP=y

+CONFIG_MODINFO=y

+CONFIG_MOUNTPOINT=y

+CONFIG_NBD_CLIENT=y

+# CONFIG_UNSHARE is not set

+# CONFIG_NSENTER is not set

+CONFIG_ONEIT=y

+CONFIG_PARTPROBE=y

+CONFIG_PIVOT_ROOT=y

+CONFIG_PMAP=y

+CONFIG_PRINTENV=y

+CONFIG_PWDX=y

+CONFIG_READAHEAD=y

+CONFIG_READLINK=y

+CONFIG_REALPATH=y

+CONFIG_REBOOT=y

+# CONFIG_RESET is not set

+CONFIG_REV=y

+CONFIG_RMMOD=y

+CONFIG_SETSID=y

+CONFIG_SHRED=y

+CONFIG_STAT=y

+CONFIG_SWAPOFF=y

+CONFIG_SWAPON=y

+CONFIG_SWITCH_ROOT=y

+CONFIG_SYSCTL=y

+CONFIG_TAC=y

+CONFIG_NPROC=y

+CONFIG_TASKSET=y

+CONFIG_TIMEOUT=y

+CONFIG_TRUNCATE=y

+CONFIG_UPTIME=y

+CONFIG_USLEEP=y

+CONFIG_VCONFIG=y

+CONFIG_VMSTAT=y

+CONFIG_W=y

+CONFIG_WHICH=y

+CONFIG_XXD=y

+CONFIG_YES=y

+

+#

+# Networking

+#

+CONFIG_FTPGET=y

+CONFIG_FTPPUT=y

+CONFIG_IFCONFIG=y

+CONFIG_MICROCOM=y

+CONFIG_NETCAT=y

+CONFIG_NETCAT_LISTEN=y

+CONFIG_NETSTAT=y

+CONFIG_RFKILL=y

+CONFIG_TUNCTL=y

+

+#

+# Linux Standard Base commands

+#

+CONFIG_HOSTNAME=y

+CONFIG_KILLALL=y

+CONFIG_MD5SUM=y

+CONFIG_SHA1SUM=y

+# CONFIG_SHA224SUM is not set

+# CONFIG_SHA256SUM is not set

+# CONFIG_SHA384SUM is not set

+# CONFIG_SHA512SUM is not set

+CONFIG_MKNOD=y

+# CONFIG_MKNOD_Z is not set

+CONFIG_MKTEMP=y

+CONFIG_MOUNT=y

+CONFIG_PASSWD=y

+# CONFIG_PASSWD_SAD is not set

+CONFIG_PIDOF=y

+CONFIG_SEQ=y

+CONFIG_SU=y

+CONFIG_SYNC=y

+CONFIG_UMOUNT=y

+

+#

+# Example commands

+#

+# CONFIG_HELLO is not set

+# CONFIG_HOSTID is not set

+# CONFIG_SKELETON is not set

+# CONFIG_SKELETON_ALIAS is not set

+# CONFIG_TEST_HUMAN_READABLE is not set

+# CONFIG_TEST_MANY_OPTIONS is not set

+# CONFIG_TEST_SCANKEY is not set

+

+#

+# Android

+#

+# CONFIG_GETENFORCE is not set

+# CONFIG_GETPROP is not set

+# CONFIG_LOAD_POLICY is not set

+# CONFIG_LOG is not set

+# CONFIG_RESTORECON is not set

+# CONFIG_RUNCON is not set

+# CONFIG_SENDEVENT is not set

+# CONFIG_SETENFORCE is not set

+# CONFIG_SETPROP is not set

+# CONFIG_START is not set

+# CONFIG_STOP is not set

+

+#

+# 

+#

+

+#

+# Toybox global settings

+#

+CONFIG_TOYBOX=y

+CONFIG_TOYBOX_SUID=y

+CONFIG_TOYBOX_LSM_NONE=y

+# CONFIG_TOYBOX_SELINUX is not set

+# CONFIG_TOYBOX_SMACK is not set

+# CONFIG_TOYBOX_LIBCRYPTO is not set

+CONFIG_TOYBOX_FLOAT=y

+CONFIG_TOYBOX_HELP=y

+CONFIG_TOYBOX_HELP_DASHDASH=y

+# CONFIG_TOYBOX_I18N is not set

+# CONFIG_TOYBOX_FREE is not set

+# CONFIG_TOYBOX_NORECURSE is not set

+# CONFIG_TOYBOX_DEBUG is not set

+CONFIG_TOYBOX_UID_SYS=100

+CONFIG_TOYBOX_UID_USR=500

+# CONFIG_TOYBOX_MUSL_NOMMU_IS_BROKEN is not set

new file mode 100644

@@ -0,0 +1,49 @@

+Name:           toybox

+Version:        0.7.3

+Release:        1%{?dist}

+License:        BSD

+Summary:        Common Linux command line utilities in a single executable

+Url:            http://landley.net/toybox/

+Group:          Applications/System

+Vendor:         VMware, Inc.

+Distribution:   Photon

+Source0:        http://landley.net/toybox/downloads/%{name}-%{version}.tar.gz

+%define sha1 toybox=f3d9f5396a210fb2ad7d6309acb237751c50812f

+Source1:	config-%{version}

+%description

+Toybox combines common Linux command line utilities together into a single

+BSD-licensed executable that's simple, small, fast, reasonably

+standards-compliant, and powerful enough to turn Android into a development

+environment.

+

+%prep

+%setup -q -n toybox-%{version}

+

+%build

+cp %{SOURCE1} .config

+make

+

+%install

+PREFIX=%{buildroot} make install

+chmod 755 %{buildroot}/bin/toybox

+

+%check

+# Do not run all tests, skip losetup

+# make tests

+sed -i "s/^  if \[ \$# -ne 0 \]/  if false; /" scripts/test.sh

+pushd tests

+tests_to_run=`ls *.test | sed 's/.test//;/losetup/d'`

+popd

+./scripts/test.sh $tests_to_run

+

+%files

+%defattr(-,root,root)

+%doc README LICENSE

+/bin/*

+/sbin/*

+%{_bindir}/*

+%{_sbindir}/*

+

+%changelog

+*   Thu Apr 20 2017 Fabio Rapposelli <fabio@vmware.com> 0.7.3-1

+-   Initial build.  First version

@@ -1,7 +1,7 @@

 Summary:        Utilities for file systems, consoles, partitions, and messages

 Name:           util-linux

 Version:        2.29.2

-Release:        1%{?dist}

+Release:        2%{?dist}

 URL:            http://www.kernel.org/pub/linux/utils/util-linux

 License:        GPLv2+

 Group:          Applications/System

@@ -10,6 +10,7 @@ Distribution:   Photon

 Source0:        %{name}-%{version}.tar.xz

 %define sha1    util-linux=b488f185e74187a63b55baef9d3f48d5b1780118

 BuildRequires:  ncurses-devel

+Requires: %{name}-libs = %{version}-%{release}

 %description

 Utilities for handling file systems, consoles, partitions,

 and messages.

@@ -17,17 +18,23 @@ and messages.

 %package lang

 Summary: Additional language files for util-linux

 Group: Applications/System

-Requires: util-linux >= 2.24.1

+Requires: %{name} = %{version}-%{release}

 %description lang

 These are the additional language files of util-linux.

 %package devel

 Summary: Header and library files for util-linux

 Group: Development/Libraries

-Requires: util-linux >= 2.24.1

+Requires: %{name} = %{version}-%{release}

 %description devel

 These are the header and library files of util-linux.

+%package libs

+Summary: library files for util-linux

+Group: Development/Libraries

+%description libs

+These are library files of util-linux.

+

 %prep

 %setup -q

 sed -i -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' $(grep -rl '/etc/adjtime' .)

@@ -56,7 +63,8 @@ sudo -u nobody -s /bin/bash -c "PATH=$PATH make -k check"

 %defattr(-,root,root)

 %dir %{_sharedstatedir}/hwclock

 /bin/*

-/lib/*.so.*

+/lib/libfdisk.so.*

+/lib/libsmartcols.so.*

 /sbin/*

 %{_bindir}/*

 %{_sbindir}/*

@@ -66,6 +74,12 @@ sudo -u nobody -s /bin/bash -c "PATH=$PATH make -k check"

 %{_datadir}/bash-completion/completions/*

 %{_datadir}/doc/util-linux/getopt/*

+%files libs

+%defattr(-,root,root)

+/lib/libblkid.so.*

+/lib/libmount.so.*

+/lib/libuuid.so.*

+

 %files lang -f %{name}.lang

 %defattr(-,root,root)

@@ -77,6 +91,8 @@ sudo -u nobody -s /bin/bash -c "PATH=$PATH make -k check"

 %{_mandir}/man3/*

 %changelog

+*   Thu Apr 20 2017 Alexey Makhalov <amakhalov@vmware.com> 2.29.2-2

+-   Added -libs subpackage to strip docker image.

 *   Wed Apr 05 2017 Xiaolin Li <xiaolinl@vmware.com> 2.29.2-1

 -   Updated to version 2.29.2.

 *   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 2.27.1-5

@@ -36,7 +36,7 @@ mkdir $TEMP_CHROOT

 rpm --root $TEMP_CHROOT/ --initdb

-tdnf --installroot $TEMP_CHROOT/ install -y filesystem bash coreutils photon-release photon-repos tdnf

+tdnf --installroot $TEMP_CHROOT/ --rpmverbosity 10 install -y filesystem bash toybox tdnf photon-release photon-repos

 rpm --root $TEMP_CHROOT/ --import $TEMP_CHROOT/etc/pki/rpm-gpg/*

@@ -104,6 +104,8 @@ class constants(object):

         "linux-api-headers",

         "glibc",

         "glibc-devel",

+        "glibc-iconv",

+        "glibc-tools",

         "zlib",

         "zlib-devel",

         "file",

@@ -142,6 +144,7 @@ class constants(object):

         "make",

         "patch",

         "util-linux",

+        "util-linux-libs",

         "util-linux-devel",

         "tar",

         "xz",

@@ -196,8 +199,11 @@ class constants(object):

         "util-linux-devel",

         "flex-devel",

         "nspr-devel",

+        "glibc-iconv",

+        "glibc-tools",

         "bzip2-libs",

         "expat-libs",

+        "util-linux-libs",

         "nss-libs",

         "xz-libs",

         "sqlite",