From: Prarit Bhargava <prarit@xxxxxxxxxx>
redhat/scripts/create-tarball.sh: Use Makefile variables
Use Makefile variables in redhat/scripts/create-tarball.sh.
Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -397,11 +397,7 @@ dist-stub-key:
# force tarball to be regenerated if HEAD changes
.PHONY: $(TARBALL)
$(TARBALL):
- @if [ $(SINGLE_TARBALL) -eq 1 ]; then \
- scripts/create-tarball.sh $(GITID) linux-$(RPMVERSION); \
- else \
- scripts/create-tarball.sh $(MARKER) linux-$(TARFILE_RELEASE); \
- fi
+ @scripts/create-tarball.sh
.PHONY: $(KABI_TARBALL)
$(KABI_TARBALL):
diff --git a/redhat/scripts/create-tarball.sh b/redhat/scripts/create-tarball.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/create-tarball.sh
+++ b/redhat/scripts/create-tarball.sh
@@ -1,7 +1,6 @@
#!/bin/sh
-GITID=$1
-DIR=$2
+[ "$SINGLE_TARBALL" -eq 1 ] && _GITID="$GITID" || _GITID="$MARKER"
# shellcheck disable=SC1083
XZ_THREADS=$(rpm --eval %{_smp_mflags} | sed -e 's!^-j!--threads !')
@@ -16,8 +15,7 @@ fi
if [ -f "$TARBALL" ]; then
TARID=$(xzcat -qq "$TARBALL" | git get-tar-commit-id 2>/dev/null)
- GITID_NORMALIZE=$(git log --max-count=1 --pretty=format:%H "$GITID")
- if [ "${GITID_NORMALIZE}" = "${TARID}" ]; then
+ if [ "$_GITID" == "$TARID" ]; then
echo "$(basename "$TARBALL") unchanged..."
exit 0
fi
@@ -29,4 +27,4 @@ trap 'rm -vf "$TARBALL"' INT
# XZ_OPTIONS and XZ_THREADS DEPEND on word splitting, so don't disable it here:
# shellcheck disable=SC2086
cd ../ &&
- git archive --prefix="$DIR"/ --format=tar "$GITID" | xz $XZ_OPTIONS $XZ_THREADS > "$TARBALL";
+ git archive --prefix="linux-$TARFILE_RELEASE"/ --format=tar "$_GITID" | xz $XZ_OPTIONS $XZ_THREADS > "$TARBALL";
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1647
_______________________________________________
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 on the list, report it: https://pagure.io/fedora-infrastructure
