8787fi
8888cd -
8989
90- # Pass the feature flags to make, which will pass them to cargo
91- " ${MAKE} " PROFILE=" ${PROFILE} " SKIP_UTILS=more CARGOFLAGS=" ${CARGO_FEATURE_FLAGS} "
92- # min test for SELinux
93- [ " ${SELINUX_ENABLED} " = 1 ] && touch g && " ${PROFILE} " /stat -c%C g && rm g
94-
95- cp " ${UU_BUILD_DIR} /install" " ${UU_BUILD_DIR} /ginstall" # The GNU tests rename this script before running, to avoid confusion with the make target
96- # Create *sum binaries
97- for sum in b2sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum; do
98- sum_path=" ${UU_BUILD_DIR} /${sum} "
99- test -f " ${sum_path} " || (cd ${UU_BUILD_DIR} && ln -s " hashsum" " ${sum} " )
100- done
101- test -f " ${UU_BUILD_DIR} /[" || (cd ${UU_BUILD_DIR} && ln -s " test" " [" )
90+ # we should include env to MULTICALL
91+ " ${MAKE} " UTILS=" install env" PROFILE=" ${PROFILE} " CARGOFLAGS=" ${CARGO_FEATURE_FLAGS} "
92+ ln -vf " ${UU_BUILD_DIR} /install" " ${UU_BUILD_DIR} /ginstall" # The GNU tests use renamed install to ginstall
93+ if [ " ${SELINUX_ENABLED} " = 1 ]; then
94+ # Build few utils for SELinux for faster build. MULTICALL=y fails...
95+ " ${MAKE} " UTILS=" cat chcon cp cut echo groups id ln ls mkdir mkfifo mknod mktemp mv nproc printf rm rmdir runcon seq stat test touch tr true uname wc whoami" PROFILE=" ${PROFILE} " CARGOFLAGS=" ${CARGO_FEATURE_FLAGS} "
96+ else
97+ # Use MULTICALL=y for faster build
98+ " ${MAKE} " MULTICALL=y SKIP_UTILS=" install env more" PROFILE=" ${PROFILE} " CARGOFLAGS=" ${CARGO_FEATURE_FLAGS} "
99+ for binary in $( " ${UU_BUILD_DIR} " /coreutils --list)
100+ do ln -vf " ${UU_BUILD_DIR} /coreutils" " ${UU_BUILD_DIR} /${binary} "
101+ done
102+ fi
102103
103104# #
104105
@@ -109,8 +110,7 @@ cd "${path_GNU}" && echo "[ pwd:'${PWD}' ]"
109110for binary in $( ./build-aux/gen-lists-of-programs.sh --list-progs) ; do
110111 bin_path=" ${UU_BUILD_DIR} /${binary} "
111112 test -f " ${bin_path} " || {
112- echo " '${binary} ' was not built with uutils, using the 'false' program"
113- cp " ${UU_BUILD_DIR} /false" " ${bin_path} "
113+ cp -v /usr/bin/false " ${bin_path} "
114114 }
115115done
116116
0 commit comments