From 68cdc3ca8db9c6cd4c8379c25203cc4bacbf3da7 Mon Sep 17 00:00:00 2001 From: chentt_tt Date: Wed, 24 Feb 2021 04:22:17 -0500 Subject: [PATCH] fix cp copy statement in scripts --- tools/auto_build_pkgs.sh | 10 +++++----- tools/auto_make_rootfs.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/auto_build_pkgs.sh b/tools/auto_build_pkgs.sh index 5d28253..9b9de72 100644 --- a/tools/auto_build_pkgs.sh +++ b/tools/auto_build_pkgs.sh @@ -55,17 +55,17 @@ build_pkg() if [ $pkg_name == 'busybox' ]; then mkdir -p /root/rpmbuild/SOURCES rpm2cpio $src_dir/$rpm_name | cpio -idv -D /root/rpmbuild/SOURCES - cp -f $src_dir/* /root/rpmbuild/SOURCES + /usr/bin/cp $src_dir/* /root/rpmbuild/SOURCES busybox_src_pkg=$(rpmbuild -bs $src_dir/$pkg_name.spec | awk '{print $2}') - cp -f $busybox_src_pkg ./$src_dir/$rpm_name + /usr/bin/cp $busybox_src_pkg ./$src_dir/$rpm_name fi else local rpm_name=$pkg_name-$pkg_version$download_suffix mkdir -p /root/rpmbuild/SOURCES - cp -fr $work_dir/src/$pkg_name/* /root/rpmbuild/SOURCES/ - cp -f $work_dir/src/$pkg_name/$pkg_name.spec $src_dir + /usr/bin/cp -r $work_dir/src/$pkg_name/* /root/rpmbuild/SOURCES/ + /usr/bin/cp $work_dir/src/$pkg_name/$pkg_name.spec $src_dir rpmbuild -bs $src_dir/$pkg_name.spec - cp -f /root/rpmbuild/SRPMS/$rpm_name $src_dir + /usr/bin/cp /root/rpmbuild/SRPMS/$rpm_name $src_dir fi ###starting build### diff --git a/tools/auto_make_rootfs.sh b/tools/auto_make_rootfs.sh index 6c0fb6f..69a5508 100644 --- a/tools/auto_make_rootfs.sh +++ b/tools/auto_make_rootfs.sh @@ -119,7 +119,7 @@ please check if all pkgs have been build succ, and then remove this file." mkdir -p $rootfs_dir/../arm32_repo ###create arm32_repo - find ${work_dir}/output | grep rpm$ | grep -v src | xargs -i cp -f {} $rootfs_dir/../arm32_repo + find ${work_dir}/output | grep rpm$ | grep -v src | xargs -i /usr/bin/cp {} $rootfs_dir/../arm32_repo createrepo $rootfs_dir/../arm32_repo cat << EOF > /etc/yum.repos.d/arm32_rootfs.repo [arm32_rootfs] -- Gitee