From: Denys Vlasenko <dvlasenk@xxxxxxxxxx> redhat/scripts/rh-dist-git.sh: fix outdated message and comment redhat/git/files and redhat/scripts/copy_files.sh had been deleted by the below commit, but the "copy the required files (redhat/git/files)" comment in rh-dist-git.sh still references redhat/git/files: commit 80480a22de503a67f3af6997565adaf7728b92cc Author: Jeremy Cline <jcline@xxxxxxxxxx> Date: Tue Sep 17 15:20:56 2019 +0000 Sync up the ARK build scripts Signed-off-by: Jeremy Cline <jcline@xxxxxxxxxx> ... @@ -54,7 +55,7 @@ $rhpkg_bin switch-branch $rhdistgit_branch || die "switching to branch $rhdistgi echo "Copying updated files" # copy the required files (redhat/git/files) <=== HERE -$redhat/scripts/copy_files.sh "$topdir" "$tmpdir" "$package_name"; +$redhat/scripts/expand_srpm.sh "$topdir" "$tmpdir" "$package_name" "$srpm_name"; Fix this. Signed-off-by: Denys Vlasenko <dvlasenk@xxxxxxxxxx> diff --git a/redhat/scripts/rh-dist-git.sh b/redhat/scripts/rh-dist-git.sh index blahblah..blahblah 100755 --- a/redhat/scripts/rh-dist-git.sh +++ b/redhat/scripts/rh-dist-git.sh @@ -36,9 +36,8 @@ echo "Switching the branch" cd "$tmpdir/$SPECPACKAGE_NAME"; $RHPKG_BIN switch-branch "$RHDISTGIT_BRANCH" || die "switching to branch $RHDISTGIT_BRANCH"; -echo "Copying updated files" -# copy the required files (redhat/git/files) -"$REDHAT"/scripts/expand_srpm.sh "$tmpdir"; +echo "Unpacking from SRPM" +"$REDHAT"/scripts/expand_srpm.sh "$tmpdir" echo "Uploading new tarballs" # upload tarballs -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2617 _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
